From 92c6141ce6a954aa866bba8e53850e7dd9d9abb6 Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Mon, 14 Dec 2020 09:38:12 -0800 Subject: [PATCH] lld/ELF: Parse MSP430 BFD/emulation names Follow the naming set by TI's own GCC-based toolchain. Also, force the `osabi` field to `ELFOSABI_STANDALONE`, this matches GNU LD's output (the patching is done in `elf32_msp430_post_process_headers`). Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D92931 --- lld/ELF/Driver.cpp | 3 +++ lld/ELF/ScriptParser.cpp | 3 +++ lld/test/ELF/emulation-msp430.s | 26 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 lld/test/ELF/emulation-msp430.s diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 0a399db..d7a6cd1 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -161,10 +161,13 @@ static std::tuple parseEmulation(StringRef emul) { .Case("elf_i386", {ELF32LEKind, EM_386}) .Case("elf_iamcu", {ELF32LEKind, EM_IAMCU}) .Case("elf64_sparc", {ELF64BEKind, EM_SPARCV9}) + .Case("msp430elf", {ELF32LEKind, EM_MSP430}) .Default({ELFNoneKind, EM_NONE}); if (ret.first == ELFNoneKind) error("unknown emulation: " + emul); + if (ret.second == EM_MSP430) + osabi = ELFOSABI_STANDALONE; return std::make_tuple(ret.first, ret.second, osabi); } diff --git a/lld/ELF/ScriptParser.cpp b/lld/ELF/ScriptParser.cpp index c68d7f4..82b98e5 100644 --- a/lld/ELF/ScriptParser.cpp +++ b/lld/ELF/ScriptParser.cpp @@ -425,6 +425,7 @@ static std::pair parseBfdName(StringRef s) { .Case("elf32-littleriscv", {ELF32LEKind, EM_RISCV}) .Case("elf64-littleriscv", {ELF64LEKind, EM_RISCV}) .Case("elf64-sparc", {ELF64BEKind, EM_SPARCV9}) + .Case("elf32-msp430", {ELF32LEKind, EM_MSP430}) .Default({ELFNoneKind, EM_NONE}); } @@ -443,6 +444,8 @@ void ScriptParser::readOutputFormat() { setError("unknown output format name: " + config->bfdname); if (s == "elf32-ntradlittlemips" || s == "elf32-ntradbigmips") config->mipsN32Abi = true; + if (config->emachine == EM_MSP430) + config->osabi = ELFOSABI_STANDALONE; if (consume(")")) return; diff --git a/lld/test/ELF/emulation-msp430.s b/lld/test/ELF/emulation-msp430.s new file mode 100644 index 0000000..c747889 --- /dev/null +++ b/lld/test/ELF/emulation-msp430.s @@ -0,0 +1,26 @@ +# REQUIRES: msp430 +# RUN: llvm-mc -filetype=obj -triple=msp430 %s -o %t.o +# RUN: ld.lld %t.o -o %t1 +# RUN: llvm-readobj --file-headers %t1 | FileCheck %s +# RUN: ld.lld -m msp430elf %t.o -o %t2 +# RUN: cmp %t1 %t2 +# RUN: echo 'OUTPUT_FORMAT(elf32-msp430)' > %t.lds +# RUN: ld.lld -T %t.lds %t.o -o %t3 +# RUN: llvm-readobj --file-headers %t3 | FileCheck %s + +# CHECK: ElfHeader { +# CHECK-NEXT: Ident { +# CHECK-NEXT: Magic: (7F 45 4C 46) +# CHECK-NEXT: Class: 32-bit (0x1) +# CHECK-NEXT: DataEncoding: LittleEndian (0x1) +# CHECK-NEXT: FileVersion: 1 +# CHECK-NEXT: OS/ABI: Standalone (0xFF) +# 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_MSP430 (0x69) +# CHECK-NEXT: Version: 1 + +.globl _start +_start: -- 2.7.4