summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2015-09-08 13:52:31 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2015-09-08 13:52:31 +0000
commita4dd7c1d38052fc8380259e4d7180fdfb2d1a169 (patch)
tree710cba7c80dd3b2357f698a83578e458db0d1c96
parent109dba05b176d34c3b24f781ac56a9ca0e762e89 (diff)
downloadbcm5719-llvm-a4dd7c1d38052fc8380259e4d7180fdfb2d1a169.tar.gz
bcm5719-llvm-a4dd7c1d38052fc8380259e4d7180fdfb2d1a169.zip
Revert "[elf2] Add 32S and 64 relocations (needed for musl)."
This reverts commit r246902. It had uncessary use of yaml. llvm-svn: 247014
-rw-r--r--lld/ELF/Writer.cpp4
-rw-r--r--lld/test/elf2/relocations.test31
2 files changed, 0 insertions, 35 deletions
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index e173aac8ecf..0dc4f60ad17 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -271,12 +271,8 @@ template <class ELFT> void OutputSection<ELFT>::writeTo(uint8_t *Buf) {
SymVA + (RI.r_addend - (P + Offset)));
break;
case llvm::ELF::R_X86_64_32:
- case llvm::ELF::R_X86_64_32S:
support::endian::write32le(Location, SymVA + RI.r_addend);
break;
- case llvm::ELF::R_X86_64_64:
- support::endian::write64le(Location, SymVA + RI.r_addend);
- break;
default:
llvm::errs() << Twine("unrecognized reloc ") + Twine(Type) << '\n';
break;
diff --git a/lld/test/elf2/relocations.test b/lld/test/elf2/relocations.test
deleted file mode 100644
index db3d7d00d28..00000000000
--- a/lld/test/elf2/relocations.test
+++ /dev/null
@@ -1,31 +0,0 @@
-# RUN: yaml2obj -format elf %s -o %t
-# RUN: lld -flavor gnu2 %t -o %tout
-# RUN: llvm-objdump -s %tout | FileCheck %s
-
-FileHeader:
- Class: ELFCLASS64
- Data: ELFDATA2LSB
- Type: ET_REL
- Machine: EM_X86_64
-Sections:
- - Name: .text
- Type: SHT_PROGBITS
- Size: 512
- - Name: .rela.text
- Type: SHT_RELA
- Info: .text
- Relocations:
- - Offset: 0x0000000000000000
- Symbol: _start
- Type: R_X86_64_32S
- - Offset: 0x0000000000000004
- Symbol: _start
- Type: R_X86_64_64
-
-Symbols:
- Global:
- - Name: _start
- Section: .text
- Value: 0x42
-
-# CHECK: 0000 42000000 42000000 00000000 00000000
OpenPOWER on IntegriCloud