Author: Kito Cheng Date: 2022-02-21T14:56:58+08:00 New Revision: cc279529e8317301492f9625b6acc9a0bf52db56
URL: https://github.com/llvm/llvm-project/commit/cc279529e8317301492f9625b6acc9a0bf52db56 DIFF: https://github.com/llvm/llvm-project/commit/cc279529e8317301492f9625b6acc9a0bf52db56.diff LOG: Revert "[RISCV] Fix the include search path order between sysroot and resource folder (Recommit)" This reverts commit 47b1fa5fc48821eefefd157ed4af2f2cf3bacef4. Added: Modified: clang/lib/Driver/ToolChains/RISCVToolchain.cpp clang/test/Driver/riscv32-toolchain.c clang/test/Driver/riscv64-toolchain.c Removed: clang/test/Driver/Inputs/resource_dir/include/.keep ################################################################################ diff --git a/clang/lib/Driver/ToolChains/RISCVToolchain.cpp b/clang/lib/Driver/ToolChains/RISCVToolchain.cpp index a63ada0cbb7e4..714325a2db39e 100644 --- a/clang/lib/Driver/ToolChains/RISCVToolchain.cpp +++ b/clang/lib/Driver/ToolChains/RISCVToolchain.cpp @@ -98,12 +98,6 @@ void RISCVToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, if (DriverArgs.hasArg(options::OPT_nostdinc)) return; - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - SmallString<128> Dir(getDriver().ResourceDir); - llvm::sys::path::append(Dir, "include"); - addSystemInclude(DriverArgs, CC1Args, Dir.str()); - } - if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) { SmallString<128> Dir(computeSysRoot()); llvm::sys::path::append(Dir, "include"); diff --git a/clang/test/Driver/Inputs/resource_dir/include/.keep b/clang/test/Driver/Inputs/resource_dir/include/.keep deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/clang/test/Driver/riscv32-toolchain.c b/clang/test/Driver/riscv32-toolchain.c index 25aaca78dab2c..fb262a19a0439 100644 --- a/clang/test/Driver/riscv32-toolchain.c +++ b/clang/test/Driver/riscv32-toolchain.c @@ -197,20 +197,6 @@ // C-RV32-RTLIB-COMPILERRT-ILP32: "--start-group" "-lc" "-lgloss" "--end-group" "{{.*}}libclang_rt.builtins-riscv32.a" // C-RV32-RTLIB-COMPILERRT-ILP32: "{{.*}}clang_rt.crtend-riscv32.o" -// RUN: %clang %s -### -no-canonical-prefixes -target riscv32 \ -// RUN: --gcc-toolchain=%S/Inputs/basic_riscv32_tree \ -// RUN: -resource-dir=%s/Inputs/resource_dir 2>&1 \ -// RUN: | FileCheck -check-prefix=RESOURCE-INC %s -// RESOURCE-INC: "-internal-isystem" "{{.*}}/Inputs/resource_dir{{/|\\\\}}include" -// RESOURCE-INC: "-internal-isystem" "{{.*}}/basic_riscv32_tree/{{.*}}/riscv32-unknown-elf{{/|\\\\}}include" - -// RUN: %clang %s -### -no-canonical-prefixes -target riscv32 \ -// RUN: --gcc-toolchain=%S/Inputs/basic_riscv32_tree \ -// RUN: -resource-dir=%s/Inputs/resource_dir -nobuiltininc 2>&1 \ -// RUN: | FileCheck -check-prefix=NO-RESOURCE-INC %s -// NO-RESOURCE-INC-NOT: "-internal-isystem" "{{.*}}/Inputs/resource_dir{{/|\\\\}}include" -// NO-RESOURCE-INC: "-internal-isystem" "{{.*}}/basic_riscv32_tree/{{.*}}/riscv32-unknown-elf{{/|\\\\}}include" - // RUN: %clang -target riscv32 %s -emit-llvm -S -o - | FileCheck %s typedef __builtin_va_list va_list; diff --git a/clang/test/Driver/riscv64-toolchain.c b/clang/test/Driver/riscv64-toolchain.c index 91358298ecdd8..2774e004854c3 100644 --- a/clang/test/Driver/riscv64-toolchain.c +++ b/clang/test/Driver/riscv64-toolchain.c @@ -153,20 +153,6 @@ // C-RV64-RTLIB-COMPILERRT-LP64: "--start-group" "-lc" "-lgloss" "--end-group" "{{.*}}libclang_rt.builtins-riscv64.a" // C-RV64-RTLIB-COMPILERRT-LP64: "{{.*}}clang_rt.crtend-riscv64.o" -// RUN: %clang %s -### -no-canonical-prefixes -target riscv64 \ -// RUN: --gcc-toolchain=%S/Inputs/basic_riscv64_tree \ -// RUN: -resource-dir=%s/Inputs/resource_dir 2>&1 \ -// RUN: | FileCheck -check-prefix=RESOURCE-INC %s -// RESOURCE-INC: "-internal-isystem" "{{.*}}/Inputs/resource_dir/include" -// RESOURCE-INC: "-internal-isystem" "{{.*}}/basic_riscv64_tree/{{.*}}/riscv64-unknown-elf/include" - -// RUN: %clang %s -### -no-canonical-prefixes -target riscv64 \ -// RUN: --gcc-toolchain=%S/Inputs/basic_riscv64_tree \ -// RUN: -resource-dir=%s/Inputs/resource_dir -nobuiltininc 2>&1 \ -// RUN: | FileCheck -check-prefix=NO-RESOURCE-INC %s -// NO-RESOURCE-INC-NOT: "-internal-isystem" "{{.*}}Inputs/resource_dir/include" -// NO-RESOURCE-INC: "-internal-isystem" "{{.*}}/basic_riscv64_tree/{{.*}}/riscv64-unknown-elf/include" - // RUN: %clang -target riscv64 %s -emit-llvm -S -o - | FileCheck %s typedef __builtin_va_list va_list; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
