From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1827) id 764533857C78; Fri, 2 Jul 2021 21:44:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 764533857C78 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tulio Magno Quites Machado Filho To: glibc-cvs@sourceware.org Subject: [glibc] mtrace: Add attribute nocommon to mallwatch X-Act-Checkin: glibc X-Git-Author: Tulio Magno Quites Machado Filho X-Git-Refname: refs/heads/master X-Git-Oldrev: c501803035d0117cef775d40295a7034d9b293a6 X-Git-Newrev: e766ce3088e1da976d6fa7903870683b3fed7f17 Message-Id: <20210702214409.764533857C78@sourceware.org> Date: Fri, 2 Jul 2021 21:44:09 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2021 21:44:09 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e766ce3088e1da976d6fa7903870683b3fed7f17 commit e766ce3088e1da976d6fa7903870683b3fed7f17 Author: Tulio Magno Quites Machado Filho Date: Fri Jul 2 18:12:13 2021 -0300 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 Suggested-by: Florian Weimer Diff: --- malloc/mtrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/malloc/mtrace.c b/malloc/mtrace.c index 6c2c58b706..f5b8321c6b 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