[Bug bootstrap/110085] New: make clean inside the gcc directory when configured with m2 language and for sh-elf messes up

[Bug bootstrap/110085] New: make clean inside the gcc directory when configured with m2 language and for sh-elf messes up

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110085

            Bug ID: 110085
           Summary: make clean inside the gcc directory when configured
                    with m2 language and for sh-elf messes up
           Product: gcc
           Version: 14.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: bootstrap
          Assignee: unassigned at gcc dot gnu.org
          Reporter: pinskia at gcc dot gnu.org
  Target Milestone: ---

make clean does:
# 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


and one of the MULTILIB_DIRNAMES for sh-elf is m2 but m2 is also the name of
the language.

I think that part of the gcc/Makefile.in can be removed now (since libgcc is
not built inside the gcc directory for years now) but I am not 100% sure.

[Bug bootstrap/110085] make clean inside the gcc directory when configured with m2 language and for sh-elf messes up

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110085

Andrew Pinski <pinskia at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Last reconfirmed|                            |2023-06-05
     Ever confirmed|0                           |1
           Assignee|unassigned at gcc dot gnu.org      |pinskia at gcc dot gnu.org
             Status|UNCONFIRMED                 |ASSIGNED

--- Comment #1 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
I will do the patch here. Since these directories are no longer created (for a
long time now). The clean part comes from 1994 so I suspect when libgcc was
moved to the toplevel in GCC 4.3.0 in 2007 (r0-78222-gfa9585134f6f58), the
clean part was not removed and didn't make a huge difference for most targets
until GCC 13 when m2 was added and sh has a m2 multilib.

[Bug bootstrap/110085] make clean inside the gcc directory when configured with m2 language and for sh-elf messes up

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110085

Andrew Pinski <pinskia at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                URL|                            |https://gcc.gnu.org/piperma
                   |                            |il/gcc-patches/2023-June/62
                   |                            |0613.html
           Keywords|                            |patch

--- Comment #2 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
Patch submitted:
https://gcc.gnu.org/pipermail/gcc-patches/2023-June/620613.html

[Bug bootstrap/110085] make clean inside the gcc directory when configured with m2 language and for sh-elf messes up

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110085

--- Comment #3 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The trunk branch has been updated by Andrew Pinski <pinskia@gcc.gnu.org>:

https://gcc.gnu.org/g:afd87299cefd021daf0158d5b6276c37013996b9

commit r14-1541-gafd87299cefd021daf0158d5b6276c37013996b9
Author: Andrew Pinski <apinski@marvell.com>
Date:   Mon Jun 5 04:32:00 2023 +0000

    Fix PR 110085: `make clean` in GCC directory on sh target causes a failure

    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.

[Bug bootstrap/110085] make clean inside the gcc directory when configured with m2 language and for sh-elf messes up

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110085

Andrew Pinski <pinskia at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |13.2
      Known to work|                            |14.0

--- Comment #4 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
Fixed on the trunk, I want to get this into the GCC 13 branch since someone
would hit there, GCC 12 and before is less important as m2 is only for GCC 13+.

[Bug bootstrap/110085] make clean inside the gcc directory when configured with m2 language and for sh-elf messes up

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110085

--- Comment #5 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The releases/gcc-13 branch has been updated by Andrew Pinski
<pinskia@gcc.gnu.org>:

https://gcc.gnu.org/g:044ee48215fd7eca1f1680758cd27574ff274417

commit r13-7421-g044ee48215fd7eca1f1680758cd27574ff274417
Author: Andrew Pinski <apinski@marvell.com>
Date:   Mon Jun 5 04:32:00 2023 +0000

    Fix PR 110085: `make clean` in GCC directory on sh target causes a failure

    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)

[Bug bootstrap/110085] make clean inside the gcc directory when configured with m2 language and for sh-elf messes up

[pinskia at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110085

Andrew Pinski <pinskia at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|---                         |FIXED

--- Comment #6 from Andrew Pinski <pinskia at gcc dot gnu.org> ---
Fixed; not going to backport to GCC 10, 11, or 12 as only GCC 13 has m2.