mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-23 18:17:59 +00:00
rebase of the patches
This commit is contained in:
parent
3122d7295e
commit
70fac53a86
@ -1,19 +1,19 @@
|
||||
Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
|
||||
Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
|
||||
+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
|
||||
--- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
|
||||
+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp
|
||||
@@ -8,6 +8,7 @@
|
||||
//
|
||||
// UNSUPPORTED: libcpp-has-no-threads
|
||||
// UNSUPPORTED: no-threads
|
||||
// ALLOW_RETRIES: 2
|
||||
+// XFAIL: *
|
||||
|
||||
// <condition_variable>
|
||||
|
||||
Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
|
||||
Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
|
||||
+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
|
||||
--- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
|
||||
+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp
|
||||
@@ -11,7 +11,7 @@
|
||||
// ALLOW_RETRIES: 2
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: llvm-toolchain-snapshot_13~++20210325124256+06411edb9fca/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
===================================================================
|
||||
--- 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
|
||||
--- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
@@ -115,6 +115,10 @@ std::string Linux::getMultiarchTriple(co
|
||||
return "mips64el-linux-gnu";
|
||||
break;
|
||||
@ -11,5 +11,5 @@ Index: llvm-toolchain-snapshot_13~++20210325124256+06411edb9fca/clang/lib/Driver
|
||||
+ return "riscv64-linux-gnu";
|
||||
+ break;
|
||||
case llvm::Triple::ppc:
|
||||
if (D.getVFS().exists(SysRoot + "/lib/powerpc-linux-gnuspe"))
|
||||
if (D.getVFS().exists(concat(SysRoot, "/lib/powerpc-linux-gnuspe")))
|
||||
return "powerpc-linux-gnuspe";
|
||||
|
13
debian/patches/unbreak-atomic-mips.diff
vendored
13
debian/patches/unbreak-atomic-mips.diff
vendored
@ -1,10 +1,10 @@
|
||||
Index: llvm-toolchain-13-13.0.0/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
===================================================================
|
||||
--- llvm-toolchain-13-13.0.0.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
+++ llvm-toolchain-13-13.0.0/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
@@ -137,6 +137,13 @@ append_list_if(COMPILER_RT_HAS_LIBPTHREA
|
||||
|
||||
append_list_if(FUCHSIA zircon SCUDO_LINK_LIBS)
|
||||
--- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
@@ -144,6 +144,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH
|
||||
list(APPEND SCUDO_LINK_LIBS atomic)
|
||||
endif()
|
||||
|
||||
+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR
|
||||
+ CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64" OR
|
||||
@ -16,4 +16,3 @@ Index: llvm-toolchain-13-13.0.0/compiler-rt/lib/scudo/standalone/CMakeLists.txt
|
||||
if(COMPILER_RT_HAS_SCUDO_STANDALONE)
|
||||
add_compiler_rt_object_libraries(RTScudoStandalone
|
||||
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user