From 2aa5b781be6756d63508e7cbe3bf64203ec64f7b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 31 Jan 2023 22:03:38 -0800 Subject: [PATCH] aarch64: Fix include paths when S != B aarch64.h gets copied into build directory when built out of tree, in this case build uses this file but does not find the includes inside it since they are not found in any of include paths specified in compiler cmdline. Fixes build errors like % 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 In file included from ./tm.h:34, from ../../../../../../../work-shared/gcc-13.0.1-r0/gcc-b2ec2504af77b35e748067eeb846821d12a6b6b4/gcc/gencheck.cc:23: ./config/aarch64/aarch64.h:164:10: fatal error: aarch64-option-extensions.def: No such file or directory 164 | #include "aarch64-option-extensions.def" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105144 Upstream-Status: Pending Signed-off-by: Khem Raj --- gcc/config/aarch64/aarch64.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h index e8bd8c73c12..6ea05b64601 100644 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h @@ -163,9 +163,9 @@ enum class aarch64_feature : unsigned char { #define DEF_AARCH64_ISA_MODE(IDENT) IDENT, #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) IDENT, #define AARCH64_ARCH(A, B, IDENT, D, E) IDENT, -#include "aarch64-isa-modes.def" -#include "aarch64-option-extensions.def" -#include "aarch64-arches.def" +#include "config/aarch64/aarch64-isa-modes.def" +#include "config/aarch64/aarch64-option-extensions.def" +#include "config/aarch64/aarch64-arches.def" }; /* Define unique flags for each of the above. */ @@ -175,16 +175,16 @@ enum class aarch64_feature : unsigned char { #define DEF_AARCH64_ISA_MODE(IDENT) HANDLE (IDENT) #define AARCH64_OPT_EXTENSION(A, IDENT, C, D, E, F) HANDLE (IDENT) #define AARCH64_ARCH(A, B, IDENT, D, E) HANDLE (IDENT) -#include "aarch64-isa-modes.def" -#include "aarch64-option-extensions.def" -#include "aarch64-arches.def" +#include "config/aarch64/aarch64-isa-modes.def" +#include "config/aarch64/aarch64-option-extensions.def" +#include "config/aarch64/aarch64-arches.def" #undef HANDLE /* Define aarch64_isa_mode masks. */ #define DEF_AARCH64_ISA_MODE(IDENT) \ constexpr auto AARCH64_ISA_MODE_##IDENT ATTRIBUTE_UNUSED \ = aarch64_isa_mode (1) << int (aarch64_feature::IDENT); -#include "aarch64-isa-modes.def" +#include "config/aarch64/aarch64-isa-modes.def" #undef HANDLE constexpr auto AARCH64_FL_SM_STATE ATTRIBUTE_UNUSED