public inbox for gcc-bugs@sourceware.org help / color / mirror / Atom feed
From: "cvs-commit 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: Thu, 29 Sep 2022 10:06:16 +0000 [thread overview] Message-ID: <bug-107059-4-C0lpJTX0tl@http.gcc.gnu.org/bugzilla/> (raw) In-Reply-To: <bug-107059-4@http.gcc.gnu.org/bugzilla/> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107059 --- Comment #28 from CVS Commits <cvs-commit at gcc dot gnu.org> --- The master branch has been updated by Jakub Jelinek <jakub@gcc.gnu.org>: https://gcc.gnu.org/g:a5a9237e2a78a9854f1f87e63ef5619cf8ba7360 commit r13-2932-ga5a9237e2a78a9854f1f87e63ef5619cf8ba7360 Author: Jakub Jelinek <jakub@redhat.com> Date: Thu Sep 29 12:04:24 2022 +0200 driver, cppdefault: Unbreak bootstrap on Debian/Ubuntu [PR107059] My recent change to enable _Float{16,32,64,128,32x,64x,128x} for C++ apparently broke bootstrap on some Debian/Ubuntu setups. Those multiarch targets put some headers into /usr/include/x86_64-linux-gnu/bits/ etc. subdirectory instead of /usr/include/bits/. This is handled by /* /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 }, in cppdefault.cc, where the 2 in the last element of the first initializer means the entry is ignored on non-multiarch and suffixed by the multiarch dir otherwise, so installed gcc has search path like: /home/jakub/gcc/obj01inst/usr/local/bin/../lib/gcc/x86_64-pc-linux-gnu/13.0.0/include /home/jakub/gcc/obj01inst/usr/local/bin/../lib/gcc/x86_64-pc-linux-gnu/13.0.0/include-fixed /usr/local/include /usr/include/x86_64-linux-gnu /usr/include (when installed with DESTDIR=/home/jakub/gcc/obj01inst). Now, when fixincludes is run, it is processing the whole /usr/include dir and all its subdirectories, so floatn{,-common.h} actually go into .../include-fixed/x86_64-linux-gnu/bits/floatn{,-common.h} because that is where they appear in /usr/include too. In some setups, /usr/include also contains /usr/include/bits -> x86_64-linux-gnu/bits symlink and after the r13-2896 tweak it works. In other setups there is no /usr/include/bits symlink and when one #include <bits/floatn.h> given the above search path, it doesn't find the fixincluded header, as /home/jakub/gcc/obj01inst/usr/local/bin/../lib/gcc/x86_64-pc-linux-gnu/13.0.0/include-fixed/bits/floatn.h doesn't exist and /home/jakub/gcc/obj01inst/usr/local/bin/../lib/gcc/x86_64-pc-linux-gnu/13.0.0/include-fixed/x86_64-linux-gnu/bits/floatn.h isn't searched and so /usr/include/x86_64-linux-gnu/bits/floatn.h wins and we fail because of typedef whatever _Float128; and similar. The following patch ought to fix this. The first hunk by arranging that the installed search path actually looks like: /home/jakub/gcc/obj01inst/usr/local/bin/../lib/gcc/x86_64-pc-linux-gnu/13.0.0/include /home/jakub/gcc/obj01inst/usr/local/bin/../lib/gcc/x86_64-pc-linux-gnu/13.0.0/include-fixed/x86_64-linux-gnu /home/jakub/gcc/obj01inst/usr/local/bin/../lib/gcc/x86_64-pc-linux-gnu/13.0.0/include-fixed /usr/local/include /usr/include/x86_64-linux-gnu /usr/include and thus for include-fixed it treats it the same as /usr/include. The second FIXED_INCLUDE_DIR entry there is: { 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 }, where SYSROOT_HEADERS_SUFFIX_SPEC is defined only on vxworks or mips*-mti-linux and arranges for multilib path to be appended there. Neither of those systems is multiarch. This isn't enough, because when using the -B option, the driver adds -isystem .../include-fixed in another place, so the second hunk modifies that spot the same. /home/jakub/gcc/obj01/gcc/xgcc -B /home/jakub/gcc/obj01/gcc/ then has search path: /home/jakub/gcc/obj01/gcc/include /home/jakub/gcc/obj01/gcc/include-fixed/x86_64-linux-gnu /home/jakub/gcc/obj01/gcc/include-fixed /usr/local/include /usr/include/x86_64-linux-gnu /usr/include which again is what I think we want to achieve. 2022-09-29 Jakub Jelinek <jakub@redhat.com> PR bootstrap/107059 * cppdefault.cc (cpp_include_defaults): If SYSROOT_HEADERS_SUFFIX_SPEC isn't defined, add FIXED_INCLUDE_DIR entry with multilib flag 2 before FIXED_INCLUDE_DIR entry with multilib flag 0. * gcc.cc (do_spec_1): If multiarch_dir, add include-fixed/multiarch_dir paths before include-fixed paths.
next prev parent reply other threads:[~2022-09-29 10:06 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-27 16:46 [Bug bootstrap/107059] New: " seurer at gcc dot gnu.org 2022-09-27 17:10 ` [Bug bootstrap/107059] " jakub at gcc dot gnu.org 2022-09-27 17:28 ` marxin at gcc dot gnu.org 2022-09-27 17:37 ` jakub at gcc dot gnu.org 2022-09-27 18:40 ` seurer at gcc dot gnu.org 2022-09-27 18:50 ` jakub at gcc dot gnu.org 2022-09-27 18:52 ` seurer at gcc dot gnu.org 2022-09-27 19:13 ` jakub at gcc dot gnu.org 2022-09-27 19:20 ` seurer at gcc dot gnu.org 2022-09-27 19:26 ` jakub at gcc dot gnu.org 2022-09-27 19:59 ` seurer at gcc dot gnu.org 2022-09-27 20:22 ` jakub at gcc dot gnu.org 2022-09-28 9:45 ` tnfchris at gcc dot gnu.org 2022-09-28 9:46 ` jakub at gcc dot gnu.org 2022-09-28 10:12 ` jakub at gcc dot gnu.org 2022-09-28 10:59 ` burnus at gcc dot gnu.org 2022-09-28 11:18 ` burnus at gcc dot gnu.org 2022-09-28 11:26 ` burnus at gcc dot gnu.org 2022-09-28 11:37 ` jakub at gcc dot gnu.org 2022-09-28 12:58 ` burnus at gcc dot gnu.org 2022-09-28 13:10 ` burnus at gcc dot gnu.org 2022-09-28 13:12 ` jakub at gcc dot gnu.org 2022-09-28 17:16 ` joseph at codesourcery dot com 2022-09-28 18:40 ` burnus at gcc dot gnu.org 2022-09-28 18:47 ` jakub at gcc dot gnu.org 2022-09-28 18:57 ` burnus at gcc dot gnu.org 2022-09-28 19:04 ` jakub at gcc dot gnu.org 2022-09-28 19:20 ` manuel.lauss at googlemail dot com 2022-09-29 8:07 ` rguenth at gcc dot gnu.org 2022-09-29 10:06 ` cvs-commit at gcc dot gnu.org [this message] 2022-09-29 10:14 ` jakub at gcc dot gnu.org 2022-10-03 15:29 ` seurer at gcc dot gnu.org 2022-10-03 15:33 ` jakub at gcc dot gnu.org 2022-10-07 7:00 ` cvs-commit at gcc dot gnu.org 2022-10-07 7:00 ` cvs-commit at gcc dot gnu.org 2022-10-07 7:01 ` jakub at gcc dot gnu.org
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=bug-107059-4-C0lpJTX0tl@http.gcc.gnu.org/bugzilla/ \ --to=gcc-bugzilla@gcc.gnu.org \ --cc=gcc-bugs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).