aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/Mips
diff options
context:
space:
mode:
authorJack Carter <jcarter@mips.com>2013-01-15 01:08:02 +0000
committerJack Carter <jcarter@mips.com>2013-01-15 01:08:02 +0000
commit096d617796228293810cb0443c6617b33c5afdc5 (patch)
treee0768d33e7b50429f50a88eefa9dcff3f4b0c59a /lib/Target/Mips
parentbbe64fba4abbe65824587bd3ed9509df09cbc5e3 (diff)
downloadexternal_llvm-096d617796228293810cb0443c6617b33c5afdc5.zip
external_llvm-096d617796228293810cb0443c6617b33c5afdc5.tar.gz
external_llvm-096d617796228293810cb0443c6617b33c5afdc5.tar.bz2
This patch fixes a Mips specific bug where
we need to generate a N64 compound relocation R_MIPS_GPREL_32/R_MIPS_64/R_MIPS_NONE. The bug was exposed by the SingleSourcetest case DuffsDevice.c. Contributer: Jack Carter git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172496 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/Mips')
-rw-r--r--lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
index f82e203..7afb77e 100644
--- a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
+++ b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
@@ -108,7 +108,13 @@ unsigned MipsELFObjectWriter::GetRelocType(const MCValue &Target,
Type = ELF::R_MIPS_64;
break;
case FK_GPRel_4:
- Type = ELF::R_MIPS_GPREL32;
+ if (isN64()) {
+ Type = setRType((unsigned)ELF::R_MIPS_GPREL32, Type);
+ Type = setRType2((unsigned)ELF::R_MIPS_64, Type);
+ Type = setRType3((unsigned)ELF::R_MIPS_NONE, Type);
+ }
+ else
+ Type = ELF::R_MIPS_GPREL32;
break;
case Mips::fixup_Mips_GPREL16:
Type = ELF::R_MIPS_GPREL16;