summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorEvan Cheng <evan.cheng@apple.com>2006-12-19 21:31:42 +0000
committerEvan Cheng <evan.cheng@apple.com>2006-12-19 21:31:42 +0000
commit582ac4bed7b36bc3bf5e363611cb483b146d36d7 (patch)
tree35ea3010ee427d3fdbed3f2018fae66e1fd0b747 /llvm
parent13bfd32f5dc4f471c5f48d09971cd1345e93e098 (diff)
downloadbcm5719-llvm-582ac4bed7b36bc3bf5e363611cb483b146d36d7.tar.gz
bcm5719-llvm-582ac4bed7b36bc3bf5e363611cb483b146d36d7.zip
Fix for PR1062 by Dan Gohman.
llvm-svn: 32688
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/Target/X86/X86ISelDAGToDAG.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
index 5c0bd28fe74..863e6d8a14d 100644
--- a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -604,11 +604,9 @@ bool X86DAGToDAGISel::MatchAddress(SDOperand N, X86ISelAddressMode &AM,
SDOperand N0 = N.getOperand(0);
if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(N0)) {
GlobalValue *GV = G->getGlobal();
- bool isAbs32 = !is64Bit ||
- (isStatic && !(GV->isExternal() || GV->hasWeakLinkage() ||
- GV->hasLinkOnceLinkage()));
+ bool isAbs32 = !is64Bit || isStatic;
if (isAbs32 || isRoot) {
- AM.GV = G->getGlobal();
+ AM.GV = GV;
AM.Disp += G->getOffset();
AM.isRIPRel = !isAbs32;
return false;
OpenPOWER on IntegriCloud