diff options
| -rw-r--r-- | lld/ELF/Writer.cpp | 11 | ||||
| -rw-r--r-- | lld/test/ELF/basic-mips.s | 2 | ||||
| -rw-r--r-- | lld/test/ELF/emulation.s | 4 | ||||
| -rw-r--r-- | lld/test/ELF/mips-elf-abi.s | 23 |
4 files changed, 37 insertions, 3 deletions
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index df03f8ae531..111a19d9bb5 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -2069,6 +2069,16 @@ static uint16_t getELFType() { return ET_EXEC; } +static uint8_t getAbiVersion() { + if (Config->EMachine == EM_MIPS) { + // Increment the ABI version for non-PIC executable files. + if (getELFType() == ET_EXEC && + (Config->EFlags & (EF_MIPS_PIC | EF_MIPS_CPIC)) == EF_MIPS_CPIC) + return 1; + } + return 0; +} + template <class ELFT> void Writer<ELFT>::writeHeader() { uint8_t *Buf = Buffer->getBufferStart(); memcpy(Buf, "\177ELF", 4); @@ -2079,6 +2089,7 @@ template <class ELFT> void Writer<ELFT>::writeHeader() { EHdr->e_ident[EI_DATA] = Config->IsLE ? ELFDATA2LSB : ELFDATA2MSB; EHdr->e_ident[EI_VERSION] = EV_CURRENT; EHdr->e_ident[EI_OSABI] = Config->OSABI; + EHdr->e_ident[EI_ABIVERSION] = getAbiVersion(); EHdr->e_type = getELFType(); EHdr->e_machine = Config->EMachine; EHdr->e_version = EV_CURRENT; diff --git a/lld/test/ELF/basic-mips.s b/lld/test/ELF/basic-mips.s index a193529b348..edc91b46a95 100644 --- a/lld/test/ELF/basic-mips.s +++ b/lld/test/ELF/basic-mips.s @@ -19,7 +19,7 @@ __start: # CHECK-NEXT: DataEncoding: LittleEndian (0x1) # CHECK-NEXT: FileVersion: 1 # CHECK-NEXT: OS/ABI: SystemV (0x0) -# CHECK-NEXT: ABIVersion: 0 +# CHECK-NEXT: ABIVersion: 1 # CHECK-NEXT: Unused: (00 00 00 00 00 00 00) # CHECK-NEXT: } # CHECK-NEXT: Type: Executable (0x2) diff --git a/lld/test/ELF/emulation.s b/lld/test/ELF/emulation.s index 05efd0b94cb..b3d04342ee9 100644 --- a/lld/test/ELF/emulation.s +++ b/lld/test/ELF/emulation.s @@ -230,7 +230,7 @@ # MIPS-NEXT: DataEncoding: BigEndian (0x2) # MIPS-NEXT: FileVersion: 1 # MIPS-NEXT: OS/ABI: SystemV (0x0) -# MIPS-NEXT: ABIVersion: 0 +# MIPS-NEXT: ABIVersion: 1 # MIPS-NEXT: Unused: (00 00 00 00 00 00 00) # MIPS-NEXT: } # MIPS-NEXT: Type: Executable (0x2) @@ -259,7 +259,7 @@ # MIPSEL-NEXT: DataEncoding: LittleEndian (0x1) # MIPSEL-NEXT: FileVersion: 1 # MIPSEL-NEXT: OS/ABI: SystemV (0x0) -# MIPSEL-NEXT: ABIVersion: 0 +# MIPSEL-NEXT: ABIVersion: 1 # MIPSEL-NEXT: Unused: (00 00 00 00 00 00 00) # MIPSEL-NEXT: } # MIPSEL-NEXT: Type: Executable (0x2) diff --git a/lld/test/ELF/mips-elf-abi.s b/lld/test/ELF/mips-elf-abi.s new file mode 100644 index 00000000000..8721b48ae66 --- /dev/null +++ b/lld/test/ELF/mips-elf-abi.s @@ -0,0 +1,23 @@ +# Check EI_ABIVERSION flags + +# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o +# RUN: ld.lld -shared -o %t.so %t.o +# RUN: llvm-readobj -h %t.so | FileCheck -check-prefix=DSO %s +# RUN: ld.lld -o %t.exe %t.o +# RUN: llvm-readobj -h %t.exe | FileCheck -check-prefix=EXE %s +# RUN: ld.lld -pie -o %t.pie %t.o +# RUN: llvm-readobj -h %t.pie | FileCheck -check-prefix=PIE %s +# RUN: ld.lld -r -o %t.rel %t.o +# RUN: llvm-readobj -h %t.rel | FileCheck -check-prefix=REL %s + +# REQUIRES: mips + +# DSO: ABIVersion: 0 +# EXE: ABIVersion: 1 +# PIE: ABIVersion: 0 +# REL: ABIVersion: 0 + + .global __start + .text +__start: + nop |
