This is an archive of the discontinued LLVM Phabricator instance.

Differential D53539

[ELF] Handle elf32-littlearm in OUTPUT_FORMAT
ClosedPublic

Authored by smeenai on Oct 22 2018, 4:46 PM.

Details

Reviewers
grimar
ruiu
• espindola
Commits
rGc8e9d2b5254a: [ELF] Handle elf32-littlearm in OUTPUT_FORMAT
rL344976: [ELF] Handle elf32-littlearm in OUTPUT_FORMAT
rLLD344976: [ELF] Handle elf32-littlearm in OUTPUT_FORMAT
Summary

We need this to support 32-bit ARM. Add test cases for emulation
handling for this architecture as well.

Diff Detail

Repository
rLLD LLVM Linker

Event Timeline

smeenai created this revision.Oct 22 2018, 4:46 PM
Herald added a reviewer: • espindola. · View Herald TranscriptOct 22 2018, 4:46 PM
Herald added subscribers: chrib, kristof.beyls, arichardson and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B24034: Diff 170525.Oct 22 2018, 4:46 PM
ruiu accepted this revision.Oct 22 2018, 4:48 PM

LGTM

This revision is now accepted and ready to land.Oct 22 2018, 4:48 PM
Closed by commit rLLD344976: [ELF] Handle elf32-littlearm in OUTPUT_FORMAT (authored by smeenai). · Explain WhyOct 22 2018, 4:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
ELF/
2 lines
test/
ELF/
31 lines

Diff 170527

ELF/ScriptParser.cpp

Show First 20 Lines • Show All 383 Lines • ▼ Show 20 Lines
} }
std::pair<ELFKind, uint16_t> ScriptParser::readBfdName() { std::pair<ELFKind, uint16_t> ScriptParser::readBfdName() {
StringRef S = next(); StringRef S = next();
if (S == "elf32-i386") if (S == "elf32-i386")
return {ELF32LEKind, EM_386}; return {ELF32LEKind, EM_386};
if (S == "elf32-iamcu") if (S == "elf32-iamcu")
return {ELF32LEKind, EM_IAMCU}; return {ELF32LEKind, EM_IAMCU};
if (S == "elf32-littlearm")
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-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);
▲ Show 20 Lines • Show All 1,131 Lines • Show Last 20 Lines

test/ELF/emulation.s

# REQUIRES: x86,ppc,mips,aarch64 # REQUIRES: x86,ppc,mips,aarch64,arm
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %tx64 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-freebsd %s -o %tx64
# RUN: ld.lld -m elf_amd64_fbsd %tx64 -o %t2x64 # RUN: ld.lld -m elf_amd64_fbsd %tx64 -o %t2x64
# RUN: llvm-readobj -file-headers %t2x64 | FileCheck --check-prefix=AMD64 %s # RUN: llvm-readobj -file-headers %t2x64 | FileCheck --check-prefix=AMD64 %s
# RUN: ld.lld %tx64 -o %t3x64 # RUN: ld.lld %tx64 -o %t3x64
# RUN: llvm-readobj -file-headers %t3x64 | FileCheck --check-prefix=AMD64 %s # RUN: llvm-readobj -file-headers %t3x64 | FileCheck --check-prefix=AMD64 %s
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.sysv # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.sysv
# RUN: ld.lld -m elf_amd64_fbsd %t.sysv -o %t.freebsd # RUN: ld.lld -m elf_amd64_fbsd %t.sysv -o %t.freebsd
# RUN: llvm-readobj -file-headers %t.freebsd | FileCheck --check-prefix=AMD64 %s # RUN: llvm-readobj -file-headers %t.freebsd | FileCheck --check-prefix=AMD64 %s
▲ Show 20 Lines • Show All 393 Lines • ▼ Show 20 Lines
# AARCH64-NEXT: Machine: EM_AARCH64 (0xB7) # AARCH64-NEXT: Machine: EM_AARCH64 (0xB7)
# AARCH64-NEXT: Version: 1 # AARCH64-NEXT: Version: 1
# AARCH64-NEXT: Entry: # AARCH64-NEXT: Entry:
# AARCH64-NEXT: ProgramHeaderOffset: 0x40 # AARCH64-NEXT: ProgramHeaderOffset: 0x40
# AARCH64-NEXT: SectionHeaderOffset: # AARCH64-NEXT: SectionHeaderOffset:
# AARCH64-NEXT: Flags [ (0x0) # AARCH64-NEXT: Flags [ (0x0)
# AARCH64-NEXT: ] # AARCH64-NEXT: ]
# RUN: llvm-mc -filetype=obj -triple=armv7-unknown-linux %s -o %tarm
# RUN: ld.lld -m armelf %tarm -o %t2arm
# RUN: llvm-readobj -file-headers %t2arm | FileCheck --check-prefix=ARM %s
# RUN: ld.lld -m armelf_linux_eabi %tarm -o %t3arm
# RUN: llvm-readobj -file-headers %t3arm | FileCheck --check-prefix=ARM %s
# RUN: ld.lld %tarm -o %t4arm
# RUN: llvm-readobj -file-headers %t4arm | FileCheck --check-prefix=ARM %s
# RUN: echo 'OUTPUT_FORMAT(elf32-littlearm)' > %t5arm.script
# RUN: ld.lld %t5arm.script %tarm -o %t5arm
# RUN: llvm-readobj -file-headers %t5arm | FileCheck --check-prefix=ARM %s
# ARM: ElfHeader {
# ARM-NEXT: Ident {
# ARM-NEXT: Magic: (7F 45 4C 46)
# ARM-NEXT: Class: 32 (0x1)
# ARM-NEXT: DataEncoding: LittleEndian (0x1)
# ARM-NEXT: FileVersion: 1
# ARM-NEXT: OS/ABI: SystemV (0x0)
# ARM-NEXT: ABIVersion: 0
# ARM-NEXT: Unused: (00 00 00 00 00 00 00)
# ARM-NEXT: }
# ARM-NEXT: Type: Executable (0x2)
# ARM-NEXT: Machine: EM_ARM (0xB7)
# ARM-NEXT: Version: 1
# ARM-NEXT: Entry:
# ARM-NEXT: ProgramHeaderOffset: 0x40
# ARM-NEXT: SectionHeaderOffset:
# ARM-NEXT: Flags [ (0x0)
# ARM-NEXT: ]
.globl _start .globl _start
_start: _start: