llvm-toolchain/debian/patches/atomic_library_2.diff
Sylvestre Ledru 578e474efb * debian/patches/{0003-Debian-version-info-and-bugreport.patch,
0044-soname.diff,23-strlcpy_strlcat_warning_removed.diff,
  26-set-correct-float-abi.diff,atomic_library_[12].diff,
  fix-clang-path-and-build.diff,fix-lldb-server-build,lldb-libname.diff,
  lldb-soname.diff,mips-fpxx-enable.diff,removeduplicatedeclaration.diff}:
  Refreshed.
* debian/patches/{silent-gold-utils,kfreebsd-support}.diff: Updated.
2016-11-03 08:40:58 +00:00

44 lines
1.5 KiB
Diff

---
clang/lib/Basic/Targets.cpp | 20 +++++++++++++++++---
clang/test/CodeGen/linux-arm-atomic.c | 1 +
2 files changed, 18 insertions(+), 3 deletions(-)
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -4423,9 +4423,23 @@ protected:
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:
--- a/clang/test/CodeGen/linux-arm-atomic.c
+++ b/clang/test/CodeGen/linux-arm-atomic.c
@@ -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) {