From patchwork Sat Mar 11 20:24:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 68187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp440124wrd; Sat, 11 Mar 2023 12:26:06 -0800 (PST) X-Google-Smtp-Source: AK7set/+w4Il1WiALJdOLhJxa8x1cnhwldw/lfwmIIg+75M8cUpHnDuTuHJHk3L2h95DF8U2sJhr X-Received: by 2002:a17:906:c9ce:b0:8e6:bcb6:4698 with SMTP id hk14-20020a170906c9ce00b008e6bcb64698mr33238814ejb.0.1678566366683; Sat, 11 Mar 2023 12:26:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678566366; cv=none; d=google.com; s=arc-20160816; b=SjDXJlfg4/S8QMm/PyzTEVIJmvAxVKarRlWPW4+Bgl37xXaipjIUt5Pz859Bs8+hmv mlEdX2rXq2lE14ttY8z98e4vE8Y8Ahjb3PResDN0SUt3HevU3JZi1E+JKOmoZUf7K3Wv nvWP7mlK+a5V64XOBVNCALZLX9paiF9VsfE9EVOhROrgJooJyor+njY5emP0wjba8xzB oem0on+xl41vrQDZXQnG9eWYXTMLX55gRNmGdmG+ccWoN9m/rcqcsxoXre16lQDqn7qy bzez51zu6ifwL14Llrl/UYq2dFDEBvkh1Hv13FMmoMccs4MvDMID5bEeUBS3tJ9CNGq6 GCXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=4ZI71XF5eSclGXfKpBqxzTMie/xyknMA3k4SDISRozk=; b=oIXPvNv2B8ou8P0BtOlM4fuZOTHLWbGpr7WixqMuZy2Jdn2ObW/4PhgvUFRhSCkTmO bC20NFllng0x7zDVLkhTaoVW4VMlqi7q+d9xgNe2XK7OraN+IWiB0FMTyGHjq2+2GiyW eCIlYYSvJ4psNODnDGegU8XxJeImO+MEgLsMTkAAJoBlxuXQfDYKVTPcI/pdW6xsuVzV XZLk4eEXnZmzytQCr47llqatQ0ymASXXSuQCP+O0gcjixMEXb8JzPEsd4h45sC8liYts qkIf6hYQ6BrioT7hHe6NAVPDRK95ijtO1s87UxRin6aqqPOJYSzBfXy+fqpQjLRVzUZ/ ftNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=msKskbP6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id o16-20020a170906289000b008ca677bfda3si1617939ejd.572.2023.03.11.12.26.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 12:26:06 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=msKskbP6; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6AD63385800C for ; Sat, 11 Mar 2023 20:25:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6AD63385800C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678566341; bh=4ZI71XF5eSclGXfKpBqxzTMie/xyknMA3k4SDISRozk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=msKskbP6u8SMBvXtAvt2tsU1xoTuzIKyuDW7Q0usEvg2ZCM9zBWfJNkv1rf3cFBvf xNzpIuy2XlC69XBoHzmC4ewA5LedzSmKx+LLrt24opt57eOJFChzFEp7NXcnAaoftw MmPaG8Cbu+d5znZ6im5RLayiYrYZfxshksSR9ixs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 1A1843858D1E for ; Sat, 11 Mar 2023 20:24:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A1843858D1E To: gcc-patches@gcc.gnu.org Cc: Kito Cheng , Palmer Dabbelt , Andrew Waterman , Jim Wilson , Ju-Zhe Zhong , Sam James Subject: [PATCH] RISC-V: Avoid calloc() poisoning on musl Date: Sat, 11 Mar 2023 20:24:45 +0000 Message-Id: <20230311202445.3133190-1-sam@gentoo.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, 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-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: Sam James via Gcc-patches From: Sam James Reply-To: Sam James Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760104406200314379?= X-GMAIL-MSGID: =?utf-8?q?1760104406200314379?= 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 49d508065bdd36fb1a9b6aad9666b1edb5e06474, which was fixed in PR106102. gcc/ChangeLog: * config/riscv/genrvv-type-indexer.cc: Add missing include. Signed-off-by: Sam James --- gcc/ChangeLog | 5 +++++ gcc/config/riscv/genrvv-type-indexer.cc | 1 + 2 files changed, 6 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c9e557ce833..7783b2f4cd2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2023-03-11 Sam James + + * config/riscv/genrvv-type-indexer.cc: Add missing include + for musl compatibility. + 2023-03-10 Jakub Jelinek PR target/107703 diff --git a/gcc/config/riscv/genrvv-type-indexer.cc b/gcc/config/riscv/genrvv-type-indexer.cc index 0ef1d766002..b286ec84132 100644 --- a/gcc/config/riscv/genrvv-type-indexer.cc +++ b/gcc/config/riscv/genrvv-type-indexer.cc @@ -14,6 +14,7 @@ along with GCC; see the file COPYING3. If not see . */ #include "bconfig.h" +#define INCLUDE_PTHREAD_H #include "system.h" #include "errors.h"