summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-07-09 20:09:14 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-07-09 20:09:14 +0200
commit7c241325d67af9e24ff03d4c6f6280c17ea181f8 (patch)
tree5667f94ae80c6e75dc1bac29ab4c51d48cfad084 /malloc
parentdc76a059fded7a203c82dbb91d4fc1f43d3250db (diff)
downloadglibc-7c241325d67af9e24ff03d4c6f6280c17ea181f8.tar.gz
glibc-7c241325d67af9e24ff03d4c6f6280c17ea181f8.tar.xz
glibc-7c241325d67af9e24ff03d4c6f6280c17ea181f8.zip
Force building with -fno-common
As a result, is not necessary to specify __attribute__ ((nocommon))
on individual definitions.

GCC 10 defaults to -fno-common on all architectures except ARC,
but this change is compatible with older GCC versions and ARC, too.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c2
-rw-r--r--malloc/mtrace.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 0253453f27..154f6b460c 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2026,7 +2026,7 @@ static void *memalign_hook_ini (size_t alignment, size_t sz,
                                 const void *caller) __THROW;
 
 #if HAVE_MALLOC_INIT_HOOK
-void (*__malloc_initialize_hook) (void) __attribute__ ((nocommon));
+void (*__malloc_initialize_hook) (void);
 compat_symbol (libc, __malloc_initialize_hook,
 	       __malloc_initialize_hook, GLIBC_2_0);
 #endif
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index f5b8321c6b..6c2c58b706 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 __attribute__ ((nocommon));
+void *mallwatch;
 compat_symbol (libc, mallwatch, mallwatch, GLIBC_2_0);
 
 void