diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h
index 6080619c368..aa9c14514c9 100644
--- a/include/llvm/Target/TargetAsmInfo.h
+++ b/include/llvm/Target/TargetAsmInfo.h
@@ -453,6 +453,10 @@ namespace llvm {
     /// 
     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 @@ namespace llvm {
     bool doesFDEEncodingRequireSData4() const {
       return FDEEncodingRequiresSData4;
     }
+    bool doesRequireNonLocalEHFrameLabel() const {
+      return NonLocalEHFrameLabel;
+    }
     const char *getGlobalEHDirective() const {
       return GlobalEHDirective;
     }
diff --git a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
index 42ed34879e3..70d4d1ffecc 100644
--- a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
@@ -2963,7 +2963,10 @@ private:
 
     // 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 @@ private:
 
       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);
diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index b6adbe7ac12..c9a525a506e 100644
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -100,6 +100,7 @@ void TargetAsmInfo::fillDefaultValues() {
   SupportsExceptionHandling = false;
   DwarfRequiresFrameSection = true;
   FDEEncodingRequiresSData4 = true;
+  NonLocalEHFrameLabel = false;
   GlobalEHDirective = 0;
   SupportsWeakOmittedEHFrame = true;
   DwarfSectionOffsetDirective = 0;
diff --git a/lib/Target/X86/X86TargetAsmInfo.cpp b/lib/Target/X86/X86TargetAsmInfo.cpp
index 0dfb8550f6d..4dfb214ec71 100644
--- a/lib/Target/X86/X86TargetAsmInfo.cpp
+++ b/lib/Target/X86/X86TargetAsmInfo.cpp
@@ -71,6 +71,7 @@ X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const X86TargetMachine &TM):
   HasDotTypeDotSizeDirective = false;
   HasSingleParameterDotFile = false;
   FDEEncodingRequiresSData4 = false;
+  NonLocalEHFrameLabel = true;
   if (TM.getRelocationModel() == Reloc::Static) {
     StaticCtorsSection = ".constructor";
     StaticDtorsSection = ".destructor";