Remove marker 8-byte alignment

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

diff --git a/include/ust/marker.h b/include/ust/marker.h
index cac71ffc59fe641ade37b47c8daa0a66dbc57275..c565268dcf70e409402df3356b5ec63fa82b15ac 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,7 +106,7 @@ 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 */ \
@@ -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"                                                                \
@@ -344,19 +343,19 @@ extern int marker_register_lib(struct marker * const *markers_start, int markers
 extern int marker_unregister_lib(struct marker * const *markers_start);
 
 #define MARKER_LIB                                                     \
-       extern struct marker * const __start___markers[] __attribute__((weak, visibility("hidden"))); \
-       extern struct marker * const __stop___markers[] __attribute__((weak, visibility("hidden"))); \
+       extern struct marker * const __start___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \
+       extern struct marker * const __stop___markers_ptrs[] __attribute__((weak, visibility("hidden"))); \
                                                                        \
        static void __attribute__((constructor)) __markers__init(void)  \
        {                                                               \
-               marker_register_lib(__start___markers,                  \
-                       (((long)__stop___markers) - ((long)__start___markers))  \
-                               / sizeof(*__start___markers));          \
-       } \
-       \
-       static void __attribute__((destructor)) __markers__destroy(void)        \
+               marker_register_lib(__start___markers_ptrs,             \
+                                   __stop___markers_ptrs               \
+                                   - __start___markers_ptrs);          \
+       }                                                               \
+                                                                       \
+       static void __attribute__((destructor)) __markers__destroy(void)\
        {                                                               \
-               marker_unregister_lib(__start___markers); \
+               marker_unregister_lib(__start___markers_ptrs);          \
        }
 
 extern void marker_set_new_marker_cb(void (*cb)(struct marker *));