rebase of the patches

This commit is contained in:
Sylvestre Ledru 2021-03-25 13:01:48 +01:00
parent 41884c46c3
commit 3d3e246939
2 changed files with 13 additions and 13 deletions

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-snapshot_13~++20210321122942+02ffbac844e0/llvm/cmake/modules/HandleLLVMOptions.cmake
Index: llvm-toolchain-snapshot_13~++20210325124256+06411edb9fca/llvm/cmake/modules/HandleLLVMOptions.cmake
===================================================================
--- llvm-toolchain-snapshot_13~++20210321122942+02ffbac844e0.orig/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ llvm-toolchain-snapshot_13~++20210321122942+02ffbac844e0/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -1189,8 +1189,8 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES)
--- llvm-toolchain-snapshot_13~++20210325124256+06411edb9fca.orig/llvm/cmake/modules/HandleLLVMOptions.cmake
+++ llvm-toolchain-snapshot_13~++20210325124256+06411edb9fca/llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -1192,8 +1192,8 @@ if(LLVM_USE_RELATIVE_PATHS_IN_FILES)
endif()
if(LLVM_INCLUDE_TESTS)

View File

@ -1,15 +1,15 @@
Index: llvm-toolchain-snapshot_13~++20210322120055+02b51e5316cd/clang/lib/Driver/ToolChains/Linux.cpp
Index: llvm-toolchain-snapshot_13~++20210325124256+06411edb9fca/clang/lib/Driver/ToolChains/Linux.cpp
===================================================================
--- llvm-toolchain-snapshot_13~++20210322120055+02b51e5316cd.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-snapshot_13~++20210322120055+02b51e5316cd/clang/lib/Driver/ToolChains/Linux.cpp
@@ -161,6 +161,10 @@ std::string Linux::getMultiarchTriple(co
if (D.getVFS().exists(SysRoot + "/lib/powerpc64le-linux-gnu"))
return "powerpc64le-linux-gnu";
--- llvm-toolchain-snapshot_13~++20210325124256+06411edb9fca.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-snapshot_13~++20210325124256+06411edb9fca/clang/lib/Driver/ToolChains/Linux.cpp
@@ -115,6 +115,10 @@ std::string Linux::getMultiarchTriple(co
return "mips64el-linux-gnu";
break;
}
+ case llvm::Triple::riscv64:
+ if (D.getVFS().exists(SysRoot + "/lib/riscv64-linux-gnu"))
+ return "riscv64-linux-gnu";
+ break;
case llvm::Triple::sparc:
if (D.getVFS().exists(SysRoot + "/lib/sparc-linux-gnu"))
return "sparc-linux-gnu";
case llvm::Triple::ppc:
if (D.getVFS().exists(SysRoot + "/lib/powerpc-linux-gnuspe"))
return "powerpc-linux-gnuspe";