markers: ensure assembly is portable by using .hword instead of .word

[ust.git] / include / ust / processor.h

diff --git a/include/ust/processor.h b/include/ust/processor.h
index 68ac258631a61491b287d0c1f492253dd5881fda..8a01a8868c19385b6990957693dd2915ce203f15 100644 (file)
--- a/include/ust/processor.h
+++ b/include/ust/processor.h
@@ -25,7 +25,7 @@
 extern __thread long ust_reg_stack[500];
 extern volatile __thread long *ust_reg_stack_ptr;
 
-#define ____cacheline_aligned __attribute__((aligned(CACHE_LINE_SIZE)))
+#define ____cacheline_aligned __attribute__((aligned(CAA_CACHE_LINE_SIZE)))
 
 #ifdef __i386
 
@@ -293,7 +293,7 @@ static inline int fls(int x)
             /* Start TLS access of private reg stack pointer */ \
             ".byte 0x66\n\t" \
             "leaq ust_reg_stack_ptr@tlsgd(%%rip), %%rdi\n\t" \
-            ".word 0x6666\n\t" \
+            ".hword 0x6666\n\t" \
             "rex64\n\t" \
             "call __tls_get_addr@plt\n\t" \
             /* --- End TLS access */ \
@@ -305,7 +305,7 @@ static inline int fls(int x)
             /* Start TLS access of private reg stack */ \
             ".byte 0x66\n\t" \
             "leaq ust_reg_stack@tlsgd(%%rip), %%rdi\n\t" \
-            ".word 0x6666\n\t" \
+            ".hword 0x6666\n\t" \
             "rex64\n\t" \
             "call __tls_get_addr@plt\n\t" \
             /* --- End TLS access */ \