This is an archive of the discontinued LLVM Phabricator instance.

Differential D71764

[yaml2obj] - Add support for ELFOSABI_LINUX.
ClosedPublic

Authored by grimar on Dec 20 2019, 6:40 AM.

Details

Reviewers
jhenderson
MaskRay
• espindola
Commits
rG1f985775566d: [yaml2obj] - Add support for ELFOSABI_LINUX.
Summary

ELFOSABI_LINUX is an alias for ELFOSABI_GNU.
It is not that obvious probably.

Depends on https://reviews.llvm.org/D71763

Diff Detail

Event Timeline

grimar created this revision.Dec 20 2019, 6:40 AM
Herald added a reviewer: • espindola. · View Herald TranscriptDec 20 2019, 6:40 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: hiraditya, fedor.sergeev, emaste. · View Herald Transcript
grimar added a parent revision: D71763: [yaml2obj] - Add testing for OSABI field..Dec 20 2019, 6:41 AM
grimar added a child revision: D71765: [yaml2obj] - Allow using an arbitrary value for OSABI..
jhenderson accepted this revision.Dec 20 2019, 6:54 AM

LGTM, but see also my comment in D71763.

This revision is now accepted and ready to land.Dec 20 2019, 6:54 AM
MaskRay accepted this revision.Dec 20 2019, 9:06 AM
Closed by commit rG1f985775566d: [yaml2obj] - Add support for ELFOSABI_LINUX. (authored by grimar). · Explain WhyDec 23 2019, 2:29 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
ObjectYAML/
1 line
test/
tools/
yaml2obj/
ELF/
52 lines

Diff 234884

llvm/lib/ObjectYAML/ELFYAML.cpp

Show First 20 Lines • Show All 247 Lines • ▼ Show 20 Lines
void ScalarEnumerationTraits<ELFYAML::ELF_ELFOSABI>::enumeration( void ScalarEnumerationTraits<ELFYAML::ELF_ELFOSABI>::enumeration(
IO &IO, ELFYAML::ELF_ELFOSABI &Value) { IO &IO, ELFYAML::ELF_ELFOSABI &Value) {
#define ECase(X) IO.enumCase(Value, #X, ELF::X) #define ECase(X) IO.enumCase(Value, #X, ELF::X)
ECase(ELFOSABI_NONE); ECase(ELFOSABI_NONE);
ECase(ELFOSABI_HPUX); ECase(ELFOSABI_HPUX);
ECase(ELFOSABI_NETBSD); ECase(ELFOSABI_NETBSD);
ECase(ELFOSABI_GNU); ECase(ELFOSABI_GNU);
ECase(ELFOSABI_LINUX);
ECase(ELFOSABI_HURD); ECase(ELFOSABI_HURD);
ECase(ELFOSABI_SOLARIS); ECase(ELFOSABI_SOLARIS);
ECase(ELFOSABI_AIX); ECase(ELFOSABI_AIX);
ECase(ELFOSABI_IRIX); ECase(ELFOSABI_IRIX);
ECase(ELFOSABI_FREEBSD); ECase(ELFOSABI_FREEBSD);
ECase(ELFOSABI_TRU64); ECase(ELFOSABI_TRU64);
ECase(ELFOSABI_MODESTO); ECase(ELFOSABI_MODESTO);
ECase(ELFOSABI_OPENBSD); ECase(ELFOSABI_OPENBSD);
▲ Show 20 Lines • Show All 1,324 Lines • Show Last 20 Lines

llvm/test/tools/yaml2obj/ELF/header-osabi.yaml

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_NETBSD OSABI: ELFOSABI_NETBSD
## Test ELFOSABI_GNU and ELFOSABI_LINUX (historical alias for ELFOSABI_GNU).
# RUN: yaml2obj %s --docnum=5 -o %t.gnu # RUN: yaml2obj %s --docnum=5 -o %t.gnu
# RUN: llvm-readobj --file-headers %t.gnu | FileCheck %s --check-prefix=OSABI-GNU # RUN: llvm-readobj --file-headers %t.gnu | FileCheck %s --check-prefix=OSABI-GNU
# RUN: yaml2obj %s --docnum=6 -o %t.gnu.alias
# RUN: llvm-readobj --file-headers %t.gnu.alias | FileCheck %s --check-prefix=OSABI-GNU
# OSABI-GNU: OS/ABI: GNU/Linux (0x3) # OSABI-GNU: OS/ABI: GNU/Linux (0x3)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_GNU OSABI: ELFOSABI_GNU
# RUN: yaml2obj %s --docnum=6 -o %t.hurd --- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_REL
Machine: EM_X86_64
OSABI: ELFOSABI_LINUX
# RUN: yaml2obj %s --docnum=7 -o %t.hurd
# RUN: llvm-readobj --file-headers %t.hurd | FileCheck %s --check-prefix=OSABI-HURD # RUN: llvm-readobj --file-headers %t.hurd | FileCheck %s --check-prefix=OSABI-HURD
# OSABI-HURD: OS/ABI: GNU/Hurd (0x4) # OSABI-HURD: OS/ABI: GNU/Hurd (0x4)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_HURD OSABI: ELFOSABI_HURD
# RUN: yaml2obj %s --docnum=7 -o %t.solaris # RUN: yaml2obj %s --docnum=8 -o %t.solaris
# RUN: llvm-readobj --file-headers %t.solaris | FileCheck %s --check-prefix=OSABI-SOLARIS # RUN: llvm-readobj --file-headers %t.solaris | FileCheck %s --check-prefix=OSABI-SOLARIS
# OSABI-SOLARIS: OS/ABI: Solaris (0x6) # OSABI-SOLARIS: OS/ABI: Solaris (0x6)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_SOLARIS OSABI: ELFOSABI_SOLARIS
# RUN: yaml2obj %s --docnum=8 -o %t.aix # RUN: yaml2obj %s --docnum=9 -o %t.aix
# RUN: llvm-readobj --file-headers %t.aix | FileCheck %s --check-prefix=OSABI-AIX # RUN: llvm-readobj --file-headers %t.aix | FileCheck %s --check-prefix=OSABI-AIX
# OSABI-AIX: OS/ABI: AIX (0x7) # OSABI-AIX: OS/ABI: AIX (0x7)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_AIX OSABI: ELFOSABI_AIX
# RUN: yaml2obj %s --docnum=9 -o %t.irix # RUN: yaml2obj %s --docnum=10 -o %t.irix
# RUN: llvm-readobj --file-headers %t.irix | FileCheck %s --check-prefix=OSABI-IRIX # RUN: llvm-readobj --file-headers %t.irix | FileCheck %s --check-prefix=OSABI-IRIX
# OSABI-IRIX: OS/ABI: IRIX (0x8) # OSABI-IRIX: OS/ABI: IRIX (0x8)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_IRIX OSABI: ELFOSABI_IRIX
# RUN: yaml2obj %s --docnum=10 -o %t.freebsd # RUN: yaml2obj %s --docnum=11 -o %t.freebsd
# RUN: llvm-readobj --file-headers %t.freebsd | FileCheck %s --check-prefix=OSABI-FREEBSD # RUN: llvm-readobj --file-headers %t.freebsd | FileCheck %s --check-prefix=OSABI-FREEBSD
# OSABI-FREEBSD: OS/ABI: FreeBSD (0x9) # OSABI-FREEBSD: OS/ABI: FreeBSD (0x9)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_FREEBSD OSABI: ELFOSABI_FREEBSD
# RUN: yaml2obj %s --docnum=11 -o %t.tru64 # RUN: yaml2obj %s --docnum=12 -o %t.tru64
# RUN: llvm-readobj --file-headers %t.tru64 | FileCheck %s --check-prefix=OSABI-TRU64 # RUN: llvm-readobj --file-headers %t.tru64 | FileCheck %s --check-prefix=OSABI-TRU64
# OSABI-TRU64: OS/ABI: TRU64 (0xA) # OSABI-TRU64: OS/ABI: TRU64 (0xA)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_TRU64 OSABI: ELFOSABI_TRU64
# RUN: yaml2obj %s --docnum=12 -o %t.modesto # RUN: yaml2obj %s --docnum=13 -o %t.modesto
# RUN: llvm-readobj --file-headers %t.modesto | FileCheck %s --check-prefix=OSABI-MODESTO # RUN: llvm-readobj --file-headers %t.modesto | FileCheck %s --check-prefix=OSABI-MODESTO
# OSABI-MODESTO: OS/ABI: Modesto (0xB) # OSABI-MODESTO: OS/ABI: Modesto (0xB)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_MODESTO OSABI: ELFOSABI_MODESTO
# RUN: yaml2obj %s --docnum=13 -o %t.openbsd # RUN: yaml2obj %s --docnum=14 -o %t.openbsd
# RUN: llvm-readobj --file-headers %t.openbsd | FileCheck %s --check-prefix=OSABI-OPENBSD # RUN: llvm-readobj --file-headers %t.openbsd | FileCheck %s --check-prefix=OSABI-OPENBSD
# OSABI-OPENBSD: OS/ABI: OpenBSD (0xC) # OSABI-OPENBSD: OS/ABI: OpenBSD (0xC)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_OPENBSD OSABI: ELFOSABI_OPENBSD
# RUN: yaml2obj %s --docnum=14 -o %t.openvms # RUN: yaml2obj %s --docnum=15 -o %t.openvms
# RUN: llvm-readobj --file-headers %t.openvms | FileCheck %s --check-prefix=OSABI-OPENVMS # RUN: llvm-readobj --file-headers %t.openvms | FileCheck %s --check-prefix=OSABI-OPENVMS
# OSABI-OPENVMS: OS/ABI: OpenVMS (0xD) # OSABI-OPENVMS: OS/ABI: OpenVMS (0xD)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_OPENVMS OSABI: ELFOSABI_OPENVMS
# RUN: yaml2obj %s --docnum=15 -o %t.nsk # RUN: yaml2obj %s --docnum=16 -o %t.nsk
# RUN: llvm-readobj --file-headers %t.nsk | FileCheck %s --check-prefix=OSABI-NSK # RUN: llvm-readobj --file-headers %t.nsk | FileCheck %s --check-prefix=OSABI-NSK
# OSABI-NSK: OS/ABI: NSK (0xE) # OSABI-NSK: OS/ABI: NSK (0xE)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_NSK OSABI: ELFOSABI_NSK
# RUN: yaml2obj %s --docnum=16 -o %t.aros # RUN: yaml2obj %s --docnum=17 -o %t.aros
# RUN: llvm-readobj --file-headers %t.aros | FileCheck %s --check-prefix=OSABI-AROS # RUN: llvm-readobj --file-headers %t.aros | FileCheck %s --check-prefix=OSABI-AROS
# OSABI-AROS: OS/ABI: AROS (0xF) # OSABI-AROS: OS/ABI: AROS (0xF)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_AROS OSABI: ELFOSABI_AROS
# RUN: yaml2obj %s --docnum=17 -o %t.fenixos # RUN: yaml2obj %s --docnum=18 -o %t.fenixos
# RUN: llvm-readobj --file-headers %t.fenixos | FileCheck %s --check-prefix=OSABI-FENIXOS # RUN: llvm-readobj --file-headers %t.fenixos | FileCheck %s --check-prefix=OSABI-FENIXOS
# OSABI-FENIXOS: OS/ABI: FenixOS (0x10) # OSABI-FENIXOS: OS/ABI: FenixOS (0x10)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_FENIXOS OSABI: ELFOSABI_FENIXOS
# RUN: yaml2obj %s --docnum=18 -o %t.cloudabi # RUN: yaml2obj %s --docnum=19 -o %t.cloudabi
# RUN: llvm-readobj --file-headers %t.cloudabi | FileCheck %s --check-prefix=OSABI-CLOUDABI # RUN: llvm-readobj --file-headers %t.cloudabi | FileCheck %s --check-prefix=OSABI-CLOUDABI
# OSABI-CLOUDABI: OS/ABI: CloudABI (0x11) # OSABI-CLOUDABI: OS/ABI: CloudABI (0x11)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_CLOUDABI OSABI: ELFOSABI_CLOUDABI
# RUN: yaml2obj %s --docnum=19 -o %t.amdhsa # RUN: yaml2obj %s --docnum=20 -o %t.amdhsa
# RUN: llvm-readobj --file-headers %t.amdhsa | FileCheck %s --check-prefix=OSABI-ARCHSPEC40 # RUN: llvm-readobj --file-headers %t.amdhsa | FileCheck %s --check-prefix=OSABI-ARCHSPEC40
# RUN: yaml2obj %s --docnum=20 -o %t.c6000 # RUN: yaml2obj %s --docnum=21 -o %t.c6000
# RUN: llvm-readobj --file-headers %t.c6000 | FileCheck %s --check-prefix=OSABI-ARCHSPEC40 # RUN: llvm-readobj --file-headers %t.c6000 | FileCheck %s --check-prefix=OSABI-ARCHSPEC40
# OSABI-ARCHSPEC40: OS/ABI: 0x40 # OSABI-ARCHSPEC40: OS/ABI: 0x40
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_AMDGPU_HSA OSABI: ELFOSABI_AMDGPU_HSA
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_C6000_ELFABI OSABI: ELFOSABI_C6000_ELFABI
# RUN: yaml2obj %s --docnum=21 -o %t.amdpal # RUN: yaml2obj %s --docnum=22 -o %t.amdpal
# RUN: llvm-readobj --file-headers %t.amdpal | FileCheck %s --check-prefix=OSABI-ARCHSPEC41 # RUN: llvm-readobj --file-headers %t.amdpal | FileCheck %s --check-prefix=OSABI-ARCHSPEC41
# RUN: yaml2obj %s --docnum=22 -o %t.c6000linux # RUN: yaml2obj %s --docnum=23 -o %t.c6000linux
# RUN: llvm-readobj --file-headers %t.c6000linux | FileCheck %s --check-prefix=OSABI-ARCHSPEC41 # RUN: llvm-readobj --file-headers %t.c6000linux | FileCheck %s --check-prefix=OSABI-ARCHSPEC41
# OSABI-ARCHSPEC41: OS/ABI: 0x41 # OSABI-ARCHSPEC41: OS/ABI: 0x41
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_AMDGPU_PAL OSABI: ELFOSABI_AMDGPU_PAL
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_C6000_LINUX OSABI: ELFOSABI_C6000_LINUX
# RUN: yaml2obj %s --docnum=23 -o %t.amdmesa # RUN: yaml2obj %s --docnum=24 -o %t.amdmesa
# RUN: llvm-readobj --file-headers %t.amdmesa | FileCheck %s --check-prefix=OSABI-AMD-MESA3D # RUN: llvm-readobj --file-headers %t.amdmesa | FileCheck %s --check-prefix=OSABI-AMD-MESA3D
# OSABI-AMD-MESA3D: OS/ABI: 0x42 # OSABI-AMD-MESA3D: OS/ABI: 0x42
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_AMDGPU_MESA3D OSABI: ELFOSABI_AMDGPU_MESA3D
# RUN: yaml2obj %s --docnum=24 -o %t.arm # RUN: yaml2obj %s --docnum=25 -o %t.arm
# RUN: llvm-readobj --file-headers %t.arm | FileCheck %s --check-prefix=OSABI-ARM # RUN: llvm-readobj --file-headers %t.arm | FileCheck %s --check-prefix=OSABI-ARM
# OSABI-ARM: OS/ABI: 0x61 # OSABI-ARM: OS/ABI: 0x61
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_ARM OSABI: ELFOSABI_ARM
# RUN: yaml2obj %s --docnum=25 -o %t.standalone # RUN: yaml2obj %s --docnum=26 -o %t.standalone
# RUN: llvm-readobj --file-headers %t.standalone | FileCheck %s --check-prefix=OSABI-STANDALONE # RUN: llvm-readobj --file-headers %t.standalone | FileCheck %s --check-prefix=OSABI-STANDALONE
# OSABI-STANDALONE: OS/ABI: Standalone (0xFF) # OSABI-STANDALONE: OS/ABI: Standalone (0xFF)
--- !ELF --- !ELF
FileHeader: FileHeader:
Class: ELFCLASS64 Class: ELFCLASS64
Data: ELFDATA2LSB Data: ELFDATA2LSB
Type: ET_REL Type: ET_REL
Machine: EM_X86_64 Machine: EM_X86_64
OSABI: ELFOSABI_STANDALONE OSABI: ELFOSABI_STANDALONE