[llvm-branch-commits] [llvm-branch] r89280 - in /llvm/branches/Apple/Leela/lib: CodeGen/AsmPrinter/DwarfException.cpp Target/TargetLoweringObjectFile.cpp

[Bill Wendling]

Author: void
Date: Wed Nov 18 18:09:46 2009
New Revision: 89280

URL: http://llvm.org/viewvc/llvm-project?rev=89280&view=rev
Log:
$ svn merge -c 89279 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r89279 into '.':
U    lib/CodeGen/AsmPrinter/DwarfException.cpp
U    lib/Target/TargetLoweringObjectFile.cpp


Modified:
    llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp
    llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp

Modified: llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp?rev=89280&r1=89279&r2=89280&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/AsmPrinter/DwarfException.cpp Wed Nov 18 18:09:46 2009
@@ -708,7 +708,7 @@
     // in target-independent code.
     //
     if ((LSDASection->getKind().isWriteable() &&
-         !LSDASection->getKind().isDataRel()) ||
+         !LSDASection->getKind().isReadOnlyWithRel()) ||
         Asm->TM.getRelocationModel() == Reloc::Static)
       TTypeFormat = dwarf::DW_EH_PE_absptr;
     else
@@ -902,11 +902,11 @@
   unsigned Index = 1;
 
   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;
 
     if (TI) {
-      if (!LSDASection->getKind().isDataRel() &&
+      if (!LSDASection->getKind().isReadOnlyWithRel() &&
           (TTypeFormat == dwarf::DW_EH_PE_absptr ||
            TI->getLinkage() == GlobalValue::InternalLinkage)) {
         // Print out the unadorned name of the type info.
@@ -920,7 +920,8 @@
                                                 IsTypeInfoPCRel);
 
         if (!IsTypeInfoPCRel)
-          TypeInfoRef = CreateLabelDiff(TypeInfoRef, "typeinforef_addr", Index);
+          TypeInfoRef = CreateLabelDiff(TypeInfoRef, "typeinforef_addr",
+                                        Index++);
 
         O << MAI->getData32bitsDirective();
         TypeInfoRef->print(O, MAI);

Modified: llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp?rev=89280&r1=89279&r2=89280&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/TargetLoweringObjectFile.cpp Wed Nov 18 18:09:46 2009
@@ -783,7 +783,7 @@
 
   // Exception Handling.
   LSDASection = getMachOSection("__TEXT", "__gcc_except_tab", 0,
-                                SectionKind::getDataRel());
+                                SectionKind::getReadOnlyWithRel());
   EHFrameSection =
     getMachOSection("__TEXT", "__eh_frame",
                     MCSectionMachO::S_COALESCED |