diff options
| -rw-r--r-- | llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/MC/ARM/arm-thumb-cpus.s | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp index ae5bc723ee5..7490a5cb8b8 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp @@ -153,6 +153,13 @@ std::string ARM_MC::ParseARMTriple(const Triple &TT, StringRef CPU) { ARMArchFeature += ",+nacl-trap"; } + if (TT.isOSWindows()) { + if (ARMArchFeature.empty()) + ARMArchFeature = "+noarm"; + else + ARMArchFeature += ",+noarm"; + } + return ARMArchFeature; } diff --git a/llvm/test/MC/ARM/arm-thumb-cpus.s b/llvm/test/MC/ARM/arm-thumb-cpus.s index 459b5c5fe00..7319f136347 100644 --- a/llvm/test/MC/ARM/arm-thumb-cpus.s +++ b/llvm/test/MC/ARM/arm-thumb-cpus.s @@ -19,6 +19,9 @@ @ RUN: not llvm-mc -show-encoding -triple=armv6sm-eabi < %s 2>&1 \ @ RUN: | FileCheck %s --check-prefix=CHECK-THUMB-ONLY +@ RUN: not llvm-mc -show-encoding -triple=thumbv7-win32-gnu < %s 2>&1 \ +@ RUN: | FileCheck %s --check-prefix=CHECK-THUMB-ONLY + @ Make sure correct diagnostics are given for CPUs without support for @ one or other of the execution states. .thumb |
