From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugzilla@gcc.gnu.org>
Received: by sourceware.org (Postfix, from userid 48)
	id B27383858C56; Wed, 28 Sep 2022 10:12:39 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B27383858C56
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1664359959;
	bh=ULg6o3Lmy82hbUx+ZHzlVBeAHJvFXQCAEeVGLHzOeIs=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=jpxkNrw7fZlUfMCaeTMZMKCZXdnliqFUpnpwzLF/X3HsQapu6N/HQU2m3UaDk0XDL
	 P2KzsEr94os2HwveR3ZVca5ZPTFDLWG+qHVMHhUR+emqSk+KOSJpzBfR6vYC1PcOfF
	 MkhDElEAdX9wm3wAHck33yI4V04Rq6lg5cYbYIp8=
From: "jakub at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug bootstrap/107059] [13 regression] bootstrap failure after
 r13-2887-gb04208895fed34
Date: Wed, 28 Sep 2022 10:12:39 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: bootstrap
X-Bugzilla-Version: 13.0
X-Bugzilla-Keywords: 
X-Bugzilla-Severity: normal
X-Bugzilla-Who: jakub at gcc dot gnu.org
X-Bugzilla-Status: NEW
X-Bugzilla-Resolution: 
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-107059-4-ZpazftQkFL@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-107059-4@http.gcc.gnu.org/bugzilla/>
References: <bug-107059-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
List-Id: <gcc-bugs.sourceware.org>

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

--- Comment #14 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
cppdefault.cc has:
#ifdef FIXED_INCLUDE_DIR
    /* This is the dir for fixincludes.  */
    { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0,
      /* A multilib suffix needs adding if different multilibs use
         different headers.  */
#ifdef SYSROOT_HEADERS_SUFFIX_SPEC
      1
#else
      0
#endif
    },
#endif
...
#ifdef NATIVE_SYSTEM_HEADER_DIR
    /* /usr/include comes dead last.  */
    { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 2 =
},
    { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 =
},
#endif
where that 2 in the last column of the penultimate entry is what I think ad=
ds
for multi-arch the multiarch suffixes to /usr/include and 1 in the penultim=
ate
column says to prefix that with sysroot.
So, I wonder if we don't want a
    { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 2 },
entry somewhere.  SYSROOT_HEADERS_SUFFIX_SPEC is defined I think on vxworks=
 and
mti-linux, neither of which can be multiarch, so I think we could do:
--- gcc/cppdefault.cc.jj        2022-01-18 11:58:59.411984500 +0100
+++ gcc/cppdefault.cc   2022-09-28 12:11:47.923603783 +0200
@@ -74,6 +74,9 @@ const struct default_include cpp_include
 #endif
 #ifdef FIXED_INCLUDE_DIR
     /* This is the dir for fixincludes.  */
+#ifndef SYSROOT_HEADERS_SUFFIX_SPEC
+    { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 2 },
+#endif
     { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0,
       /* A multilib suffix needs adding if different multilibs use
         different headers.  */=