From patchwork Fri Jul 2 21:46:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tulio Magno Quites Machado Filho X-Patchwork-Id: 44131 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0D801398503F for ; Fri, 2 Jul 2021 21:49:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0D801398503F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625262554; bh=RQWQ6Oqhqb4HG0BF5XqhUvW3G1pjSKIcsAGZdor9WMo=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=MX3/g++xjU4k4txFbz2iNTbOAdBHCEe9gD4xZyvtLhdAIAhf4gwmEMKYFi47/XUFX YIL7IZ4rKJexvTYJnfG8by2jSi8/CtofWRJ5QG4/0fmP48B21Nw1+AFLLcZEGm4OVj lqcSQTh9/YGofi9CExMoTY+LuAc67KGUWZPtJjd8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id B1A90385DC0F; Fri, 2 Jul 2021 21:47:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B1A90385DC0F Received: from pps.filterd (m0187473.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 162LWQaw155847; Fri, 2 Jul 2021 17:47:11 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 39jah5rhf4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Jul 2021 17:47:11 -0400 Received: from m0187473.ppops.net (m0187473.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 162LeZCh183836; Fri, 2 Jul 2021 17:47:10 -0400 Received: from ppma02dal.us.ibm.com (a.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.10]) by mx0a-001b2d01.pphosted.com with ESMTP id 39jah5rhf0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Jul 2021 17:47:10 -0400 Received: from pps.filterd (ppma02dal.us.ibm.com [127.0.0.1]) by ppma02dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 162LfUKH017708; Fri, 2 Jul 2021 21:47:10 GMT Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by ppma02dal.us.ibm.com with ESMTP id 39duvgn6gk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 02 Jul 2021 21:47:09 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 162Ll8UW37355912 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 2 Jul 2021 21:47:08 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8DC2378060; Fri, 2 Jul 2021 21:47:08 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 36C3F7805E; Fri, 2 Jul 2021 21:47:08 +0000 (GMT) Received: from linux.ibm.com (unknown [9.163.10.126]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP; Fri, 2 Jul 2021 21:47:07 +0000 (GMT) To: libc-alpha@sourceware.org Subject: [COMMITTED] mtrace: Add attribute nocommon to mallwatch Date: Fri, 2 Jul 2021 18:46:32 -0300 Message-Id: <20210702214632.47347-1-tuliom@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <87pmw0qvhm.fsf@oldenburg.str.redhat.com> References: <87pmw0qvhm.fsf@oldenburg.str.redhat.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: RvG_JBfD4owywzCopfDl2ZqnCQQmeTWs X-Proofpoint-GUID: KnIeHT6c8PhGD7JPyDjT7BPH4CLrJofx X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790 definitions=2021-07-02_10:2021-07-02, 2021-07-02 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 mlxscore=0 priorityscore=1501 malwarescore=0 adultscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 suspectscore=0 clxscore=1011 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2107020110 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tulio Magno Quites Machado Filho via Libc-alpha From: Tulio Magno Quites Machado Filho Reply-To: Tulio Magno Quites Machado Filho Cc: Florian Weimer , Siddhesh Poyarekar Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 --- 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