From f0fc1799a9cbf402300b4469d4ada64e45aa8d89 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 16 Jan 2020 10:59:14 -0500 Subject: [PATCH] Fix: build with -fno-common GCC 10 will default to building with -fno-common, this inhibits the linker from merging multiple tentative definitions of a symbol in an archive. Keep only the declaration in the libustsnprintf.la convenience library. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: I8fb7c72811ce7e62f10342f55fcabeeabfdd4c67 --- liblttng-ust-ctl/ustctl.c | 2 -- liblttng-ust-fd/lttng-ust-fd.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c index 8c38ffaf..9e650466 100644 --- a/liblttng-ust-ctl/ustctl.c +++ b/liblttng-ust-ctl/ustctl.c @@ -77,8 +77,6 @@ extern void lttng_ring_buffer_client_discard_exit(void); extern void lttng_ring_buffer_client_discard_rt_exit(void); extern void lttng_ring_buffer_metadata_client_exit(void); -volatile enum ust_loglevel ust_loglevel; - int ustctl_release_handle(int sock, int handle) { struct ustcomm_ust_msg lum; diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/liblttng-ust-fd/lttng-ust-fd.c index 863f0618..4818e02e 100644 --- a/liblttng-ust-fd/lttng-ust-fd.c +++ b/liblttng-ust-fd/lttng-ust-fd.c @@ -28,8 +28,6 @@ #include #include "usterr-signal-safe.h" -volatile enum ust_loglevel ust_loglevel; - static int (*__lttng_ust_fd_plibc_close)(int fd); static int (*__lttng_ust_fd_plibc_fclose)(FILE *stream); -- 2.34.1