[lld] r250553 - ELF2: Remove an empty stub for 32-bit PPC.
Rui Ueyama via llvm-commits
llvm-commits at lists.llvm.org
Fri Oct 16 14:37:09 PDT 2015
Author: ruiu
Date: Fri Oct 16 16:37:09 2015
New Revision: 250553
URL: http://llvm.org/viewvc/llvm-project?rev=250553&view=rev
Log:
ELF2: Remove an empty stub for 32-bit PPC.
This code will be resurrected when we start working on PPC32.
Removed:
lld/trunk/test/elf2/basic32be.s
Modified:
lld/trunk/ELF/Target.cpp
lld/trunk/test/elf2/emulation.s
Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=250553&r1=250552&r2=250553&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Fri Oct 16 16:37:09 2015
@@ -84,18 +84,6 @@ public:
bool isRelRelative(uint32_t Type) const override;
};
-class PPCTargetInfo final : public TargetInfo {
-public:
- PPCTargetInfo();
- void writePltEntry(uint8_t *Buf, uint64_t GotEntryAddr,
- uint64_t PltEntryAddr) const override;
- bool relocNeedsGot(uint32_t Type, const SymbolBody &S) const override;
- bool relocNeedsPlt(uint32_t Type, const SymbolBody &S) const override;
- void relocateOne(uint8_t *Buf, uint8_t *BufEnd, const void *RelP,
- uint32_t Type, uint64_t BaseAddr,
- uint64_t SA) const override;
-};
-
class AArch64TargetInfo final : public TargetInfo {
public:
AArch64TargetInfo();
@@ -136,8 +124,6 @@ TargetInfo *createTarget() {
default:
error("Unsupported MIPS target");
}
- case EM_PPC:
- return new PPCTargetInfo();
case EM_PPC64:
return new PPC64TargetInfo();
case EM_X86_64:
@@ -557,23 +543,6 @@ void PPC64TargetInfo::relocateOne(uint8_
}
}
-PPCTargetInfo::PPCTargetInfo() {
- // PCRelReloc = FIXME
- // GotReloc = FIXME
- PageSize = 65536;
-}
-void PPCTargetInfo::writePltEntry(uint8_t *Buf, uint64_t GotEntryAddr,
- uint64_t PltEntryAddr) const {}
-bool PPCTargetInfo::relocNeedsGot(uint32_t Type, const SymbolBody &S) const {
- return false;
-}
-bool PPCTargetInfo::relocNeedsPlt(uint32_t Type, const SymbolBody &S) const {
- return false;
-}
-void PPCTargetInfo::relocateOne(uint8_t *Buf, uint8_t *BufEnd, const void *RelP,
- uint32_t Type, uint64_t BaseAddr,
- uint64_t SA) const {}
-
AArch64TargetInfo::AArch64TargetInfo() {
// PCRelReloc = FIXME
// GotReloc = FIXME
Removed: lld/trunk/test/elf2/basic32be.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic32be.s?rev=250552&view=auto
==============================================================================
--- lld/trunk/test/elf2/basic32be.s (original)
+++ lld/trunk/test/elf2/basic32be.s (removed)
@@ -1,168 +0,0 @@
-# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux %s -o %t
-# RUN: ld.lld2 %t -o %t2
-# RUN: llvm-readobj -file-headers -sections -program-headers %t2 | FileCheck %s
-# REQUIRES: ppc
-
-# exits with return code 42 on linux
-.globl _start;
-_start:
- li 0,1
- li 3,42
- sc
-
-# CHECK: ElfHeader {
-# CHECK-NEXT: Ident {
-# CHECK-NEXT: Magic: (7F 45 4C 46)
-# CHECK-NEXT: Class: 32-bit (0x1)
-# CHECK-NEXT: DataEncoding: BigEndian (0x2)
-# CHECK-NEXT: FileVersion: 1
-# CHECK-NEXT: OS/ABI: SystemV (0x0)
-# CHECK-NEXT: ABIVersion: 0
-# CHECK-NEXT: Unused: (00 00 00 00 00 00 00)
-# CHECK-NEXT: }
-# CHECK-NEXT: Type: Executable (0x2)
-# CHECK-NEXT: Machine: EM_PPC (0x14)
-# CHECK-NEXT: Version: 1
-# CHECK-NEXT: Entry: 0x20000
-# CHECK-NEXT: ProgramHeaderOffset: 0x34
-# CHECK-NEXT: SectionHeaderOffset: 0x10058
-# CHECK-NEXT: Flags [ (0x0)
-# CHECK-NEXT: ]
-# CHECK-NEXT: HeaderSize: 52
-# CHECK-NEXT: ProgramHeaderEntrySize: 32
-# CHECK-NEXT: ProgramHeaderCount: 3
-# CHECK-NEXT: SectionHeaderEntrySize: 40
-# CHECK-NEXT: SectionHeaderCount: 6
-# CHECK-NEXT: StringTableSectionIndex: 5
-# CHECK-NEXT: }
-# CHECK-NEXT: Sections [
-# CHECK-NEXT: Section {
-# CHECK-NEXT: Index: 0
-# CHECK-NEXT: Name: (0)
-# CHECK-NEXT: Type: SHT_NULL (0x0)
-# CHECK-NEXT: Flags [ (0x0)
-# CHECK-NEXT: ]
-# CHECK-NEXT: Address: 0x0
-# CHECK-NEXT: Offset: 0x0
-# CHECK-NEXT: Size: 0
-# CHECK-NEXT: Link: 0
-# CHECK-NEXT: Info: 0
-# CHECK-NEXT: AddressAlignment: 0
-# CHECK-NEXT: EntrySize: 0
-# CHECK-NEXT: }
-# CHECK-NEXT: Section {
-# CHECK-NEXT: Index: 1
-# CHECK-NEXT: Name: .text
-# CHECK-NEXT: Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT: Flags [ (0x6)
-# CHECK-NEXT: SHF_ALLOC (0x2)
-# CHECK-NEXT: SHF_EXECINSTR (0x4)
-# CHECK-NEXT: ]
-# CHECK-NEXT: Address: 0x20000
-# CHECK-NEXT: Offset: 0x1000
-# CHECK-NEXT: Size: 12
-# CHECK-NEXT: Link: 0
-# CHECK-NEXT: Info: 0
-# CHECK-NEXT: AddressAlignment: 4
-# CHECK-NEXT: EntrySize: 0
-# CHECK-NEXT: }
-# CHECK-NEXT: Section {
-# CHECK-NEXT: Index: 2
-# CHECK-NEXT: Name: .data
-# CHECK-NEXT: Type: SHT_PROGBITS (0x1)
-# CHECK-NEXT: Flags [ (0x3)
-# CHECK-NEXT: SHF_ALLOC (0x2)
-# CHECK-NEXT: SHF_WRITE (0x1)
-# CHECK-NEXT: ]
-# CHECK-NEXT: Address: 0x2000C
-# CHECK-NEXT: Offset: 0x1000C
-# CHECK-NEXT: Size: 0
-# CHECK-NEXT: Link: 0
-# CHECK-NEXT: Info: 0
-# CHECK-NEXT: AddressAlignment: 4
-# CHECK-NEXT: EntrySize: 0
-# CHECK-NEXT: }
-# CHECK-NEXT: Section {
-# CHECK-NEXT: Index: 3
-# CHECK-NEXT: Name: .bss
-# CHECK-NEXT: Type: SHT_NOBITS (0x8)
-# CHECK-NEXT: Flags [ (0x3)
-# CHECK-NEXT: SHF_ALLOC (0x2)
-# CHECK-NEXT: SHF_WRITE (0x1)
-# CHECK-NEXT: ]
-# CHECK-NEXT: Address: 0x2000C
-# CHECK-NEXT: Offset: 0x1000C
-# CHECK-NEXT: Size: 0
-# CHECK-NEXT: Link: 0
-# CHECK-NEXT: Info: 0
-# CHECK-NEXT: AddressAlignment: 4
-# CHECK-NEXT: EntrySize: 0
-# CHECK-NEXT: }
-# CHECK-NEXT: Section {
-# CHECK-NEXT: Index: 4
-# CHECK-NEXT: Name: .symtab
-# CHECK-NEXT: Type: SHT_SYMTAB
-# CHECK-NEXT: Flags [
-# CHECK-NEXT: ]
-# CHECK-NEXT: Address: 0x0
-# CHECK-NEXT: Offset: 0x1000C
-# CHECK-NEXT: Size: 32
-# CHECK-NEXT: Link: 5
-# CHECK-NEXT: Info: 1
-# CHECK-NEXT: AddressAlignment: 4
-# CHECK-NEXT: EntrySize: 16
-# CHECK-NEXT: }
-# CHECK-NEXT: Section {
-# CHECK-NEXT: Index: 5
-# CHECK-NEXT: Name: .strtab
-# CHECK-NEXT: Type: SHT_STRTAB (0x3)
-# CHECK-NEXT: Flags [ (0x0)
-# CHECK-NEXT: ]
-# CHECK-NEXT: Address: 0x0
-# CHECK-NEXT: Offset: 0x1002C
-# CHECK-NEXT: Size: 41
-# CHECK-NEXT: Link: 0
-# CHECK-NEXT: Info: 0
-# CHECK-NEXT: AddressAlignment: 1
-# CHECK-NEXT: EntrySize: 0
-# CHECK-NEXT: }
-# CHECK-NEXT: ]
-# CHECK-NEXT: ProgramHeaders [
-# CHECK-NEXT: ProgramHeader {
-# CHECK-NEXT: Type: PT_PHDR (0x6)
-# CHECK-NEXT: Offset: 0x34
-# CHECK-NEXT: VirtualAddress: 0x10034
-# CHECK-NEXT: PhysicalAddress: 0x10034
-# CHECK-NEXT: FileSize: 96
-# CHECK-NEXT: MemSize: 96
-# CHECK-NEXT: Flags [ (0x4)
-# CHECK-NEXT: PF_R (0x4)
-# CHECK-NEXT: ]
-# CHECK-NEXT: Alignment: 8
-# CHECK-NEXT: }
-# CHECK-NEXT: ProgramHeader {
-# CHECK-NEXT: Type: PT_LOAD (0x1)
-# CHECK-NEXT: Offset: 0x0
-# CHECK-NEXT: VirtualAddress: 0x10000
-# CHECK-NEXT: PhysicalAddress: 0x10000
-# CHECK-NEXT: FileSize: 148
-# CHECK-NEXT: MemSize: 148
-# CHECK-NEXT: Flags [
-# CHECK-NEXT: PF_R
-# CHECK-NEXT: ]
-# CHECK-NEXT: Alignment: 65536
-# CHECK-NEXT: }
-# CHECK-NEXT: ProgramHeader {
-# CHECK-NEXT: Type: PT_LOAD (0x1)
-# CHECK-NEXT: Offset: 0x1000
-# CHECK-NEXT: VirtualAddress: 0x20000
-# CHECK-NEXT: PhysicalAddress: 0x20000
-# CHECK-NEXT: FileSize: 12
-# CHECK-NEXT: MemSize: 12
-# CHECK-NEXT: Flags [ (0x5)
-# CHECK-NEXT: PF_R (0x4)
-# CHECK-NEXT: PF_X (0x1)
-# CHECK-NEXT: ]
-# CHECK-NEXT: Alignment: 65536
-# CHECK-NEXT: }
-# CHECK-NEXT: ]
Modified: lld/trunk/test/elf2/emulation.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/emulation.s?rev=250553&r1=250552&r2=250553&view=diff
==============================================================================
--- lld/trunk/test/elf2/emulation.s (original)
+++ lld/trunk/test/elf2/emulation.s Fri Oct 16 16:37:09 2015
@@ -91,37 +91,6 @@
# PPC64-NEXT: StringTableSectionIndex: 5
# PPC64-NEXT: }
-# RUN: llvm-mc -filetype=obj -triple=powerpc-unknown-linux %s -o %tppc
-# RUN: ld.lld2 -m elf32ppc %tppc -o %t2ppc
-# RUN: llvm-readobj -file-headers %t2ppc | FileCheck --check-prefix=PPC %s
-# RUN: ld.lld2 %tppc -o %t3ppc
-# RUN: llvm-readobj -file-headers %t3ppc | FileCheck --check-prefix=PPC %s
-# PPC: ElfHeader {
-# PPC-NEXT: Ident {
-# PPC-NEXT: Magic: (7F 45 4C 46)
-# PPC-NEXT: Class: 32-bit (0x1)
-# PPC-NEXT: DataEncoding: BigEndian (0x2)
-# PPC-NEXT: FileVersion: 1
-# PPC-NEXT: OS/ABI: SystemV (0x0)
-# PPC-NEXT: ABIVersion: 0
-# PPC-NEXT: Unused: (00 00 00 00 00 00 00)
-# PPC-NEXT: }
-# PPC-NEXT: Type: Executable (0x2)
-# PPC-NEXT: Machine: EM_PPC (0x14)
-# PPC-NEXT: Version: 1
-# PPC-NEXT: Entry: 0x10074
-# PPC-NEXT: ProgramHeaderOffset: 0x34
-# PPC-NEXT: SectionHeaderOffset: 0xC0
-# PPC-NEXT: Flags [ (0x0)
-# PPC-NEXT: ]
-# PPC-NEXT: HeaderSize: 52
-# PPC-NEXT: ProgramHeaderEntrySize: 32
-# PPC-NEXT: ProgramHeaderCount: 2
-# PPC-NEXT: SectionHeaderEntrySize: 40
-# PPC-NEXT: SectionHeaderCount: 6
-# PPC-NEXT: StringTableSectionIndex: 5
-# PPC-NEXT: }
-
# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %tmips
# RUN: lld -flavor gnu2 -m elf32btsmip -e _start %tmips -o %t2mips
# RUN: llvm-readobj -file-headers %t2mips | FileCheck --check-prefix=MIPS %s
More information about the llvm-commits
mailing list