[lld] r247014 - Revert "[elf2] Add 32S and 64 relocations (needed for musl)."

Rafael Espindola via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 8 06:52:32 PDT 2015


Author: rafael
Date: Tue Sep  8 08:52:31 2015
New Revision: 247014

URL: http://llvm.org/viewvc/llvm-project?rev=247014&view=rev
Log:
Revert "[elf2] Add 32S and 64 relocations (needed for musl)."

This reverts commit r246902. It had uncessary use of yaml.

Removed:
    lld/trunk/test/elf2/relocations.test
Modified:
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=247014&r1=247013&r2=247014&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Tue Sep  8 08:52:31 2015
@@ -271,12 +271,8 @@ template <class ELFT> void OutputSection
                                      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;

Removed: lld/trunk/test/elf2/relocations.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/relocations.test?rev=247013&view=auto
==============================================================================
--- lld/trunk/test/elf2/relocations.test (original)
+++ lld/trunk/test/elf2/relocations.test (removed)
@@ -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




More information about the llvm-commits mailing list