This is an archive of the discontinued LLVM Phabricator instance.

Differential D53652

[PPC64] Handle powerpc64 in OUTPUT_FORMAT
ClosedPublic

Authored by sfertile on Oct 24 2018, 9:09 AM.

Details

Reviewers
ruiu
MaskRay
• espindola
Commits
rG92964e74a555: [PPC64] Handle powerpc64 in OUTPUT_FORMAT.
rL345604: [PPC64] Handle powerpc64 in OUTPUT_FORMAT.
rLLD345604: [PPC64] Handle powerpc64 in OUTPUT_FORMAT.

Diff Detail

Repository
rLLD LLVM Linker

Event Timeline

sfertile created this revision.Oct 24 2018, 9:09 AM
Herald added a reviewer: • espindola. · View Herald TranscriptOct 24 2018, 9:09 AM
Herald added subscribers: jsji, kbarton, arichardson and 2 others. · View Herald Transcript
ruiu accepted this revision.Oct 24 2018, 9:11 AM

LGTM

This revision is now accepted and ready to land.Oct 24 2018, 9:11 AM
MaskRay accepted this revision.Oct 24 2018, 10:09 AM
MaskRay added a comment.Oct 29 2018, 10:26 PM

Hi... can you commit

echristo added a subscriber: sfertile.Oct 29 2018, 10:46 PM

Go ahead and commit for them.

Thanks!

sfertile added a comment.Oct 30 2018, 7:17 AM
In D53652#1279965, @MaskRay wrote:

Hi... can you commit

Yep, committing it now.

Closed by commit rLLD345604: [PPC64] Handle powerpc64 in OUTPUT_FORMAT. (authored by sfertile). · Explain WhyOct 30 2018, 7:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
ELF/
4 lines
test/
ELF/
8 lines

Diff 171693

ELF/ScriptParser.cpp

Show First 20 Lines • Show All 389 Lines • ▼ Show 20 Linesstd::pair<ELFKind, uint16_t> ScriptParser::readBfdName() {
if (S == "elf32-iamcu") if (S == "elf32-iamcu")
return {ELF32LEKind, EM_IAMCU}; return {ELF32LEKind, EM_IAMCU};
if (S == "elf32-littlearm") if (S == "elf32-littlearm")
return {ELF32LEKind, EM_ARM}; return {ELF32LEKind, EM_ARM};
if (S == "elf32-x86-64") if (S == "elf32-x86-64")
return {ELF32LEKind, EM_X86_64}; return {ELF32LEKind, EM_X86_64};
if (S == "elf64-littleaarch64") if (S == "elf64-littleaarch64")
return {ELF64LEKind, EM_AARCH64}; return {ELF64LEKind, EM_AARCH64};
if (S == "elf64-powerpc")
return {ELF64BEKind, EM_PPC64};
if (S == "elf64-powerpcle")
return {ELF64LEKind, EM_PPC64};
if (S == "elf64-x86-64") if (S == "elf64-x86-64")
return {ELF64LEKind, EM_X86_64}; return {ELF64LEKind, EM_X86_64};
setError("unknown output format name: " + S); setError("unknown output format name: " + S);
return {ELFNoneKind, EM_NONE}; return {ELFNoneKind, EM_NONE};
} }
// Parse OUTPUT_FORMAT(bfdname) or OUTPUT_FORMAT(bfdname, big, little). // Parse OUTPUT_FORMAT(bfdname) or OUTPUT_FORMAT(bfdname, big, little).
▲ Show 20 Lines • Show All 1,127 Lines • Show Last 20 Lines

test/ELF/emulation-ppc.s

# REQUIRES: ppc # REQUIRES: ppc
# RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %tppc64 # RUN: llvm-mc -filetype=obj -triple=powerpc64-unknown-linux %s -o %tppc64
# RUN: ld.lld -m elf64ppc %tppc64 -o %t2ppc64 # RUN: ld.lld -m elf64ppc %tppc64 -o %t2ppc64
# RUN: llvm-readobj -file-headers %t2ppc64 | FileCheck --check-prefix=PPC64 %s # RUN: llvm-readobj -file-headers %t2ppc64 | FileCheck --check-prefix=PPC64 %s
# RUN: ld.lld %tppc64 -o %t3ppc64 # RUN: ld.lld %tppc64 -o %t3ppc64
# RUN: llvm-readobj -file-headers %t3ppc64 | FileCheck --check-prefix=PPC64 %s # RUN: llvm-readobj -file-headers %t3ppc64 | FileCheck --check-prefix=PPC64 %s
# RUN: echo 'OUTPUT_FORMAT(elf64-powerpc)' > %tppc64.script
# RUN: ld.lld %tppc64.script %tppc64 -o %t4ppc64
# RUN: llvm-readobj -file-headers %t4ppc64 | FileCheck --check-prefix=PPC64 %s
# PPC64: ElfHeader { # PPC64: ElfHeader {
# PPC64-NEXT: Ident { # PPC64-NEXT: Ident {
# PPC64-NEXT: Magic: (7F 45 4C 46) # PPC64-NEXT: Magic: (7F 45 4C 46)
# PPC64-NEXT: Class: 64-bit (0x2) # PPC64-NEXT: Class: 64-bit (0x2)
# PPC64-NEXT: DataEncoding: BigEndian (0x2) # PPC64-NEXT: DataEncoding: BigEndian (0x2)
# PPC64-NEXT: FileVersion: 1 # PPC64-NEXT: FileVersion: 1
# PPC64-NEXT: OS/ABI: SystemV (0x0) # PPC64-NEXT: OS/ABI: SystemV (0x0)
# PPC64-NEXT: ABIVersion: 0 # PPC64-NEXT: ABIVersion: 0
Show All 16 Lines
# PPC64-NEXT: StringTableSectionIndex: # PPC64-NEXT: StringTableSectionIndex:
# PPC64-NEXT: } # PPC64-NEXT: }
# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %tppc64le # RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %tppc64le
# RUN: ld.lld -m elf64lppc %tppc64le -o %t2ppc64le # RUN: ld.lld -m elf64lppc %tppc64le -o %t2ppc64le
# RUN: llvm-readobj -file-headers %t2ppc64le | FileCheck --check-prefix=PPC64LE %s # RUN: llvm-readobj -file-headers %t2ppc64le | FileCheck --check-prefix=PPC64LE %s
# RUN: ld.lld %tppc64le -o %t3ppc64le # RUN: ld.lld %tppc64le -o %t3ppc64le
# RUN: llvm-readobj -file-headers %t3ppc64le | FileCheck --check-prefix=PPC64LE %s # RUN: llvm-readobj -file-headers %t3ppc64le | FileCheck --check-prefix=PPC64LE %s
# RUN: echo 'OUTPUT_FORMAT(elf64-powerpcle)' > %tppc64le.script
# RUN: ld.lld %tppc64le.script %tppc64le -o %t4ppc64le
# RUN: llvm-readobj -file-headers %t4ppc64le | FileCheck --check-prefix=PPC64LE %s
# PPC64LE: ElfHeader { # PPC64LE: ElfHeader {
# PPC64LE-NEXT: Ident { # PPC64LE-NEXT: Ident {
# PPC64LE-NEXT: Magic: (7F 45 4C 46) # PPC64LE-NEXT: Magic: (7F 45 4C 46)
# PPC64LE-NEXT: Class: 64-bit (0x2) # PPC64LE-NEXT: Class: 64-bit (0x2)
# PPC64LE-NEXT: DataEncoding: LittleEndian (0x1) # PPC64LE-NEXT: DataEncoding: LittleEndian (0x1)
# PPC64LE-NEXT: FileVersion: 1 # PPC64LE-NEXT: FileVersion: 1
# PPC64LE-NEXT: OS/ABI: SystemV (0x0) # PPC64LE-NEXT: OS/ABI: SystemV (0x0)
# PPC64LE-NEXT: ABIVersion: 0 # PPC64LE-NEXT: ABIVersion: 0
Show All 21 Lines