[llvm-branch-commits] [llvm-branch] r196137 - Merging r196104:

[Bill Wendling]

Author: void
Date: Mon Dec  2 13:24:08 2013
New Revision: 196137

URL: http://llvm.org/viewvc/llvm-project?rev=196137&view=rev
Log:
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.
------------------------------------------------------------------------

Added:
    llvm/branches/release_34/test/MC/COFF/eh-frame.s
      - copied unchanged from r196104, llvm/trunk/test/MC/COFF/eh-frame.s
Modified:
    llvm/branches/release_34/   (props changed)
    llvm/branches/release_34/lib/MC/WinCOFFStreamer.cpp

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  2 13:24:08 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195148,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195401,195408,195421,195423-195424,195432,195439,195444,195455-195456,195469,195476-195477,195479,195491-195493,195514,195528,195547,195567,195573-195576,195590-195591,195599,195632,195635-195636,195670,195677,195679,195682,195684,195713,195716,195769,195773,195779,195782,195787-195788,195791,195803,195812,195827,195834,195843-195844,195878-195881,195887,195903,195905,195912,195915,195932,195936-195943,195972-195973,195975-195976,196004,196044-196046,196069,196100,196129
+/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195148,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195401,195408,195421,195423-195424,195432,195439,195444,195455-195456,195469,195476-195477,195479,195491-195493,195514,195528,195547,195567,195573-195576,195590-195591,195599,195632,195635-195636,195670,195677,195679,195682,195684,195713,195716,195769,195773,195779,195782,195787-195788,195791,195803,195812,195827,195834,195843-195844,195878-195881,195887,195903,195905,195912,195915,195932,195936-195943,195972-195973,195975-195976,196004,196044-196046,196069,196100,196104,196129

Modified: llvm/branches/release_34/lib/MC/WinCOFFStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/MC/WinCOFFStreamer.cpp?rev=196137&r1=196136&r2=196137&view=diff
==============================================================================
--- llvm/branches/release_34/lib/MC/WinCOFFStreamer.cpp (original)
+++ llvm/branches/release_34/lib/MC/WinCOFFStreamer.cpp Mon Dec  2 13:24:08 2013
@@ -322,6 +322,7 @@ void WinCOFFStreamer::EmitWin64EHHandler
 }
 
 void WinCOFFStreamer::FinishImpl() {
+  EmitFrames(NULL, true);
   EmitW64Tables();
   MCObjectStreamer::FinishImpl();
 }