diff options
| author | Akira Hatanaka <ahatanaka@mips.com> | 2011-12-13 02:27:40 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@mips.com> | 2011-12-13 02:27:40 +0000 |
| commit | e41963ce479b4fe0e886d829554900c09f4164b0 (patch) | |
| tree | 19597a9acfc24fe8900c1e387b00721877121e71 | |
| parent | 09880c42c6b5234f6a4a02bf2af04519084eb97c (diff) | |
| download | bcm5719-llvm-e41963ce479b4fe0e886d829554900c09f4164b0.tar.gz bcm5719-llvm-e41963ce479b4fe0e886d829554900c09f4164b0.zip | |
Relocation against a symbol, instead of against section. We had some extreme
test cases where there were a lot of relocations applied relative to a large
rodata section. Gas would create a symbol for each of these whereas we would
be relative to the beginning of the rodata section. This change mimics what
gas does.
Patch by Jack Carter.
llvm-svn: 146468
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/CodeGen/Mips/DO-relsym.ll | 29 |
2 files changed, 31 insertions, 2 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 40b84ae4585..92aad94f17f 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -1851,7 +1851,8 @@ const MCSymbol *MipsELFObjectWriter::ExplicitRelSym(const MCAssembler &Asm, assert(Target.getSymA() && "SymA cannot be 0."); const MCSymbol &Sym = Target.getSymA()->getSymbol(); - if (Sym.getSection().getKind().isMergeable1ByteCString()) + if (Sym.getSection().getKind().isMergeableCString() || + Sym.getSection().getKind().isMergeableConst()) return &Sym; return NULL; @@ -1914,4 +1915,3 @@ unsigned MipsELFObjectWriter::GetRelocType(const MCValue &Target, return Type; } - diff --git a/llvm/test/CodeGen/Mips/DO-relsym.ll b/llvm/test/CodeGen/Mips/DO-relsym.ll new file mode 100644 index 00000000000..0f74437ec5d --- /dev/null +++ b/llvm/test/CodeGen/Mips/DO-relsym.ll @@ -0,0 +1,29 @@ +; RUN: llc -filetype=obj -mtriple mipsel-unknown-linux %s -o - | elf-dump --dump-section-data | FileCheck %s + +; Check that the appropriate symbols were created. + +; CHECK: (('st_name', 0x{{[0-9|a-f]+}}) # '$.str' +; CHECK: (('st_name', 0x{{[0-9|a-f]+}}) # '$.str1' +; CHECK: (('st_name', 0x{{[0-9|a-f]+}}) # '$CPI0_0' +; CHECK: (('st_name', 0x{{[0-9|a-f]+}}) # '$CPI0_1' + +@.str = private unnamed_addr constant [6 x i8] c"abcde\00", align 1 +@gc1 = external global i8* +@.str1 = private unnamed_addr constant [5 x i8] c"fghi\00", align 1 +@gc2 = external global i8* +@gd1 = external global double +@gd2 = external global double + +define void @foo1() nounwind { +entry: + store i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), i8** @gc1, align 4 + store i8* getelementptr inbounds ([5 x i8]* @.str1, i32 0, i32 0), i8** @gc2, align 4 + %0 = load double* @gd1, align 8 + %add = fadd double %0, 2.500000e+00 + store double %add, double* @gd1, align 8 + %1 = load double* @gd2, align 8 + %add1 = fadd double %1, 4.500000e+00 + store double %add1, double* @gd2, align 8 + ret void +} + |
