aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.ibm.com>2021-07-02 18:12:13 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.ibm.com>2021-07-02 18:14:01 -0300
commite766ce3088e1da976d6fa7903870683b3fed7f17 (patch)
tree5d1b57cc54145014e5c65f1cd8faa0d9fcf6f6b6
parentc501803035d0117cef775d40295a7034d9b293a6 (diff)
downloadglibc-e766ce3088e1da976d6fa7903870683b3fed7f17.zip
glibc-e766ce3088e1da976d6fa7903870683b3fed7f17.tar.gz
glibc-e766ce3088e1da976d6fa7903870683b3fed7f17.tar.bz2
mtrace: Add attribute nocommon to mallwatch
Avoid compilation errors GCC versions that do not default to -fno-common, e.g. GCC <= 9. Fixes commit 00d28960c5388a582a0485e07629b553c32dde49 ("mtrace: Deprecate mallwatch and tr_break"). Suggested-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Suggested-by: Florian Weimer <fweimer@redhat.com>
-rw-r--r--malloc/mtrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index 6c2c58b..f5b8321 100644
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -59,7 +59,7 @@ __libc_lock_define_initialized (static, lock);
case some applications ended up linking against them but they don't actually
do anything anymore; not that they did much before anyway. */
-void *mallwatch;
+void *mallwatch __attribute__ ((nocommon));
compat_symbol (libc, mallwatch, mallwatch, GLIBC_2_0);
void