From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by sourceware.org (Postfix) with ESMTPS id 732603858401 for ; Mon, 5 Jun 2023 06:33:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 732603858401 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-lj1-x232.google.com with SMTP id 38308e7fff4ca-2b1b06af50eso33597751fa.1 for ; Sun, 04 Jun 2023 23:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685946837; x=1688538837; 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=pE6+sqYB9afqqIkUb12F2wxthSVQlEABvZ6E1hjs5GE=; b=WmeJy6yJbLLc+QjfYkpfoDPD3khpu12gmYRx2C0OYT7k+bMP+gc8cJ1VhDtkyqZILW W5IEEF78lGCHiz/OOQBQmIxpm1kf8DxfUeoW73YlljwDHLh3bjNR/MuP/hgeWo7sgjK4 8fwkDFGLbjNbvFqHLUjdMgYzLpt5xjAWeF4wKOcFBI/3qoakgrP/0OaBTuYNb8Mm1RRB gyeWz1L0yTzjgJC9HAbBWBDqhuGr9kfh5qf7Vlf6Xjj1uHTPsh1zOK0HixovaeLEpG86 4fkx8BOyf7jrXjxNha1wvb6R5ORxo+NEdfnP20SM47kvA46nEoycKEmORUOCM3QLGwWl AL+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685946837; x=1688538837; 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=pE6+sqYB9afqqIkUb12F2wxthSVQlEABvZ6E1hjs5GE=; b=SWMCNKN3X/aYLnGowXRxTKlAab51IHEIzmMID7WVM8lytVPi2JVLnKP1ygElv3kVBM mFgzJyNIMyQFc0SLq2BJtuvaYPN0doR0I+ypClkmx1nsN2Yu+e5L8FMlPBLqmxzx1pqv Nuz9yjUta8yjZn15WLW1Lp2Te0oF6y9yhTzc23fUISv/y9Ko1aM0KZF///E6EACWhgj5 XnR2hv/io6jpYGpNzIXJ4n38z+GFLZ905dDXCCZcc0fKgZ+hM3H7DHVeORk0sSaCVnx1 wmZWuKOUxxCzalxB0dlFsu3g68BD7KD+vjDfwKZeJyuMH2aArZR2XuG+qudvq8sVtPEC FPcg== X-Gm-Message-State: AC+VfDxqjvLIVGWcHPIkVnvb+GuADxpZHRrOetoVgPGQfJ8gtMB0TX/C jSn0gU2iUFzW7G0I8xVZlBln1IDOyNjY4u1D2JU= X-Google-Smtp-Source: ACHHUZ5K0VHAuJ+Qm637PPk6hQMyDf1/pPO3mBo+BLUOt8NBjdOT6RcW2jeTexrO2v5CuDGUf/m+/0tyW7dnudi7VrM= X-Received: by 2002:a05:651c:89:b0:2b0:5f62:8b8 with SMTP id 9-20020a05651c008900b002b05f6208b8mr3245868ljq.42.1685946836712; Sun, 04 Jun 2023 23:33:56 -0700 (PDT) MIME-Version: 1.0 References: <20230605044112.2861212-1-apinski@marvell.com> <6E446C0B-DD2C-46CD-96E4-538B4339EF45@gmail.com> In-Reply-To: From: Richard Biener Date: Mon, 5 Jun 2023 08:33:44 +0200 Message-ID: Subject: Re: [PATCH] Fix PR 110085: `make clean` in GCC directory on sh target causes a failure To: Andrew Pinski Cc: Andrew Pinski , gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,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 List-Id: On Mon, Jun 5, 2023 at 7:43=E2=80=AFAM Andrew Pinski wr= ote: > > On Sun, Jun 4, 2023 at 10:24=E2=80=AFPM Richard Biener via Gcc-patches > wrote: > > > > > > > > > Am 05.06.2023 um 06:42 schrieb Andrew Pinski via Gcc-patches : > > > > > > =EF=BB=BFOn sh target, there is a MULTILIB_DIRNAMES (or is it MULTILI= B_OPTIONS) named m2, > > > this conflicts with the langauge m2. So when you do a `make clean`, i= t will remove > > > the m2 directory and then a build will fail. Now since r0-78222-gfa95= 85134f6f58, > > > the multilib directories are no longer created in the gcc directory a= s libgcc > > > was moved to the toplevel. So we can remove the part of clean that re= moves those > > > directories. > > > > > > Tested on x86_64-linux-gnu and a cross to sh-elf that `make clean` fo= llowed by > > > `make` works again. > > > > > > OK? > > > > Ok > > Is a similar patch ok for GCC 13 branch as we would get a similar > failure there too? Yes, though I wonder if we should worry. Richard. > Thanks, > Andrew > > > > > > 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 sub= dirs). > > > - -rm -f multilib.h tmpmultilib* > > > - -if [ "x$(MULTILIB_DIRNAMES)" !=3D x ] ; then \ > > > - rm -rf $(MULTILIB_DIRNAMES); \ > > > - else if [ "x$(MULTILIB_OPTIONS)" !=3D 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. > > > -- > > > 2.31.1 > > >