From patchwork Tue Jun 6 21:33:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 104117 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3683074vqr; Tue, 6 Jun 2023 14:34:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7eTxfJThKsfHWVm8I4ZwpNfjc+q7smCd/S3dsmIhb/GGAT1kjRaIICZUl35bn0bHxTpZAX X-Received: by 2002:aa7:c79a:0:b0:510:dd3e:86cd with SMTP id n26-20020aa7c79a000000b00510dd3e86cdmr3105915eds.20.1686087249696; Tue, 06 Jun 2023 14:34:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686087249; cv=none; d=google.com; s=arc-20160816; b=AZyQO3L5Hi3yaFEg1sUgP7bQxblXpHNrEjZ601PVhoEYwnQWV3+oP6znAdHFn77lHg TUmxCojETCQTsdS8wZ1Kq4g+coKsXrkWnJrWhVnbGggSnLYXS3pA4+t0KGK1X90YvZug a7eWz3A5k7Kk9765/Y3riQYswatsHZmsD1GWcEY9EuIxDPt6BkH+4BC0azJTgHBzbCgf JiuuhQ1Jda7OCY6+/klwLf1Wc5uuKJwn9yjgFwwBDINs+ZyDOTL0rdCoMJZvj/6ZqWIE zWMs3sla13TRSD6m48k57yt/oF31y4UVqxKBBJJPCjQCdWpBAyieJKuwN4erO5AP0tGa Ynvw== 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=YstDSWobLQIpQYhZdq3zElJ2o6W2ENmqQEy9r9nTtfc=; b=wJp/a4JrPer4AmNZOD4N3gULB4kKp51V1qGPQY4XdxAJ3/phRZvPKAfzaRmvkLNTKY PptoU7YP926iUTDE2VJTrbnDlh+Rj/t8+5emzr7uiwdiR+XClDgIXk0QBqox71UfInxr wSDX4TgrnfrEwIEWrjZYXNyRYQwtI/R3vxgYP4MnA9WryWpGZOWrQtzN/+Di63Tp6EcK tXee/8AmUKVJZe1lvOWoNR8oSgC8UmNwG6K1d+erfMSeC01Z46ualj6pBx3jDso+9okV IWfHc7wqQRBoEeEjoWYWu53Y6OjnqxNn3VNg+UIjJ9kQtlBUjDsESdkXfZtNx6kYAfDu nGjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=fie2uoh8; 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 c23-20020aa7d617000000b0050bcbaa217fsi7432063edr.80.2023.06.06.14.34.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 14:34:09 -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=fie2uoh8; 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 8E1E3385802F for ; Tue, 6 Jun 2023 21:34:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E1E3385802F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686087248; bh=YstDSWobLQIpQYhZdq3zElJ2o6W2ENmqQEy9r9nTtfc=; h=To:CC:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=fie2uoh8vtoRzYKNbSsdwOrlOwEUqtMzFL5WIHjRvURg+Nk4aLX7S77xWZomBobC+ bcKMqH64ePGNquUXSGVDJzf8wbjrz0sKxLVmKjkYp8bJbKcD/h0d/IhiRFpBLYqeAH JsW3cwrMHVh+kFuX3MGHuW9qv2gVXw7Xl23hn0Qc= 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 3AD2D3858D38 for ; Tue, 6 Jun 2023 21:33:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3AD2D3858D38 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 356K4kKk025615 for ; Tue, 6 Jun 2023 14:33:24 -0700 Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3r2a7brk1r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 06 Jun 2023 14:33:23 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Tue, 6 Jun 2023 14:33: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; Tue, 6 Jun 2023 14:33:22 -0700 Received: from vpnclient.wrightpinski.org.com (unknown [10.69.242.187]) by maili.marvell.com (Postfix) with ESMTP id 4A0425B6931; Tue, 6 Jun 2023 14:33:22 -0700 (PDT) To: CC: Andrew Pinski Subject: [COMMITTED/13] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure Date: Tue, 6 Jun 2023 14:33:15 -0700 Message-ID: <20230606213315.2993028-1-apinski@marvell.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: m1TQ5Jesu1fY5_1TvjUAVXmZmGUF2XPV X-Proofpoint-GUID: m1TQ5Jesu1fY5_1TvjUAVXmZmGUF2XPV 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-06_16,2023-06-06_02,2023-05-22_02 X-Spam-Status: No, score=-14.5 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?1767990624090558510?= X-GMAIL-MSGID: =?utf-8?q?1767990624090558510?= 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. Committed as approved. gcc/ChangeLog: PR bootstrap/110085 * Makefile.in (clean): Remove the removing of MULTILIB_DIR/MULTILIB_OPTIONS directories. (cherry picked from commit afd87299cefd021daf0158d5b6276c37013996b9) --- gcc/Makefile.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index ad9a5d94cd0..775aaa1b3c4 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3585,13 +3585,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.