From cdf67d5791d044a5f217114e18eb8d6242222b98 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Mon, 2 Dec 2013 19:24:08 +0000 Subject: Merging r196104: ------------------------------------------------------------------------ r196104 | rafael | 2013-12-02 06:59:34 -0800 (Mon, 02 Dec 2013) | 1 line Output .eh_frames on COFF too now that the integrated as is used on mingw. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@196137 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/MC/WinCOFFStreamer.cpp | 1 + test/MC/COFF/eh-frame.s | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 test/MC/COFF/eh-frame.s diff --git a/lib/MC/WinCOFFStreamer.cpp b/lib/MC/WinCOFFStreamer.cpp index 7fc114cbff..5b5aad7a79 100644 --- a/lib/MC/WinCOFFStreamer.cpp +++ b/lib/MC/WinCOFFStreamer.cpp @@ -322,6 +322,7 @@ void WinCOFFStreamer::EmitWin64EHHandlerData() { } void WinCOFFStreamer::FinishImpl() { + EmitFrames(NULL, true); EmitW64Tables(); MCObjectStreamer::FinishImpl(); } diff --git a/test/MC/COFF/eh-frame.s b/test/MC/COFF/eh-frame.s new file mode 100644 index 0000000000..e606b764d6 --- /dev/null +++ b/test/MC/COFF/eh-frame.s @@ -0,0 +1,14 @@ +// RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o - | llvm-readobj -s | FileCheck %s + + .def _main; + .scl 2; + .type 32; + .endef + .text + .globl _main +_main: + .cfi_startproc + ret + .cfi_endproc + +// CHECK: Name: .eh_frame -- cgit v1.2.3