diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2015-02-19 00:45:04 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2015-02-19 00:45:04 +0000 |
| commit | f4498a4fd327fe75f0b72870bd1740bd92be5a44 (patch) | |
| tree | 8a7784a943598bc92deb0a7eff25a0adbff72c20 /llvm | |
| parent | 20c7259ce9189484831519f0b7a02d56406c8613 (diff) | |
| download | bcm5719-llvm-f4498a4fd327fe75f0b72870bd1740bd92be5a44.tar.gz bcm5719-llvm-f4498a4fd327fe75f0b72870bd1740bd92be5a44.zip | |
llvm-mc: Use Target::createNullStreamer to fix crashes on target-specific asm directives.
llvm-svn: 229798
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/test/CodeGen/ARM/null-streamer.ll | 2 | ||||
| -rw-r--r-- | llvm/tools/llvm-mc/llvm-mc.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/llvm/test/CodeGen/ARM/null-streamer.ll b/llvm/test/CodeGen/ARM/null-streamer.ll index 350c45e5beb..19ad22a4bdb 100644 --- a/llvm/test/CodeGen/ARM/null-streamer.ll +++ b/llvm/test/CodeGen/ARM/null-streamer.ll @@ -5,3 +5,5 @@ define i32 @main() { entry: ret i32 0 } + +module asm ".fnstart" diff --git a/llvm/tools/llvm-mc/llvm-mc.cpp b/llvm/tools/llvm-mc/llvm-mc.cpp index 78fe9b72f20..91bacc03458 100644 --- a/llvm/tools/llvm-mc/llvm-mc.cpp +++ b/llvm/tools/llvm-mc/llvm-mc.cpp @@ -465,7 +465,7 @@ int main(int argc, char **argv) { MAB, ShowInst)); } else if (FileType == OFT_Null) { - Str.reset(createNullStreamer(Ctx)); + Str.reset(TheTarget->createNullStreamer(Ctx)); } else { assert(FileType == OFT_ObjectFile && "Invalid file type!"); MCCodeEmitter *CE = TheTarget->createMCCodeEmitter(*MCII, *MRI, *STI, Ctx); |
