Custom upgrade: suffix lttng_ust_dl_update with 1

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I42eb70f5d7a6336d64483af7a5293b882e2f6639

diff --git a/src/common/events.h b/src/common/events.h
index 760628283eac06d0d531f636eefd037da917d538..fe7f4ae3d2402d032f391559b8532bef346ae8aa 100644 (file)
--- a/src/common/events.h
+++ b/src/common/events.h
@@ -13,6 +13,7 @@
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 
+#include <lttng/ust-config.h>
 #include <lttng/ust-events.h>
 
 #include "common/macros.h"
@@ -580,6 +581,10 @@ struct lttng_enabler *lttng_event_notifier_enabler_as_enabler(
 }
 
 
+/* Custom upgrade 2.12 to 2.13 */
+#ifndef LTTNG_UST_CUSTOM_UPGRADE_CONFLICTING_SYMBOLS
+#define lttng_ust_dl_update            lttng_ust_dl_update1
+#endif
 
 /* This is ABI between liblttng-ust and liblttng-ust-dl */
 void lttng_ust_dl_update(void *ip);

diff --git a/src/lib/lttng-ust/lttng-ust-statedump.c b/src/lib/lttng-ust/lttng-ust-statedump.c
index 309a98fa2201243913dbf09fcc16c8e2ae134338..6b0d0567f69ce5c82bf783f01cdf3e0bde9a19c8 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-statedump.c
+++ b/src/lib/lttng-ust/lttng-ust-statedump.c
@@ -546,7 +546,8 @@ end:
        ust_unlock();
 }
 
-void lttng_ust_dl_update(void *ip)
+static
+void lttng_ust_dl_update_orig(void *ip)
 {
        struct dl_iterate_data data;
 
@@ -660,3 +661,13 @@ void lttng_ust_statedump_destroy(void)
        lttng_ust__tracepoints__destroy();
        ust_dl_state_destroy();
 }
+
+/* Custom upgrade 2.12 to 2.13 */
+#undef lttng_ust_dl_update
+void lttng_ust_dl_update1(void *ip)
+       __attribute__ ((alias ("lttng_ust_dl_update_orig")));
+
+#ifdef LTTNG_UST_CUSTOM_UPGRADE_CONFLICTING_SYMBOLS
+void lttng_ust_dl_update(void *ip)
+       __attribute__ ((alias ("lttng_ust_dl_update_orig")));
+#endif