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 867b140cce9b2d408f594f770ac688da86f5702c..8a01a8868c19385b6990957693dd2915ce203f15 100644 (file)
--- a/include/ust/processor.h
+++ b/include/ust/processor.h
@@ -20,10 +20,13 @@
 
 #include <stddef.h>
 #include <string.h>
+#include <urcu-bp.h>
 
 extern __thread long ust_reg_stack[500];
 extern volatile __thread long *ust_reg_stack_ptr;
 
+#define ____cacheline_aligned __attribute__((aligned(CAA_CACHE_LINE_SIZE)))
+
 #ifdef __i386
 
 struct registers {
@@ -290,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 */ \
@@ -302,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 */ \