From cfeefc9b5fc649e2a5d77f093a04af47f17b02de Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Fri, 2 Jun 2017 13:14:18 +0000 Subject: [PATCH] atomic_library_2 =================================================================== Gbp-Pq: Name atomic_library_2.diff --- clang/lib/Basic/Targets.cpp | 20 +++++++++++++++++--- clang/test/CodeGen/linux-arm-atomic.c | 1 + 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 845a333c..10384cd4 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -4291,9 +4291,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: diff --git a/clang/test/CodeGen/linux-arm-atomic.c b/clang/test/CodeGen/linux-arm-atomic.c index 0e0fa902..db9709fe 100644 --- 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) { -- 2.30.2