commit 769f69f9b62f5d88cf50bccd1200d58d39b6dbcf
author Akira Hatanaka <ahatanaka@mips.com> Tue Mar 27 02:55:31 2012 +0000
committer Akira Hatanaka <ahatanaka@mips.com> Tue Mar 27 02:55:31 2012 +0000
tree 2190fe8dd08323c21bf4db5550a46dfb90307fd4
parent 2a36c9f4a8d2b62b7094a4ee0af4435bb873c104

Fix bug in LowerConstantPool. 

llvm-svn: 153498

llvm/lib/Target/Mips/MipsISelLowering.cpp

diff --git a/llvm/lib/Target/Mips/MipsISelLowering.cpp b/llvm/lib/Target/Mips/MipsISelLowering.cpp
index ecde5b6..f7da0ec 100644
--- a/llvm/lib/Target/Mips/MipsISelLowering.cpp
+++ b/llvm/lib/Target/Mips/MipsISelLowering.cpp
@@ -1712,7 +1712,7 @@
   //  SDValue GOT = DAG.getGLOBAL_OFFSET_TABLE(MVT::i32);
   //  ResNode = DAG.getNode(ISD::ADD, MVT::i32, GOT, GPRelNode);
 
-  if (getTargetMachine().getRelocationModel() != Reloc::PIC_) {
+  if (getTargetMachine().getRelocationModel() != Reloc::PIC_ && !IsN64) {
     SDValue CPHi = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment(),
                                              N->getOffset(), MipsII::MO_ABS_HI);
     SDValue CPLo = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment(),