mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-13 21:33:44 +00:00
rebase the patches
This commit is contained in:
parent
d900de0dda
commit
dd8713fa0e
20
debian/patches/atomic_library_1.diff
vendored
20
debian/patches/atomic_library_1.diff
vendored
@ -1,9 +1,9 @@
|
|||||||
Index: llvm-toolchain-snapshot_3.8~svn249699/clang/lib/Basic/Targets.cpp
|
Index: llvm-toolchain-snapshot_3.9~svn265666/clang/lib/Basic/Targets.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_3.8~svn249699.orig/clang/lib/Basic/Targets.cpp
|
--- llvm-toolchain-snapshot_3.9~svn265666.orig/clang/lib/Basic/Targets.cpp
|
||||||
+++ llvm-toolchain-snapshot_3.8~svn249699/clang/lib/Basic/Targets.cpp
|
+++ llvm-toolchain-snapshot_3.9~svn265666/clang/lib/Basic/Targets.cpp
|
||||||
@@ -4330,6 +4330,20 @@ class ARMTargetInfo : public TargetInfo
|
@@ -4052,6 +4052,20 @@ protected:
|
||||||
}
|
Builder.defineMacro("__ELF__");
|
||||||
}
|
}
|
||||||
|
|
||||||
+ static bool shouldUseInlineAtomic(const llvm::Triple &T) {
|
+ static bool shouldUseInlineAtomic(const llvm::Triple &T) {
|
||||||
@ -21,12 +21,12 @@ Index: llvm-toolchain-snapshot_3.8~svn249699/clang/lib/Basic/Targets.cpp
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public:
|
public:
|
||||||
ARMTargetInfo(const llvm::Triple &Triple, bool IsBigEndian)
|
RTEMSTargetInfo(const llvm::Triple &Triple, const CodeGenOptions &CGOpts)
|
||||||
: TargetInfo(Triple), FPMath(FP_Default),
|
: OSTargetInfo<Target>(Triple, CGOpts) {
|
||||||
Index: llvm-toolchain-snapshot_3.8~svn249699/clang/test/CodeGen/linux-arm-atomic.c
|
Index: llvm-toolchain-snapshot_3.9~svn265666/clang/test/CodeGen/linux-arm-atomic.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_3.8~svn249699.orig/clang/test/CodeGen/linux-arm-atomic.c
|
--- llvm-toolchain-snapshot_3.9~svn265666.orig/clang/test/CodeGen/linux-arm-atomic.c
|
||||||
+++ llvm-toolchain-snapshot_3.8~svn249699/clang/test/CodeGen/linux-arm-atomic.c
|
+++ llvm-toolchain-snapshot_3.9~svn265666/clang/test/CodeGen/linux-arm-atomic.c
|
||||||
@@ -1,5 +1,15 @@
|
@@ -1,5 +1,15 @@
|
||||||
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
|
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv7-unknown-linux | FileCheck %s
|
||||||
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s
|
// RUN: %clang_cc1 %s -emit-llvm -o - -triple=armv6-unknown-linux | FileCheck %s
|
||||||
|
12
debian/patches/removeduplicatedeclaration.diff
vendored
12
debian/patches/removeduplicatedeclaration.diff
vendored
@ -1,9 +1,9 @@
|
|||||||
Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp
|
Index: llvm-toolchain-snapshot_3.9~svn265666/clang/lib/Basic/Targets.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-snapshot_3.8~svn242701.orig/clang/lib/Basic/Targets.cpp
|
--- llvm-toolchain-snapshot_3.9~svn265666.orig/clang/lib/Basic/Targets.cpp
|
||||||
+++ llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp
|
+++ llvm-toolchain-snapshot_3.9~svn265666/clang/lib/Basic/Targets.cpp
|
||||||
@@ -4325,33 +4325,6 @@ class ARMTargetInfo : public TargetInfo
|
@@ -4052,33 +4052,6 @@ protected:
|
||||||
}
|
Builder.defineMacro("__ELF__");
|
||||||
}
|
}
|
||||||
|
|
||||||
- static bool shouldUseInlineAtomic(const llvm::Triple &T) {
|
- static bool shouldUseInlineAtomic(const llvm::Triple &T) {
|
||||||
@ -35,4 +35,4 @@ Index: llvm-toolchain-snapshot_3.8~svn242701/clang/lib/Basic/Targets.cpp
|
|||||||
- }
|
- }
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ARMTargetInfo(const llvm::Triple &Triple, bool IsBigEndian)
|
RTEMSTargetInfo(const llvm::Triple &Triple, const CodeGenOptions &CGOpts)
|
||||||
|
Loading…
Reference in New Issue
Block a user