From 39dac944d90a8c78d245038f31942b83277476cf Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 13 Jun 2022 14:27:06 -0400 Subject: [PATCH] Custom upgrade: suffix lttng_ust_dl_update with 1 Signed-off-by: Mathieu Desnoyers Change-Id: I42eb70f5d7a6336d64483af7a5293b882e2f6639 --- src/common/events.h | 5 +++++ src/lib/lttng-ust/lttng-ust-statedump.c | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/common/events.h b/src/common/events.h index 76062828..fe7f4ae3 100644 --- a/src/common/events.h +++ b/src/common/events.h @@ -13,6 +13,7 @@ #include #include +#include #include #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 309a98fa..6b0d0567 100644 --- 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 -- 2.34.1