Revert commit 80428. It completely broke exception

handling on x86-32 linux.

llvm-svn: 80592

2 files changed, 0 insertions, 51 deletions

diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index 3600987f26a..15af42e8c48 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -1055,49 +1055,6 @@ unsigned X86TargetLowering::getFunctionAlignment(const Function *F) const {
   return F->hasFnAttr(Attribute::OptimizeForSize) ? 0 : 4;
 }
 
-/// getPreferredLSDADataFormat - Return the preferred exception handling data
-/// format for the LSDA.
-unsigned X86TargetLowering::getPreferredLSDADataFormat() const {
-  if (Subtarget->isTargetDarwin())
-    return dwarf::DW_EH_PE_pcrel;
-
-  CodeModel::Model M = getTargetMachine().getCodeModel();
-
-  if (getTargetMachine().getRelocationModel() == Reloc::PIC_) {
-    if (!Subtarget->is64Bit() || M == CodeModel::Small)
-      return dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4;
-
-    return dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata8;
-  }
-
-  if (M == CodeModel::Small)
-    return dwarf::DW_EH_PE_sdata4;
-
-  return dwarf::DW_EH_PE_absptr;
-}
-
-/// getPreferredFDEDataFormat - Return the preferred exception handling data
-/// format for the FDE.
-unsigned X86TargetLowering::getPreferredFDEDataFormat() const {
-  if (Subtarget->isTargetDarwin())
-    return dwarf::DW_EH_PE_pcrel;
-
-  CodeModel::Model M = getTargetMachine().getCodeModel();
-
-  if (getTargetMachine().getRelocationModel() == Reloc::PIC_) {
-    if (!Subtarget->is64Bit() ||
-        M == CodeModel::Small || M == CodeModel::Medium)
-      return dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4;
-
-    return dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata8;
-  }
-
-  if (M == CodeModel::Small || M == CodeModel::Medium)
-    return dwarf::DW_EH_PE_sdata4;
-
-  return dwarf::DW_EH_PE_absptr;
-}
-
 //===----------------------------------------------------------------------===//
 //               Return Value Calling Convention Implementation
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/Target/X86/X86ISelLowering.h b/llvm/lib/Target/X86/X86ISelLowering.h
index 64716e9d2c9..1c612a13a25 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.h
+++ b/llvm/lib/Target/X86/X86ISelLowering.h
@@ -560,14 +560,6 @@ namespace llvm {
     /// getFunctionAlignment - Return the Log2 alignment of this function.
     virtual unsigned getFunctionAlignment(const Function *F) const;
 
-    /// getPreferredLSDADataFormat - Return the preferred exception handling data
-    /// format for the LSDA.
-    virtual unsigned getPreferredLSDADataFormat() const;
-
-    /// getPreferredFDEDataFormat - Return the preferred exception handling data
-    /// format for the FDE.
-    virtual unsigned getPreferredFDEDataFormat() const;
-
   private:
     /// Subtarget - Keep a pointer to the X86Subtarget around so that we can
     /// make the right decision when generating code for different targets.