From patchwork Mon Jun 5 04:41:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 103081 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2451017vqr; Sun, 4 Jun 2023 21:42:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4nFrIawwk3/rONmTE3x9C36WcmQiKb8aW2dXhGsuPlgFsS07+EKBiyXShb+DnfSvBdu5hb X-Received: by 2002:a05:6402:2142:b0:514:eb2c:4822 with SMTP id bq2-20020a056402214200b00514eb2c4822mr6461307edb.4.1685940138386; Sun, 04 Jun 2023 21:42:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685940138; cv=none; d=google.com; s=arc-20160816; b=Ylh9VFdolgWKKdAwr9VTAByUf8DIFqFOVff0g7sRyVO3syWPOASIM5pGCxj8L4JlBs dxB/7Yu/9H6ezGnHmmoulQYG4+4R9fYz9lr/yfXxlziwwibBlsQOwtdfUyZb1LZIqWjx WfLb5WwAnuvo0Zv1l40y1YGpuI18djMrxwWZkOSe8MONWZjU0NVLcw8huEhkxurUr9Dc ODTq7uz7rlA4BHS0ElIXlKpYYjFZBTFO2nnoweT2HQ5W3+SOWfnqhMo2FAZWeHbD+tLx 21wa+/TZiN4T7iuajiIKXYL5Kj4pdp0law9ZsRfdM/EjBHkfTlnf4CcQOUVd43MHhjtw q4Xg== 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=RNaRM1MaAVRyAJ4nhR437vKtdjBE0SR4hGUVmbZ07rQ=; b=O0KNrlNeQ7tQ0stIyI30R8oeHdfMHrRlAHvbNFzrCRx/ovhixOO5C3ACjv6z4LldbT YS8e1X2G/SvAB0OIuNfZ3VMRfd7d0LQ2smVkZahyWkh7hpFku898sU6i9reso6+xzdNN 83Ba2TxTg/8FRmmbyB2MsSCuI+V8tjL1xT1Qgh46xPPu1RBWDzVt1FxlM4sDC8ph3q4R Oxhfd6+zrUxpCCaTo+aHHo4dygoQcN2uFi34Tm2OZbGuLJSJF1QtrYg8iYoCdYS1D3FD znwcjaKQ9ZYPmXlFjApzUEXn+6vS6IC6CHxznwuKaIRMNGX0vf54IgJd+Nh6Z7Vzh72v ln/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wteKRaxM; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id e20-20020a50fb94000000b00510b6b9aa11si4403945edq.459.2023.06.04.21.42.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jun 2023 21:42:18 -0700 (PDT) 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=wteKRaxM; 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 C73183858280 for ; Mon, 5 Jun 2023 04:42:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C73183858280 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685940128; bh=RNaRM1MaAVRyAJ4nhR437vKtdjBE0SR4hGUVmbZ07rQ=; h=To:CC:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=wteKRaxMHQA4BRL5x1KpwLcsAKKSCyl0YqktbY7RubuXwHMxmTSUvYdb8hpSM+Q34 wnhpDcf5k+iqWLX+YJ6YyMMKvGzyZz2uObyFEpN2DVjq51chglU+MpM3PZitRgu9mf yn9EWgwW7j3an0icKgOyYF6TAC0GbrTo6bhr0CJk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by sourceware.org (Postfix) with ESMTPS id EC2E83858401 for ; Mon, 5 Jun 2023 04:41:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC2E83858401 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 354KeM2Z015729 for ; Sun, 4 Jun 2023 21:41:23 -0700 Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3r02vpd3x8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Sun, 04 Jun 2023 21:41:23 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Sun, 4 Jun 2023 21:41:22 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Sun, 4 Jun 2023 21:41:21 -0700 Received: from vpnclient.wrightpinski.org.com (unknown [10.69.242.187]) by maili.marvell.com (Postfix) with ESMTP id 967CA3F706A; Sun, 4 Jun 2023 21:41:21 -0700 (PDT) To: CC: Andrew Pinski Subject: [PATCH] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure Date: Sun, 4 Jun 2023 21:41:12 -0700 Message-ID: <20230605044112.2861212-1-apinski@marvell.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Proofpoint-GUID: eddLq81BaO6z1iDHzXrfmbcakM7eWBCG X-Proofpoint-ORIG-GUID: eddLq81BaO6z1iDHzXrfmbcakM7eWBCG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-03_08,2023-06-02_02,2023-05-22_02 X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: Andrew Pinski via Gcc-patches From: Andrew Pinski Reply-To: Andrew Pinski 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?1767836366210858151?= X-GMAIL-MSGID: =?utf-8?q?1767836366210858151?= On sh target, there is a MULTILIB_DIRNAMES (or is it MULTILIB_OPTIONS) named m2, this conflicts with the langauge m2. So when you do a `make clean`, it will remove the m2 directory and then a build will fail. Now since r0-78222-gfa9585134f6f58, the multilib directories are no longer created in the gcc directory as libgcc was moved to the toplevel. So we can remove the part of clean that removes those directories. Tested on x86_64-linux-gnu and a cross to sh-elf that `make clean` followed by `make` works again. OK? gcc/ChangeLog: PR bootstrap/110085 * Makefile.in (clean): Remove the removing of MULTILIB_DIR/MULTILIB_OPTIONS directories. --- gcc/Makefile.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 1d39e6dd3f8..0c02f312985 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3622,13 +3622,6 @@ clean: mostlyclean lang.clean -rm -f doc/*.pdf # Delete the include directories. -rm -rf include include-fixed -# Delete files used by the "multilib" facility (including libgcc subdirs). - -rm -f multilib.h tmpmultilib* - -if [ "x$(MULTILIB_DIRNAMES)" != x ] ; then \ - rm -rf $(MULTILIB_DIRNAMES); \ - else if [ "x$(MULTILIB_OPTIONS)" != x ] ; then \ - rm -rf `echo $(MULTILIB_OPTIONS) | sed -e 's/\// /g'`; \ - fi ; fi # Delete all files that users would normally create # while building and installing GCC.