diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch b/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch new file mode 100644 index 0000000000..f52e21edc2 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/0011-aarch64-Fix-include-paths-when-S-B.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From 710d1325474e708e6b34eebe09f3f130420af293 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 31 Jan 2023 22:03:38 -0800 | ||
4 | Subject: [PATCH] aarch64: Fix include paths when S != B | ||
5 | |||
6 | aarch64.h gets copied into build directory when built out of tree, in | ||
7 | this case build uses this file but does not find the includes inside it | ||
8 | since they are not found in any of include paths specified in compiler | ||
9 | cmdline. | ||
10 | |||
11 | Fixes build errors like | ||
12 | |||
13 | % g++ -c -isystem/mnt/b/yoe/master/build/tmp/work/x86_64-linux/gcc-cross-aarch64/13.0.1-r0/recipe-sysroot-native/usr/include -O2 -pipe -DIN_GCC -DCROSS_DIRECTORY_STRUCTURE -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute -Wconditionally-supported -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -DHAVE_CONFIG_H -DGENERATOR_FILE -I. -Ibuild -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/build -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/../include -I../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/../libcpp/include -o build/gencheck.o ../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/gencheck.cc | ||
14 | In file included from ./tm.h:34, | ||
15 | from ../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/gencheck.cc:23: | ||
16 | ./config/aarch64/aarch64.h:164:10: fatal error: aarch64-option-extensions.def: No such file or directory | ||
17 | 164 | #include "aarch64-option-extensions.def" | ||
18 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
19 | compilation terminated. | ||
20 | |||
21 | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105144 | ||
22 | |||
23 | Upstream-Status: Pending | ||
24 | |||
25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
26 | --- | ||
27 | gcc/config/aarch64/aarch64.h | 8 ++++---- | ||
28 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
29 | |||
30 | diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h | ||
31 | index 155cace6afe..07d68958908 100644 | ||
32 | --- a/gcc/config/aarch64/aarch64.h | ||
33 | +++ b/gcc/config/aarch64/aarch64.h | ||
34 | @@ -161,8 +161,8 @@ | ||
35 | enum class aarch64_feature : unsigned char { | ||
36 | #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) IDENT, | ||
37 | #define AARCH64_ARCH(A, B, IDENT, D, E) IDENT, | ||
38 | -#include "aarch64-option-extensions.def" | ||
39 | -#include "aarch64-arches.def" | ||
40 | +#include "config/aarch64/aarch64-option-extensions.def" | ||
41 | +#include "config/aarch64/aarch64-arches.def" | ||
42 | }; | ||
43 | |||
44 | /* Define unique flags for each of the above. */ | ||
45 | @@ -171,8 +171,8 @@ enum class aarch64_feature : unsigned char { | ||
46 | = aarch64_feature_flags (1) << int (aarch64_feature::IDENT); | ||
47 | #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) HANDLE (IDENT) | ||
48 | #define AARCH64_ARCH(A, B, IDENT, D, E) HANDLE (IDENT) | ||
49 | -#include "aarch64-option-extensions.def" | ||
50 | -#include "aarch64-arches.def" | ||
51 | +#include "config/aarch64/aarch64-option-extensions.def" | ||
52 | +#include "config/aarch64/aarch64-arches.def" | ||
53 | #undef HANDLE | ||
54 | |||
55 | #endif | ||