[llvm-commits] CVS: llvm/lib/Target/ARM/ARMAsmPrinter.cpp ARMISelLowering.cpp

[Reid Spencer]

Changes in directory llvm/lib/Target/ARM:

ARMAsmPrinter.cpp updated: 1.53 -> 1.54
ARMISelLowering.cpp updated: 1.6 -> 1.7
---
Log message:

For PR1136: http://llvm.org/PR1136 : Rename GlobalVariable::isExternal as isDeclaration to avoid
confusion with external linkage types.


---
Diffs of the changes:  (+3 -3)

 ARMAsmPrinter.cpp   |    2 +-
 ARMISelLowering.cpp |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/ARM/ARMAsmPrinter.cpp
diff -u llvm/lib/Target/ARM/ARMAsmPrinter.cpp:1.53 llvm/lib/Target/ARM/ARMAsmPrinter.cpp:1.54
--- llvm/lib/Target/ARM/ARMAsmPrinter.cpp:1.53	Tue Jan 30 02:04:53 2007
+++ llvm/lib/Target/ARM/ARMAsmPrinter.cpp	Tue Jan 30 14:08:37 2007
@@ -264,7 +264,7 @@
     bool isCallOp = Modifier && !strcmp(Modifier, "call");
     GlobalValue *GV = MO.getGlobal();
     std::string Name = Mang->getValueName(GV);
-    bool isExt = (GV->isExternal() || GV->hasWeakLinkage() ||
+    bool isExt = (GV->isDeclaration() || GV->hasWeakLinkage() ||
                   GV->hasLinkOnceLinkage());
     if (isExt && isCallOp && Subtarget->isTargetDarwin() &&
         TM.getRelocationModel() != Reloc::Static) {


Index: llvm/lib/Target/ARM/ARMISelLowering.cpp
diff -u llvm/lib/Target/ARM/ARMISelLowering.cpp:1.6 llvm/lib/Target/ARM/ARMISelLowering.cpp:1.7
--- llvm/lib/Target/ARM/ARMISelLowering.cpp:1.6	Mon Jan 29 16:58:52 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.cpp	Tue Jan 30 14:08:37 2007
@@ -467,7 +467,7 @@
     GlobalValue *GV = G->getGlobal();
     Callee = DAG.getTargetGlobalAddress(GV, getPointerTy());
     isDirect = true;
-    bool isExt = (GV->isExternal() || GV->hasWeakLinkage() ||
+    bool isExt = (GV->isDeclaration() || GV->hasWeakLinkage() ||
                   GV->hasLinkOnceLinkage());
     bool isStub = (isExt && Subtarget->isTargetDarwin()) &&
                    getTargetMachine().getRelocationModel() != Reloc::Static;
@@ -632,7 +632,7 @@
 /// even in dynamic-no-pic mode.
 static bool GVIsIndirectSymbol(GlobalValue *GV) {
   return (GV->hasWeakLinkage() || GV->hasLinkOnceLinkage() ||
-          (GV->isExternal() && !GV->hasNotBeenReadFromBytecode()));
+          (GV->isDeclaration() && !GV->hasNotBeenReadFromBytecode()));
 }
 
 SDOperand ARMTargetLowering::LowerGlobalAddress(SDOperand Op,