Revert r61415 and r61484. Duncan was correct that these weren't needed.

llvm-svn: 61765
This commit is contained in:
Bill Wendling 2009-01-05 22:53:45 +00:00
parent f6ab374c28
commit 891f9abdbb
4 changed files with 6 additions and 38 deletions

View File

@ -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;
}

View File

@ -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

View File

@ -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;

View File

@ -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";