From patchwork Mon Mar 20 06:07:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reini Urban X-Patchwork-Id: 66627 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 281333857C44 for ; Mon, 20 Mar 2023 06:08:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 281333857C44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679292515; bh=3MSYltlPPG7PaZuoJ57NZ5tPf1aGdDpAbZYE4E6zoeo=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=EQJDCqa2EWWlVE/ap3hEKdXt3H8IhOcmpiSGc+h/l7Q2k+Qz67Lhjwto51KvJDyhb evbubq2Sc+5Dj7sLF8ViLlBodGPU41+rw7aILbal4qq5GjIEVIww9JV6poO/DBAMnA vuJsI4y4uerHz07YxdWdvVoY4QhwEQJiPTxpt3Ds= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by sourceware.org (Postfix) with ESMTPS id 1553D3858C53 for ; Mon, 20 Mar 2023 06:08:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1553D3858C53 Received: by mail-ed1-x533.google.com with SMTP id y4so42370426edo.2 for ; Sun, 19 Mar 2023 23:08:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679292484; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=sZwCLJTgnBmUv/5NzuarX2oSjZRwXtM33+bMJubTLiY=; b=hZSP4l/7U0WAoI4G2IanxUnw56Co5oYDllcuQTaKMkm0DQbYRCopvk44CQAovKwve+ dUdrpr5oHCiMhe5jeDwjN2XAFrwf+RzaMfjSF4jhxx21MHBywYyrAeCws1/H9FKuQQEJ jUPR22cK9BGJCNfwCwBPH9sdesSnJ9c+bXlPrx3x4NsV36DrMp/L6I1ulFLtiNx1p4+c dpBSyRVyGcXqZQQg641xrCDTQysCseBPZACkn/U6FpFOBt7WZ9V0P4gltOtvp4W3yDDP Wh1qmsr81ZeMcS+diQ8udMD76eLGw3TxQN3ldzdTjpir2rmeOjfbsWTCsNsRlpQEWR5/ 7AzQ== X-Gm-Message-State: AO0yUKUAOcicweODrCEWhf83fC4tKkZLdG4+SPhvJ1f/C0FvQBL6horn btS8h9TpSIXXIw+UkcP0SFJWAHDUu5VQ+dLWRKcbzvH1Bis= X-Google-Smtp-Source: AK7set/Ph/wWnnu5m41jYCoB/tD6IDG5QICFSYA/Cjdr1xYSu6HAHaNiTvuIYGqgLWKmYrhP5ekTsAGOem+Bchzi7jM= X-Received: by 2002:a50:cd1d:0:b0:4fc:8749:cd77 with SMTP id z29-20020a50cd1d000000b004fc8749cd77mr5746158edi.3.1679292484018; Sun, 19 Mar 2023 23:08:04 -0700 (PDT) MIME-Version: 1.0 Date: Mon, 20 Mar 2023 07:07:52 +0100 Message-ID: Subject: [PATCH] fix for __sanitizer_struct_mallinfo with mallinfo2 To: gcc-patches@gcc.gnu.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Reini Urban via Gcc-patches From: Reini Urban Reply-To: Reini Urban Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Fix sanititzers with mallinfo2 e.g fedora already uses mallinfo2 with long v[10]; From 6e1ab452bcf2bae0be20faf65966c8ee2f755a2b Mon Sep 17 00:00:00 2001 From: Reini Urban Date: Sun, 20 Feb 2022 18:27:15 +0100 Subject: [PATCH 2/2] gcc: fixup report_heap_memory_use() without mallinfo2 decl gcc/ChangeLog: * gcc/ggc-common.cc (report_heap_memory_use): fix without mallinfo2 decl Signed-off-by: Reini Urban --- gcc/ggc-common.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git gcc/ggc-common.cc gcc/ggc-common.cc index db317f49993..9cd446995f8 100644 --- gcc/ggc-common.cc +++ gcc/ggc-common.cc @@ -1276,7 +1276,7 @@ void report_heap_memory_use () { #if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2) -#ifdef HAVE_MALLINFO2 +#if defined HAVE_MALLINFO2 && HAVE_DECL_MALLINFO2 #define MALLINFO_FN mallinfo2 #else #define MALLINFO_FN mallinfo -- 2.34.1