diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2022-09-27 12:29:46 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2022-09-27 12:33:23 +0200 |
| commit | b939a5cc4143908ddda4b85a848c313136ff6e0c (patch) | |
| tree | 914748a369d1124f85f1b13b21e38d4527ac7824 | |
| parent | c8dfa79c9948ce09a7b4071f8059294b1972aef6 (diff) | |
| download | gcc-b939a5cc4143908ddda4b85a848c313136ff6e0c.zip gcc-b939a5cc4143908ddda4b85a848c313136ff6e0c.tar.gz gcc-b939a5cc4143908ddda4b85a848c313136ff6e0c.tar.bz2 | |
fixincludes: FIx up for Debian/Ubuntu includes
As reported by Tobias, my C++ _Float{16,32,64,128,32x,64x,128x} support
patch broke Debian/Ubuntu bootstraps. The problem is that there
glibc bits/floatn.h and bits/floatn-common.h isn't in /usr/include/
directly, but in a subdirectory like /usr/include/x86_64-linux-gnu/
Seems other fixinclude rules for bits/* headers use
files = bits/whatever.h, "*/bits/whatever.h";
so this patch just follows the suit.
2022-06-27 Jakub Jelinek <jakub@redhat.com>
* inclhack.def (glibc_cxx_floatn_1, glibc_cxx_floatn_2,
glibc_cxx_floatn_3): Add to files also "*/bits/floatn.h"
and "*/bits/floatn-common.h".
* fixincl.x: Regenerated.
| -rw-r--r-- | fixincludes/fixincl.x | 10 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index 56c37b7..6309723 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed September 27, 2022 at 12:49:21 AM by AutoGen 5.18.16 + * It has been AutoGen-ed September 27, 2022 at 12:21:44 PM by AutoGen 5.18.16 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Sep 27 00:49:21 CEST 2022 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Sep 27 12:21:44 CEST 2022 * * You must regenerate it. Use the ./genfixes script. * @@ -4116,7 +4116,7 @@ tSCC zGlibc_Cxx_Floatn_1Name[] = * File name selection pattern */ tSCC zGlibc_Cxx_Floatn_1List[] = - "bits/floatn.h\0bits/floatn-common.h\0"; + "bits/floatn.h\0bits/floatn-common.h\0*/bits/floatn.h\0*/bits/floatn-common.h\0"; /* * Machine/OS name selection pattern */ @@ -4157,7 +4157,7 @@ tSCC zGlibc_Cxx_Floatn_2Name[] = * File name selection pattern */ tSCC zGlibc_Cxx_Floatn_2List[] = - "bits/floatn.h\0bits/floatn-common.h\0"; + "bits/floatn.h\0bits/floatn-common.h\0*/bits/floatn.h\0*/bits/floatn-common.h\0"; /* * Machine/OS name selection pattern */ @@ -4197,7 +4197,7 @@ tSCC zGlibc_Cxx_Floatn_3Name[] = * File name selection pattern */ tSCC zGlibc_Cxx_Floatn_3List[] = - "bits/floatn.h\0bits/floatn-common.h\0"; + "bits/floatn.h\0bits/floatn-common.h\0*/bits/floatn.h\0*/bits/floatn-common.h\0"; /* * Machine/OS name selection pattern */ diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index a3f171a..88bf28f 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -2021,7 +2021,7 @@ fix = { */ fix = { hackname = glibc_cxx_floatn_1; - files = bits/floatn.h, bits/floatn-common.h; + files = bits/floatn.h, bits/floatn-common.h, "*/bits/floatn.h", "*/bits/floatn-common.h"; select = "^([ \t]*#[ \t]*if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n" "(([ \t]*/\\*[^\n]*\\*/\n)?" "([ \t]*#[ \t]*if[^\n]*\n)?" @@ -2059,7 +2059,7 @@ fix = { fix = { hackname = glibc_cxx_floatn_2; - files = bits/floatn.h, bits/floatn-common.h; + files = bits/floatn.h, bits/floatn-common.h, "*/bits/floatn.h", "*/bits/floatn-common.h"; select = "^([ \t]*#[ \t]*if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n" "(([ \t]*/\\*[^\n]*\\*/\n)?" "[ \t]*typedef[ \t]+[^\n]*[ \t]+_Float(16|32|64|128)x?([ \t]+__attribute__ \\(\\(__mode__ \\(__HF__\\)\\)\\))?;)"; @@ -2077,7 +2077,7 @@ fix = { fix = { hackname = glibc_cxx_floatn_3; - files = bits/floatn.h, bits/floatn-common.h; + files = bits/floatn.h, bits/floatn-common.h, "*/bits/floatn.h", "*/bits/floatn-common.h"; select = "^([ \t]*#[ \t]*if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n" "(([ \t]*/\\*[^\n]*\n?[^\n]*\\*/\n)?" "([ \t]*#[ \t]*if[^\n]*\n)?" |