4 files changed, 6 insertions, 38 deletions

diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h
index c880179038..0de74103ad 100644
--- a/include/llvm/Target/TargetAsmInfo.h
+++ b/include/llvm/Target/TargetAsmInfo.h
@@ -448,20 +448,10 @@ namespace llvm {
     ///
     bool DwarfRequiresFrameSection; // Defaults to true.
 
-    /// FDEEncodingRequiresSData4 - If set, the FDE Encoding in the EH section
-    /// includes DW_EH_PE_sdata4.
-    /// 
-    bool FDEEncodingRequiresSData4;         // Defaults to true
-
     /// NonLocalEHFrameLabel - If set, the EH_frame label needs to be non-local.
     /// 
     bool NonLocalEHFrameLabel;              // Defaults to false.
 
-    /// Force32BitFDEReference - Force the FDE initial location and address
-    /// range to be 32-bit sized.
-    ///
-    bool Force32BitFDEReference;            // Defaults to true.
-
     /// GlobalEHDirective - This is the directive used to make exception frame
     /// tables globally visible.
     ///
@@ -828,15 +818,9 @@ namespace llvm {
     bool doesDwarfRequireFrameSection() const {
       return DwarfRequiresFrameSection;
     }
-    bool doesFDEEncodingRequireSData4() const {
-      return FDEEncodingRequiresSData4;
-    }
     bool doesRequireNonLocalEHFrameLabel() const {
       return NonLocalEHFrameLabel;
     }
-    bool doesRequire32BitFDEReference() const {
-      return Force32BitFDEReference;
-    }
     const char *getGlobalEHDirective() const {
       return GlobalEHDirective;
     }
diff --git a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
index d5ae56efeb..92a068b2c4 100644
--- a/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
@@ -3410,24 +3410,14 @@ private:
       Asm->EmitInt8(DW_EH_PE_pcrel | DW_EH_PE_sdata4);
       Asm->EOL("LSDA Encoding (pcrel sdata4)");
 
-      if (TAI->doesFDEEncodingRequireSData4()) {
-        Asm->EmitInt8(DW_EH_PE_pcrel | DW_EH_PE_sdata4);
-        Asm->EOL("FDE Encoding (pcrel sdata4)");
-      } else {
-        Asm->EmitInt8(DW_EH_PE_pcrel);
-        Asm->EOL("FDE Encoding (pcrel)");
-      }
+      Asm->EmitInt8(DW_EH_PE_pcrel | DW_EH_PE_sdata4);
+      Asm->EOL("FDE Encoding (pcrel sdata4)");
    } else {
       Asm->EmitULEB128Bytes(1);
       Asm->EOL("Augmentation Size");
 
-      if (TAI->doesFDEEncodingRequireSData4()) {
-        Asm->EmitInt8(DW_EH_PE_pcrel | DW_EH_PE_sdata4);
-        Asm->EOL("FDE Encoding (pcrel sdata4)");
-      } else {
-        Asm->EmitInt8(DW_EH_PE_pcrel);
-        Asm->EOL("FDE Encoding (pcrel)");
-      }
+      Asm->EmitInt8(DW_EH_PE_pcrel | DW_EH_PE_sdata4);
+      Asm->EOL("FDE Encoding (pcrel sdata4)");
     }
 
     // Indicate locations of general callee saved registers in frame.
@@ -3508,12 +3498,10 @@ private:
 
       Asm->EOL("FDE CIE offset");
 
-      EmitReference("eh_func_begin", EHFrameInfo.Number, true, 
-                    TAI->doesRequire32BitFDEReference());
+      EmitReference("eh_func_begin", EHFrameInfo.Number, true);
       Asm->EOL("FDE initial location");
       EmitDifference("eh_func_end", EHFrameInfo.Number,
-                     "eh_func_begin", EHFrameInfo.Number,
-                     TAI->doesRequire32BitFDEReference());
+                     "eh_func_begin", EHFrameInfo.Number);
       Asm->EOL("FDE address range");
 
       // If there is a personality and landing pads then point to the language
diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index 0cf969cf3a..532b8b9a5b 100644
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -99,9 +99,7 @@ void TargetAsmInfo::fillDefaultValues() {
   SupportsDebugInformation = false;
   SupportsExceptionHandling = false;
   DwarfRequiresFrameSection = true;
-  FDEEncodingRequiresSData4 = true;
   NonLocalEHFrameLabel = false;
-  Force32BitFDEReference = true;
   GlobalEHDirective = 0;
   SupportsWeakOmittedEHFrame = true;
   DwarfSectionOffsetDirective = 0;
diff --git a/lib/Target/X86/X86TargetAsmInfo.cpp b/lib/Target/X86/X86TargetAsmInfo.cpp
index 1cf859b3b8..e21596cd91 100644
--- a/lib/Target/X86/X86TargetAsmInfo.cpp
+++ b/lib/Target/X86/X86TargetAsmInfo.cpp
@@ -70,9 +70,7 @@ X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const X86TargetMachine &TM):
   COMMDirectiveTakesAlignment = (Subtarget->getDarwinVers() >= 9);
   HasDotTypeDotSizeDirective = false;
   HasSingleParameterDotFile = false;
-  FDEEncodingRequiresSData4 = false;
   NonLocalEHFrameLabel = true;
-  Force32BitFDEReference = false;
   if (TM.getRelocationModel() == Reloc::Static) {
     StaticCtorsSection = ".constructor";
     StaticDtorsSection = ".destructor";