commit 189bde7860b44b8e161b8c47b63478f667f3c05e
author Bill Wendling <isanbard@gmail.com> Wed Dec 24 08:05:17 2008 +0000
committer Bill Wendling <isanbard@gmail.com> Wed Dec 24 08:05:17 2008 +0000
tree 498a47db9b3bb7557d939057d5e7876a3cf0c93e
parent 6bd1b7965ee376c3f3f56c8fece9005abbc7d057

Darwin likes for the EH frame to be non-local.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@61420 91177308-0d34-0410-b5e6-96231b3b80d8

include/llvm/Target/TargetAsmInfo.h

diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h
index 6080619..aa9c145 100644
--- a/include/llvm/Target/TargetAsmInfo.h
+++ b/include/llvm/Target/TargetAsmInfo.h
@@ -453,6 +453,10 @@
     /// 
     bool FDEEncodingRequiresSData4;         // Defaults to true
 
+    /// NonLocalEHFrameLabel - If set, the EH_frame label needs to be non-local.
+    /// 
+    bool NonLocalEHFrameLabel;              // Defaults to false.
+
     /// GlobalEHDirective - This is the directive used to make exception frame
     /// tables globally visible.
     ///
@@ -822,6 +826,9 @@
     bool doesFDEEncodingRequireSData4() const {
       return FDEEncodingRequiresSData4;
     }
+    bool doesRequireNonLocalEHFrameLabel() const {
+      return NonLocalEHFrameLabel;
+    }
     const char *getGlobalEHDirective() const {
       return GlobalEHDirective;
     }

lib/CodeGen/AsmPrinter/DwarfWriter.cpp

diff --git a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
index 42ed348..70d4d1f 100644
--- a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
@@ -2963,7 +2963,10 @@
 
     // Begin eh frame section.
     Asm->SwitchToTextSection(TAI->getDwarfEHFrameSection());
-    O << TAI->getEHGlobalPrefix() << "EH_frame" << Index << ":\n";
+
+    if (!TAI->doesRequireNonLocalEHFrameLabel())
+      O << TAI->getEHGlobalPrefix();
+    O << "EH_frame" << Index << ":\n";
     EmitLabel("section_eh_frame", Index);
 
     // Define base labels.
@@ -3102,9 +3105,18 @@
 
       EmitLabel("eh_frame_begin", EHFrameInfo.Number);
 
-      EmitSectionOffset("eh_frame_begin", "eh_frame_common",
-                        EHFrameInfo.Number, EHFrameInfo.PersonalityIndex,
-                        true, true, false);
+      if (TAI->doesRequireNonLocalEHFrameLabel()) {
+        PrintRelDirective(true, true);
+        PrintLabelName("eh_frame_begin", EHFrameInfo.Number);
+
+        if (!TAI->isAbsoluteEHSectionOffsets())
+          O << "-EH_frame" << EHFrameInfo.PersonalityIndex;
+      } else {
+        EmitSectionOffset("eh_frame_begin", "eh_frame_common",
+                          EHFrameInfo.Number, EHFrameInfo.PersonalityIndex,
+                          true, true, false);
+      }
+
       Asm->EOL("FDE CIE offset");
 
       EmitReference("eh_func_begin", EHFrameInfo.Number, true, true);

lib/Target/TargetAsmInfo.cpp

diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index b6adbe7..c9a525a 100644
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -100,6 +100,7 @@
   SupportsExceptionHandling = false;
   DwarfRequiresFrameSection = true;
   FDEEncodingRequiresSData4 = true;
+  NonLocalEHFrameLabel = false;
   GlobalEHDirective = 0;
   SupportsWeakOmittedEHFrame = true;
   DwarfSectionOffsetDirective = 0;

lib/Target/X86/X86TargetAsmInfo.cpp

diff --git a/lib/Target/X86/X86TargetAsmInfo.cpp b/lib/Target/X86/X86TargetAsmInfo.cpp
index 0dfb855..4dfb214 100644
--- a/lib/Target/X86/X86TargetAsmInfo.cpp
+++ b/lib/Target/X86/X86TargetAsmInfo.cpp
@@ -71,6 +71,7 @@
   HasDotTypeDotSizeDirective = false;
   HasSingleParameterDotFile = false;
   FDEEncodingRequiresSData4 = false;
+  NonLocalEHFrameLabel = true;
   if (TM.getRelocationModel() == Reloc::Static) {
     StaticCtorsSection = ".constructor";
     StaticDtorsSection = ".destructor";