diff options
| -rw-r--r-- | lib/MC/MCELFStreamer.cpp | 4 | ||||
| -rw-r--r-- | test/MC/ARM/align_arm_2_thumb.s | 15 | ||||
| -rw-r--r-- | test/MC/ARM/align_thumb_2_arm.s | 15 |
3 files changed, 34 insertions, 0 deletions
diff --git a/lib/MC/MCELFStreamer.cpp b/lib/MC/MCELFStreamer.cpp index 3be71ce..e806cb9 100644 --- a/lib/MC/MCELFStreamer.cpp +++ b/lib/MC/MCELFStreamer.cpp @@ -15,6 +15,7 @@ #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/STLExtras.h" #include "llvm/MC/MCAssembler.h" +#include "llvm/MC/MCAsmBackend.h" #include "llvm/MC/MCCodeEmitter.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCELF.h" @@ -96,6 +97,9 @@ void MCELFStreamer::EmitDebugLabel(MCSymbol *Symbol) { } void MCELFStreamer::EmitAssemblerFlag(MCAssemblerFlag Flag) { + // Let the target do whatever target specific stuff it needs to do. + getAssembler().getBackend().handleAssemblerFlag(Flag); + // Do any generic stuff we need to do. switch (Flag) { case MCAF_SyntaxUnified: return; // no-op here. case MCAF_Code16: return; // Change parsing mode; no-op here. diff --git a/test/MC/ARM/align_arm_2_thumb.s b/test/MC/ARM/align_arm_2_thumb.s new file mode 100644 index 0000000..120e964 --- /dev/null +++ b/test/MC/ARM/align_arm_2_thumb.s @@ -0,0 +1,15 @@ +@ RUN: llvm-mc -triple armv7-none-linux -filetype=obj -o %t.o %s +@ RUN: llvm-objdump -triple thumbv7-none-linux -d %t.o | FileCheck --check-prefix=ARM_2_THUMB %s + +@ RUN: llvm-mc -triple armv7-apple-darwin -filetype=obj -o %t_darwin.o %s +@ RUN: llvm-objdump -triple thumbv7-apple-darwin -d %t_darwin.o | FileCheck --check-prefix=ARM_2_THUMB %s + +.syntax unified +.code 16 +@ ARM_2_THUMB-LABEL: foo +foo: + add r0, r0 +.align 3 +@ ARM_2_THUMB: 2: 00 bf nop + add r0, r0 + diff --git a/test/MC/ARM/align_thumb_2_arm.s b/test/MC/ARM/align_thumb_2_arm.s new file mode 100644 index 0000000..328bfab --- /dev/null +++ b/test/MC/ARM/align_thumb_2_arm.s @@ -0,0 +1,15 @@ +@ RUN: llvm-mc -triple thumbv7-none-linux -filetype=obj -o %t.o %s +@ RUN: llvm-objdump -triple armv7-none-linux -d %t.o | FileCheck --check-prefix=THUMB_2_ARM %s + +@ RUN: llvm-mc -triple thumbv7-apple-darwin -filetype=obj -o %t_darwin.o %s +@ RUN: llvm-objdump -triple armv7-apple-darwin -d %t_darwin.o | FileCheck --check-prefix=THUMB_2_ARM %s + +.syntax unified +.code 32 +@ THUMB_2_ARM-LABEL: foo +foo: + add r0, r0 +.align 3 +@ THUMB_2_ARM: 4: 00 f0 20 e3 nop + add r0, r0 + |