Fix: c99: use __asm__ __volatile__

[lttng-ust.git] / src / lib / lttng-ust-libc-wrapper / lttng-ust-malloc.c

diff --git a/src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c b/src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c
index 48955795a837bce30f88478ec9f0edd14a0806eb..479040d2097df9e8e064992174cecd7bd94e9694 100644 (file)
--- a/src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/src/lib/lttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -30,9 +30,12 @@
 #include "common/macros.h"
 #include "common/align.h"
 
-#define TRACEPOINT_DEFINE
-#define TRACEPOINT_CREATE_PROBES
-#define TP_IP_PARAM ip
+#define LTTNG_UST_TRACEPOINT_HIDDEN_DEFINITION
+#define LTTNG_UST_TRACEPOINT_PROVIDER_HIDDEN_DEFINITION
+
+#define LTTNG_UST_TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TP_IP_PARAM ip
 #include "ust_libc.h"
 
 #define STATIC_CALLOC_LEN 4096
@@ -352,7 +355,7 @@ void *realloc(void *ptr, size_t size)
                        memcpy(retval, ptr, *old_size);
                }
                /*
-                * Mimick that a NULL pointer has been received, so
+                * Mimic that a NULL pointer has been received, so
                 * memory allocation analysis based on the trace don't
                 * get confused by the address from the static
                 * allocator.
@@ -423,9 +426,9 @@ int posix_memalign(void **memptr, size_t alignment, size_t size)
 }
 
 static
-void lttng_ust_fixup_malloc_nesting_tls(void)
+void lttng_ust_malloc_nesting_alloc_tls(void)
 {
-       asm volatile ("" : : "m" (URCU_TLS(malloc_nesting)));
+       __asm__ __volatile__ ("" : : "m" (URCU_TLS(malloc_nesting)));
 }
 
 void lttng_ust_libc_wrapper_malloc_ctor(void)
@@ -434,7 +437,7 @@ void lttng_ust_libc_wrapper_malloc_ctor(void)
        if (cur_alloc.calloc) {
                return;
        }
-       lttng_ust_fixup_malloc_nesting_tls();
+       lttng_ust_malloc_nesting_alloc_tls();
        /*
         * Ensure the allocator is in place before the process becomes
         * multithreaded.