From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by sourceware.org (Postfix) with ESMTPS id B4C683858D39 for ; Tue, 14 Mar 2023 09:07:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B4C683858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lf1-x136.google.com with SMTP id bp27so8752800lfb.6 for ; Tue, 14 Mar 2023 02:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678784827; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=a6MAg6w/L9AMeFeV1PMdQL3qeaIyr8aJdZw6L90S47U=; b=keWWiR36igos5vwTAWrCP7pLlEqmX+0/zr8Irq1/yiAsR9NbvRGzpQbZffQBlGkQqZ Lmx5iOiIk5oXkR7aAmzP4hT4Fiibr4qT8B3uUh2pP4YxMMSR7u6I1UGn0D0hiRbougaH CZEn7sLlFRomrbH1e6T2X01B9ci8AwbDORtucNkAlp22l9Xc471cDTrE9TjEu1JyP0Cs SAERQ1m5hYOxcx4KHb5FQ0PcmSnzdZcWObKwa+Qo6mGUQe8+utdrNAbyXgk8uhqRYik3 x2GAg88amm3Y0GNmfmwkkAq4EZnc2Kv0s45WJoEcmh89NXqLgBZNirZWhg1TlhbVKJwJ 5dOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678784827; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a6MAg6w/L9AMeFeV1PMdQL3qeaIyr8aJdZw6L90S47U=; b=AE1teK0v12XOp0UJUGmFeqBysUOSGGrVXSyUPfPI/jSb7anbypgbx+fNi66o8NpHWz 86cfCVVOsaEvvhS00bp+gx+cigndv3ZqBKkOu1YqHvM30C2/ZHvgWUA1R2csfoIMB2L7 meBCciGaQQWuKuwOQ+PsG5utJSfbuvWehb82miB1tlRzgWIzsN5jfD4PP0Q155UeIhqB LDF5HxXlYk5/J3hU2elVGOHIx2jyWWZqS7FYN1E69Q8iFAvSNdFcBh27t1Db/Itci7Y9 habr5D58Pv43chGlBd25qPlE6Mzim3QWgJt/7bZ1+b0ZlehzpesckGjFZdSZRzwvwsgl 4Z2A== X-Gm-Message-State: AO0yUKV9289m/vlDeMgHXrThV06SSlgey6e8GPFDnJKZUs41ntJVosVT m00qAD9Vb6Luj2JUwHPmTHBYRJqOkz5LnE2tlKI= X-Google-Smtp-Source: AK7set/0jZlbgP1xx1d700eqnaDkLeOc+DV6L7VNi7q8KeaTxnguKuuCy3kakHszSprzctYQ/ccmiVXQ2qoJtycYA0I= X-Received: by 2002:a05:6512:4dc:b0:4db:1999:67a4 with SMTP id w28-20020a05651204dc00b004db199967a4mr489433lfq.5.1678784826942; Tue, 14 Mar 2023 02:07:06 -0700 (PDT) MIME-Version: 1.0 References: <20230314002354.367655-1-sam@gentoo.org> In-Reply-To: <20230314002354.367655-1-sam@gentoo.org> From: Richard Biener Date: Tue, 14 Mar 2023 10:06:45 +0100 Message-ID: Subject: Re: [PATCH v4 1/2] RISC-V: Avoid calloc() poisoning on musl To: Sam James Cc: gcc-patches@gcc.gnu.org, Kito Cheng , Palmer Dabbelt , Andrew Waterman , Jim Wilson , Ju-Zhe Zhong Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,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 List-Id: On Tue, Mar 14, 2023 at 1:24=E2=80=AFAM Sam James via Gcc-patches wrote: > > This fixes errors like: > ``` > In file included from /usr/include/pthread.h:30, > from /usr/lib/gcc/riscv64-gentoo-linux-musl/12/include/g= ++-v12/riscv64-gentoo-linux-musl/bits/gthr-default.h:35, > from /usr/lib/gcc/riscv64-gentoo-linux-musl/12/include/g= ++-v12/riscv64-gentoo-linux-musl/bits/gthr.h:148, > from /usr/lib/gcc/riscv64-gentoo-linux-musl/12/include/g= ++-v12/ext/atomicity.h:35, > from /usr/lib/gcc/riscv64-gentoo-linux-musl/12/include/g= ++-v12/bits/ios_base.h:39, > from /usr/lib/gcc/riscv64-gentoo-linux-musl/12/include/g= ++-v12/ios:42, > from /usr/lib/gcc/riscv64-gentoo-linux-musl/12/include/g= ++-v12/istream:38, > from /usr/lib/gcc/riscv64-gentoo-linux-musl/12/include/g= ++-v12/sstream:38, > from /var/tmp/portage/sys-devel/gcc-13.0.1_pre20230305/w= ork/gcc-13-20230305/gcc/config/riscv/genrvv-type-indexer.cc:22: > /usr/include/sched.h:84:7: error: attempt to use poisoned "calloc" > 84 | void *calloc(size_t, size_t); > | ^ > /usr/include/sched.h:124:36: error: attempt to use poisoned "calloc" > 124 | #define CPU_ALLOC(n) ((cpu_set_t *)calloc(1,CPU_ALLOC_SIZE(n))) > | ^ > make[3]: *** [Makefile:2855: build/genrvv-type-indexer.o] Error 1 > ``` > > See also 3b21c21f3f5726823e19728fdd1571a14aae0fb3 and 49d508065bdd36fb1a9= b6aad9666b1edb5e06474, > which was fixed in PR106102. The system.h change is OK > gcc/ChangeLog: > * config/riscv/genrvv-type-indexer.cc: Avoid calloc() poisoning o= n musl by > including earlier. > * system.h: Add INCLUDE_SSTREAM. > > Signed-off-by: Sam James > --- > gcc/config/riscv/genrvv-type-indexer.cc | 2 +- > gcc/system.h | 4 ++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/gcc/config/riscv/genrvv-type-indexer.cc b/gcc/config/riscv/g= enrvv-type-indexer.cc > index 0ef1d766002..e677b55290c 100644 > --- a/gcc/config/riscv/genrvv-type-indexer.cc > +++ b/gcc/config/riscv/genrvv-type-indexer.cc > @@ -14,12 +14,12 @@ along with GCC; see the file COPYING3. If not see > . */ > > #include "bconfig.h" > +#define INCLUDE_SSTREAM > #include "system.h" > #include "errors.h" > > #include "coretypes.h" > > -#include > #include > #include > > diff --git a/gcc/system.h b/gcc/system.h > index 64cd5a49258..cf45db3f97e 100644 > --- a/gcc/system.h > +++ b/gcc/system.h > @@ -751,6 +751,10 @@ extern int vsnprintf (char *, size_t, const char *, = va_list); > # include > #endif > > +#ifdef INCLUDE_SSTREAM > +# include > +#endif > + > #ifdef INCLUDE_MALLOC_H > #if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2) > #include > -- > 2.40.0 >