From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-x112c.google.com (mail-yw1-x112c.google.com [IPv6:2607:f8b0:4864:20::112c]) by sourceware.org (Postfix) with ESMTPS id 9C55E3858D37 for ; Tue, 14 Mar 2023 13:53:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9C55E3858D37 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-yw1-x112c.google.com with SMTP id 00721157ae682-5416698e889so185163237b3.2 for ; Tue, 14 Mar 2023 06:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678801985; 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=aFYR2j342YEOkOqb5qPuvpRxRjlf25bt0cORt25Urjc=; b=KAq6l0ixWUKMOwo/qEsmI4gWVVJA86QLNvcJwsr86Y+3AuEOpJY7nLe3TXP7IzYcyG GrHWinx5WPfV7Rq22qPJRV9ce8/4Iu2nEClXWP0uTL2B6oaZBnaifIsC7EYKHaGoxb7U 4lT/5hbw2sq5d5S1DwYLsdMUnCp84JNifT9N0+nai4lcJBFm4VKx3YArRQZFGtkePhXA NaYGCcJjsfxllMHSasEoxm7zMIc5IooKDGaOEnt5Dytb+hbgiErzECGKXQRjRhMudgBt exzQ7Y+ckZ55jDu+Q3fZzXymY/g9y57aseES+uCgf0hKGJgJ7o81PcklZ/whQnOF2bcG KVww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678801985; 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=aFYR2j342YEOkOqb5qPuvpRxRjlf25bt0cORt25Urjc=; b=5m/QTJuR/iwtivAMumrD5XHjnIYkzCoNq+fuHtb9n33SI7/HK4KB6HQOLDU8VkKQBk PdE1GttW0Mn7nz3lSc/NUAE4bg4iE1N4KdYjkIIPTeFvKHaWbhSdOkM1Vs4hw1T1dTXV fW3c/umnml5UF1yiHdL3+kKRklYIEwlPA4jp2jhNOIpkYn7Z4nu6KBM/5I1FnRbFzlU4 fi0URon4zMB2fHYLs53UkQaTUihypXpEArlbSwLYMIjU8UcdzeB2XXZ3yW9EXRSsI+WW 55coaC89h/kONepm2Zb+5PIxoUQ//EOn5P56LmAJVno+O2KI6uST9HEvSsh4eF7rUlu0 py5w== X-Gm-Message-State: AO0yUKUda/D7j8xChe8pYW4/v8M+jk43ERDwx2Wrn6elqWoTJ/C0Gf+X x3wGuMVcCh1uz5qVNWC/nGH8q3eo/q3KmYYMYyXFUec9LZI= X-Google-Smtp-Source: AK7set9U4ZnDrFIDPo83sOGozEOJ0qst22I3zGTtiRnizJwiE8Aqejx1TnUiPrpb6mlNVmUxHiGiV7t+ZYC5iMJk8kE= X-Received: by 2002:a05:6102:5c2:b0:425:b38b:650 with SMTP id v2-20020a05610205c200b00425b38b0650mr586355vsf.7.1678801482673; Tue, 14 Mar 2023 06:44:42 -0700 (PDT) MIME-Version: 1.0 References: <20230314002354.367655-1-sam@gentoo.org> In-Reply-To: From: Kito Cheng Date: Tue, 14 Mar 2023 21:44:31 +0800 Message-ID: Subject: Re: [PATCH v4 1/2] RISC-V: Avoid calloc() poisoning on musl To: Richard Biener Cc: Sam James , gcc-patches@gcc.gnu.org, 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.5 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: RISC-V part is ok, and I assume you didn't have write access so I'm gonna push that since the system.h change also got approved :) On Tue, Mar 14, 2023 at 5:07=E2=80=AFPM Richard Biener via Gcc-patches wrote: > > 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= /work/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 49d508065bdd36fb1= a9b6aad9666b1edb5e06474, > > which was fixed in PR106102. > > The system.h change is OK > > > gcc/ChangeLog: > > * config/riscv/genrvv-type-indexer.cc: Avoid calloc() poisoning= on 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= /genrvv-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 > >