summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp2
-rw-r--r--llvm/test/MC/ARM/arm-thumb-cpus-default.s3
-rw-r--r--llvm/test/MC/ARM/arm-thumb-cpus.s3
3 files changed, 7 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
index 2488b6bf0c8..1f0f9eb4687 100644
--- a/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
+++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
@@ -681,7 +681,7 @@ MCAsmBackend *llvm::createARMAsmBackend(const Target &T, StringRef TT, StringRef
}
if (TheTriple.isOSBinFormatCOFF())
- assert(0 && "Windows not supported on ARM");
+ llvm_unreachable("Windows not supported on ARM");
uint8_t OSABI = MCELFObjectTargetWriter::getOSABI(Triple(TT).getOS());
return new ELFARMAsmBackend(T, TT, OSABI);
diff --git a/llvm/test/MC/ARM/arm-thumb-cpus-default.s b/llvm/test/MC/ARM/arm-thumb-cpus-default.s
index 636ee3c5057..040039f2154 100644
--- a/llvm/test/MC/ARM/arm-thumb-cpus-default.s
+++ b/llvm/test/MC/ARM/arm-thumb-cpus-default.s
@@ -5,6 +5,9 @@
@ RUN: llvm-mc -show-encoding -triple=armv7m < %s | FileCheck %s --check-prefix=CHECK-THUMB-ONLY
@ RUN: llvm-mc -show-encoding -triple=armv6m < %s | FileCheck %s --check-prefix=CHECK-THUMB-ONLY
+@ FIXME: Could we avoid XFAIL to specify triple above?
+@ XFAIL: cygwin,mingw32,win32
+
@ Make sure the architecture chosen by LLVM defaults to a compatible
@ ARM/Thumb mode.
movs r0, r0
diff --git a/llvm/test/MC/ARM/arm-thumb-cpus.s b/llvm/test/MC/ARM/arm-thumb-cpus.s
index c15e8078186..ea4e71a6aca 100644
--- a/llvm/test/MC/ARM/arm-thumb-cpus.s
+++ b/llvm/test/MC/ARM/arm-thumb-cpus.s
@@ -5,6 +5,9 @@
@ RUN: llvm-mc -show-encoding -triple=armv7m < %s 2>&1 | FileCheck %s --check-prefix=CHECK-THUMB-ONLY
@ RUN: llvm-mc -show-encoding -triple=armv6m < %s 2>&1 | FileCheck %s --check-prefix=CHECK-THUMB-ONLY
+@ FIXME: Could we avoid XFAIL to specify triple above?
+@ XFAIL: cygwin,mingw32,win32
+
@ Make sure correct diagnostics are given for CPUs without support for
@ one or other of the execution states.
.thumb
OpenPOWER on IntegriCloud