mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-11-04 22:13:15 +00:00
9e36f19118
* Merge changes from the 3.3 branch (see 1:3.3-10) * Install libclang.so in /usr/lib/*/libclang-3.3.so * Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1 * Also ship the python clang binding (python-clang-3.3) (LLVM no longer mean Low Level Virtual Machine) * Disable the build of lldb under HURD * Ship the lldb headers into lldb-X.Y-dev (Closes: #723743) I might create a liblldb-X.Y library at some point but I think it is too early. * Fix "cannot compile this atomic library call" Thanks to Francisco Facioni for the refresh (Closes: #705115) * Install libclang.so in /usr/lib/*/libclang-3.3.so * Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1 * Also ship the python clang binding (python-clang-3.3) * Fix a FTBFS with a duplicate declaration of shouldUseInlineAtomic * Update the build dependency from tcl8.5 to tcl (Closes: #725953)
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
Index: llvm-toolchain-snapshot_3.4~svn192346/clang/test/CodeGen/linux-arm-atomic.c
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/test/CodeGen/linux-arm-atomic.c 2013-10-10 13:39:28.202081206 +0200
|
|
+++ llvm-toolchain-snapshot_3.4~svn192346/clang/test/CodeGen/linux-arm-atomic.c 2013-10-10 13:39:28.190081205 +0200
|
|
@@ -1,5 +1,6 @@
|
|
// 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=thumbv7-unknown-linux | FileCheck %s
|
|
|
|
typedef int _Atomic_word;
|
|
_Atomic_word exchange_and_add(volatile _Atomic_word *__mem, int __val) {
|
|
Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Basic/Targets.cpp
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Basic/Targets.cpp 2013-10-10 13:39:28.202081206 +0200
|
|
+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Basic/Targets.cpp 2013-10-10 13:39:28.194081205 +0200
|
|
@@ -3621,9 +3621,23 @@
|
|
if (T.getOS() != llvm::Triple::Linux)
|
|
return false;
|
|
StringRef ArchName = T.getArchName();
|
|
- if (ArchName.startswith("armv6") || ArchName.startswith("armv7"))
|
|
- return true;
|
|
- return false;
|
|
+ if (T.getArch() == llvm::Triple::arm) {
|
|
+ if (!ArchName.startswith("armv"))
|
|
+ return false;
|
|
+ StringRef VersionStr = ArchName.substr(4);
|
|
+ unsigned Version;
|
|
+ if (VersionStr.getAsInteger(10, Version))
|
|
+ return false;
|
|
+ return Version >= 6;
|
|
+ }
|
|
+ assert(T.getArch() == llvm::Triple::thumb);
|
|
+ if (!ArchName.startswith("thumbv"))
|
|
+ return false;
|
|
+ StringRef VersionStr = ArchName.substr(6);
|
|
+ unsigned Version;
|
|
+ if (VersionStr.getAsInteger(10, Version))
|
|
+ return false;
|
|
+ return Version >= 7;
|
|
}
|
|
|
|
public:
|