The "ReadOnlyWithRel" enum seems to apply more to what Darwin does with the EH

exception table than DataRel.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@89279 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling 2009-11-19 00:09:14 +00:00
parent b80077aae9
commit 01c69374b5
2 changed files with 6 additions and 5 deletions

View File

@ -728,7 +728,7 @@ void DwarfException::EmitExceptionTable() {
// in target-independent code. // in target-independent code.
// //
if ((LSDASection->getKind().isWriteable() && if ((LSDASection->getKind().isWriteable() &&
!LSDASection->getKind().isDataRel()) || !LSDASection->getKind().isReadOnlyWithRel()) ||
Asm->TM.getRelocationModel() == Reloc::Static) Asm->TM.getRelocationModel() == Reloc::Static)
TTypeFormat = dwarf::DW_EH_PE_absptr; TTypeFormat = dwarf::DW_EH_PE_absptr;
else else
@ -922,11 +922,11 @@ void DwarfException::EmitExceptionTable() {
unsigned Index = 1; unsigned Index = 1;
for (std::vector<GlobalVariable *>::const_reverse_iterator for (std::vector<GlobalVariable *>::const_reverse_iterator
I = TypeInfos.rbegin(), E = TypeInfos.rend(); I != E; ++I, ++Index) { I = TypeInfos.rbegin(), E = TypeInfos.rend(); I != E; ++I) {
const GlobalVariable *TI = *I; const GlobalVariable *TI = *I;
if (TI) { if (TI) {
if (!LSDASection->getKind().isDataRel() && if (!LSDASection->getKind().isReadOnlyWithRel() &&
(TTypeFormat == dwarf::DW_EH_PE_absptr || (TTypeFormat == dwarf::DW_EH_PE_absptr ||
TI->getLinkage() == GlobalValue::InternalLinkage)) { TI->getLinkage() == GlobalValue::InternalLinkage)) {
// Print out the unadorned name of the type info. // Print out the unadorned name of the type info.
@ -940,7 +940,8 @@ void DwarfException::EmitExceptionTable() {
IsTypeInfoPCRel); IsTypeInfoPCRel);
if (!IsTypeInfoPCRel) if (!IsTypeInfoPCRel)
TypeInfoRef = CreateLabelDiff(TypeInfoRef, "typeinforef_addr", Index); TypeInfoRef = CreateLabelDiff(TypeInfoRef, "typeinforef_addr",
Index++);
O << MAI->getData32bitsDirective(); O << MAI->getData32bitsDirective();
TypeInfoRef->print(O, MAI); TypeInfoRef->print(O, MAI);

View File

@ -784,7 +784,7 @@ void TargetLoweringObjectFileMachO::Initialize(MCContext &Ctx,
// Exception Handling. // Exception Handling.
LSDASection = getMachOSection("__TEXT", "__gcc_except_tab", 0, LSDASection = getMachOSection("__TEXT", "__gcc_except_tab", 0,
SectionKind::getDataRel()); SectionKind::getReadOnlyWithRel());
EHFrameSection = EHFrameSection =
getMachOSection("__TEXT", "__eh_frame", getMachOSection("__TEXT", "__eh_frame",
MCSectionMachO::S_COALESCED | MCSectionMachO::S_COALESCED |