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

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

diff --git a/include/ust/marker.h b/include/ust/marker.h
index 8e20dad31fbdc97ca0a5b971e5465ad7dd581f26..c82dd30dfef04326376057ab8608579776814a1e 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -94,7 +94,7 @@ struct marker {
                         */                                                                     \
                        ".ifndef __mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) "\n\t"  \
                        /*".section __markers_strings\n\t"*/                                    \
-                       ".section __markers_strings,\"aw\",@progbits\n\t"                               \
+                       ".section __markers_strings,\"aw\"\n\t"                                 \
                        "__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ":\n\t" \
                        ".string \"" __stringify(channel) "\"\n\t"                                      \
                        "__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ":\n\t"    \
@@ -106,15 +106,15 @@ struct marker {
                );                                                                              \
                asm volatile (                                                                  \
                        /*".section __markers\n\t"*/ \
-                       ".section __markers,\"aw\",@progbits\n\t"                                       \
+                       ".section __markers,\"aw\"\n\t"                                         \
                        "2:\n\t" \
                        _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ")\n\t" /* channel string */ \
                        _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ")\n\t" /* name string */ \
                        _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ")\n\t" /* format string */ \
                        ".byte 0\n\t" /* state imv */                                           \
                        ".byte 0\n\t" /* ptype */                                                       \
-                       ".word 0\n\t" /* channel_id */                                          \
-                       ".word 0\n\t" /* event_id */                                            \
+                       ".hword 0\n\t" /* channel_id */                                         \
+                       ".hword 0\n\t" /* event_id */                                           \
                        ".balign " __stringify(__WORDSIZE) " / 8\n\t" /* alignment */                   \
                        _ASM_PTR "(marker_probe_cb)\n\t" /* call */                             \
                        _ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \
@@ -125,8 +125,7 @@ struct marker {
                        _ASM_PTR "(1f)\n\t" /* location */                                              \
                        ".previous\n\t"                                                         \
                        /*".section __markers_ptrs\n\t"*/ \
-                       ".section __markers_ptrs,\"a\",@progbits\n\t"                           \
-                       ".balign 8\n\t"                                                         \
+                       ".section __markers_ptrs,\"a\"\n\t"                                     \
                        _ASM_PTR "(2b)\n\t"                                                     \
                        ".previous\n\t"                                                         \
                        "1:\n\t"                                                                \