[lld] r362922 - [ELF][RISCV] Parse BFD names elf{32,64}-littleriscv
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 10 01:09:55 PDT 2019
Author: maskray
Date: Mon Jun 10 01:09:55 2019
New Revision: 362922
URL: http://llvm.org/viewvc/llvm-project?rev=362922&view=rev
Log:
[ELF][RISCV] Parse BFD names elf{32,64}-littleriscv
e.g. glibc libc.so on riscv64 uses `OUTPUT_FORMAT(elf64-littleriscv)`.
Reviewed By: ruiu
Differential Revision: https://reviews.llvm.org/D63070
Added:
lld/trunk/test/ELF/emulation-riscv.s
Modified:
lld/trunk/ELF/ScriptParser.cpp
Modified: lld/trunk/ELF/ScriptParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/ScriptParser.cpp?rev=362922&r1=362921&r2=362922&view=diff
==============================================================================
--- lld/trunk/ELF/ScriptParser.cpp (original)
+++ lld/trunk/ELF/ScriptParser.cpp Mon Jun 10 01:09:55 2019
@@ -401,6 +401,8 @@ static std::pair<ELFKind, uint16_t> pars
.Case("elf32-ntradlittlemips", {ELF32LEKind, EM_MIPS})
.Case("elf64-tradbigmips", {ELF64BEKind, EM_MIPS})
.Case("elf64-tradlittlemips", {ELF64LEKind, EM_MIPS})
+ .Case("elf32-littleriscv", {ELF32LEKind, EM_RISCV})
+ .Case("elf64-littleriscv", {ELF64LEKind, EM_RISCV})
.Default({ELFNoneKind, EM_NONE});
}
Added: lld/trunk/test/ELF/emulation-riscv.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/emulation-riscv.s?rev=362922&view=auto
==============================================================================
--- lld/trunk/test/ELF/emulation-riscv.s (added)
+++ lld/trunk/test/ELF/emulation-riscv.s Mon Jun 10 01:09:55 2019
@@ -0,0 +1,74 @@
+# REQUIRES: riscv
+
+# RUN: llvm-mc -filetype=obj -triple=riscv32 %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV32 %s
+# RUN: ld.lld -m elf32lriscv %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV32 %s
+# RUN: echo 'OUTPUT_FORMAT(elf32-littleriscv)' > %t.script
+# RUN: ld.lld %t.script %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV32 %s
+
+# RV32: ElfHeader {
+# RV32-NEXT: Ident {
+# RV32-NEXT: Magic: (7F 45 4C 46)
+# RV32-NEXT: Class: 32-bit (0x1)
+# RV32-NEXT: DataEncoding: LittleEndian (0x1)
+# RV32-NEXT: FileVersion: 1
+# RV32-NEXT: OS/ABI: SystemV (0x0)
+# RV32-NEXT: ABIVersion: 0
+# RV32-NEXT: Unused: (00 00 00 00 00 00 00)
+# RV32-NEXT: }
+# RV32-NEXT: Type: Executable (0x2)
+# RV32-NEXT: Machine: EM_RISCV (0xF3)
+# RV32-NEXT: Version: 1
+# RV32-NEXT: Entry:
+# RV32-NEXT: ProgramHeaderOffset: 0x34
+# RV32-NEXT: SectionHeaderOffset:
+# RV32-NEXT: Flags [ (0x0)
+# RV32-NEXT: ]
+# RV32-NEXT: HeaderSize: 52
+# RV32-NEXT: ProgramHeaderEntrySize: 32
+# RV32-NEXT: ProgramHeaderCount:
+# RV32-NEXT: SectionHeaderEntrySize: 40
+# RV32-NEXT: SectionHeaderCount:
+# RV32-NEXT: StringTableSectionIndex:
+# RV32-NEXT: }
+
+# RUN: llvm-mc -filetype=obj -triple=riscv64 %s -o %t.o
+# RUN: ld.lld %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV64 %s
+# RUN: ld.lld -m elf64lriscv %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV64 %s
+# RUN: echo 'OUTPUT_FORMAT(elf64-littleriscv)' > %t.script
+# RUN: ld.lld %t.script %t.o -o %t
+# RUN: llvm-readobj --file-headers %t | FileCheck --check-prefix=RV64 %s
+
+# RV64: ElfHeader {
+# RV64-NEXT: Ident {
+# RV64-NEXT: Magic: (7F 45 4C 46)
+# RV64-NEXT: Class: 64-bit (0x2)
+# RV64-NEXT: DataEncoding: LittleEndian (0x1)
+# RV64-NEXT: FileVersion: 1
+# RV64-NEXT: OS/ABI: SystemV (0x0)
+# RV64-NEXT: ABIVersion: 0
+# RV64-NEXT: Unused: (00 00 00 00 00 00 00)
+# RV64-NEXT: }
+# RV64-NEXT: Type: Executable (0x2)
+# RV64-NEXT: Machine: EM_RISCV (0xF3)
+# RV64-NEXT: Version: 1
+# RV64-NEXT: Entry:
+# RV64-NEXT: ProgramHeaderOffset: 0x40
+# RV64-NEXT: SectionHeaderOffset:
+# RV64-NEXT: Flags [ (0x0)
+# RV64-NEXT: ]
+# RV64-NEXT: HeaderSize: 64
+# RV64-NEXT: ProgramHeaderEntrySize: 56
+# RV64-NEXT: ProgramHeaderCount:
+# RV64-NEXT: SectionHeaderEntrySize: 64
+# RV64-NEXT: SectionHeaderCount:
+# RV64-NEXT: StringTableSectionIndex:
+# RV64-NEXT: }
+
+.globl _start
+_start:
More information about the llvm-commits
mailing list