From patchwork Tue Nov 16 21:32:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 47790 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 DA9C7385B80B for ; Tue, 16 Nov 2021 21:32:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA9C7385B80B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637098375; bh=ThiyVXWTHVhi+2AWdktBg1pDORYSxiNgaKSkhhUSyFU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=pJwu8AmfOrj6CQ18fTojnqJ+Le45awkdmpeIFy4EMUKQpOmzxu4PxC1n26w5j06if v0UYjhZFyevNmE2J02/r4eavZOFCccpo3FmRsaDxk9uqT1XoY+BFd5VgM/qyGluPMB xpv45i+QRMHTGDzxPgFkrJ7hpuGgtqcbabAAhxuk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 5C9873858037 for ; Tue, 16 Nov 2021 21:32:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5C9873858037 Received: by mail-pl1-x635.google.com with SMTP id m24so294934pls.10 for ; Tue, 16 Nov 2021 13:32:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ThiyVXWTHVhi+2AWdktBg1pDORYSxiNgaKSkhhUSyFU=; b=e6agCc7fTGxSdLEDxgNT0gILc5W7yTH4sFmnoRcZ2/7kS/CDSJMW4tynRpPhf1B7qm BhFP1Gx1tYg9fFa9OQpfFKce90QAupqOcqVvvZrxHlMcwYKTWcD1cM56/PVq7EqvXyty EcCMGFfNiB2vCKlgHKFIFXBDEQUnhMfa0/eajIPBTRAMm4Qmi4H+ECE7o61DweSikFnO OdfDhXXL6oT3kjOgSRUFAhFy54eGD8n3fEJ/y6UxGRT4okp7FP3o5i44AxAdMW4bTLJr eXHuPutGMBtfsqEfLRhSlHIlAmleUCl7JMYc/Owj26dL4fBS5weINmIZKi4O2OwZmi8c AglQ== X-Gm-Message-State: AOAM532n5wv2UxP0cV2DV/IIYLJqy4kHOaU53SQBZ0Ra7iWkGZOwPhYA +1irvOtCVQZeFOfhdbPWKrJC7BKEGuw= X-Google-Smtp-Source: ABdhPJwaRA0Dpomt3B/t2whYQVA2XXUwuAGrhx7euTVqqB/icksq8i5T3iAbaXKtOvDBvuFeF5XBTQ== X-Received: by 2002:a17:90a:df96:: with SMTP id p22mr2809160pjv.129.1637098351059; Tue, 16 Nov 2021 13:32:31 -0800 (PST) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id kk7sm3202589pjb.19.2021.11.16.13.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 13:32:29 -0800 (PST) To: GLIBC patches Subject: [PATCH v2] malloc: Fix malloc debug for 2.35 onwards Date: Wed, 17 Nov 2021 06:32:25 +0900 Message-Id: <20211116213225.3032782-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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: Stafford Horne via Libc-alpha From: Stafford Horne Reply-To: Stafford Horne Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The change 1e5a5866cb ("Remove malloc hooks [BZ #23328]") has broken ports that are using GLIBC_2_35, like the new OpenRISC port I am working on. The libc_malloc_debug.so library used to bring in the debug infrastructure is currently essentially empty for GLIBC_2_35 ports like mine causing mtrace tests to fail: cat sysdeps/unix/sysv/linux/or1k/shlib-versions DEFAULT GLIBC_2.35 ld=ld-linux-or1k.so.1 FAIL: posix/bug-glob2-mem FAIL: posix/bug-regex14-mem FAIL: posix/bug-regex2-mem FAIL: posix/bug-regex21-mem FAIL: posix/bug-regex31-mem FAIL: posix/bug-regex36-mem FAIL: malloc/tst-mtrace. The issue seems to be with the ifdefs in malloc/malloc-debug.c. The ifdefs are currently essentially exluding all symbols for ports > 2.35. Removing the top level SHLIB_COMPAT ifdef allows things to just work. Fixes: 1e5a5866cb ("Remove malloc hooks [BZ #23328]") Cc: Siddhesh Poyarekar Reviewed-by: Siddhesh Poyarekar --- Changes since v2: - Just remove SHLIB_COMPAT, using compat_symbol seems to do what Siddhesh was explaining he wanted to do. malloc/malloc-debug.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/malloc/malloc-debug.c b/malloc/malloc-debug.c index 3d7e6d44fd..99aa95b145 100644 --- a/malloc/malloc-debug.c +++ b/malloc/malloc-debug.c @@ -24,7 +24,6 @@ #include #include -#if SHLIB_COMPAT (libc_malloc_debug, GLIBC_2_0, GLIBC_2_34) /* Support only the glibc allocators. */ extern void *__libc_malloc (size_t); extern void __libc_free (void *); @@ -669,4 +668,3 @@ compat_symbol (libc_malloc_debug, __free_hook, __free_hook, GLIBC_2_0); compat_symbol (libc_malloc_debug, __malloc_hook, __malloc_hook, GLIBC_2_0); compat_symbol (libc_malloc_debug, __realloc_hook, __realloc_hook, GLIBC_2_0); compat_symbol (libc_malloc_debug, __memalign_hook, __memalign_hook, GLIBC_2_0); -#endif