RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 03:02:36 +01:00
Code Issues Projects Releases Wiki Activity

[llvm-objcopy] - Do not drop the OS/ABI and ABIVersion fields of ELF header

Browse Source 
This is https://bugs.llvm.org/show_bug.cgi?id=40005,

Patch teaches llvm-objcopy to preserve OS/ABI and ABIVersion fields of ELF header.
(Currently, it drops them to zero).

Differential revision: https://reviews.llvm.org/D55886

llvm-svn: 349738
This commit is contained in:
George Rimar 2018-12-20 10:51:42 +00:00
parent c6cce39124
commit 284bbb15a7
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/tools/llvm-objcopy/ELF/copy-osabi.test Normal file
View File

@ -0,0 +1,16 @@
# RUN: yaml2obj %s > %t
# RUN: llvm-objcopy %t %t2
# RUN: llvm-readobj -file-headers %t2 | FileCheck %s
## Check that llvm-objcopy preserves the OSABI and ABIVersion fields.
# CHECK: OS/ABI: FreeBSD (0x9)
# CHECK: ABIVersion: 1
!ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
OSABI: ELFOSABI_FREEBSD
ABIVersion: 1
Type: ET_REL
Machine: EM_AARCH64

8
tools/llvm-objcopy/ELF/Object.cpp
View File

@ -703,6 +703,8 @@ static bool compareSegmentsByPAddr(const Segment *A, const Segment *B) {
template <class ELFT> void BinaryELFBuilder<ELFT>::initFileHeader() {
Obj->Flags = 0x0;
Obj->Type = ET_REL;
Obj->OSABI = 0;
Obj->ABIVersion = 0;
Obj->Entry = 0x0;
Obj->Machine = EMachine;
Obj->Version = 1;
@ -1086,6 +1088,8 @@ template <class ELFT> void ELFBuilder<ELFT>::readSectionHeaders() {
template <class ELFT> void ELFBuilder<ELFT>::build() {
const auto &Ehdr = *ElfFile.getHeader();
Obj.OSABI = Ehdr.e_ident[EI_OSABI];
Obj.ABIVersion = Ehdr.e_ident[EI_ABIVERSION];
Obj.Type = Ehdr.e_type;
Obj.Machine = Ehdr.e_machine;
Obj.Version = Ehdr.e_version;
@ -1162,8 +1166,8 @@ template <class ELFT> void ELFWriter<ELFT>::writeEhdr() {
Ehdr.e_ident[EI_DATA] =
ELFT::TargetEndianness == support::big ? ELFDATA2MSB : ELFDATA2LSB;
Ehdr.e_ident[EI_VERSION] = EV_CURRENT;
Ehdr.e_ident[EI_OSABI] = ELFOSABI_NONE;
Ehdr.e_ident[EI_ABIVERSION] = 0;
Ehdr.e_ident[EI_OSABI] = Obj.OSABI;
Ehdr.e_ident[EI_ABIVERSION] = Obj.ABIVersion;
Ehdr.e_type = Obj.Type;
Ehdr.e_machine = Obj.Machine;

2
tools/llvm-objcopy/ELF/Object.h
View File

@ -733,6 +733,8 @@ public:
Segment ElfHdrSegment;
Segment ProgramHdrSegment;
uint8_t OSABI;
uint8_t ABIVersion;
uint64_t Entry;
uint64_t SHOffset;
uint32_t Type;