Skip to content

Commit 6b36b18

Browse files
committed
Auto merge of #2897 - paandahl:add-elf-constants, r=JohnTitor
Added missing constants from elf.h I have added a bunch of constants from elf.h, useful for parsing ELF files. Closes #1876
2 parents aec8514 + 1d11c02 commit 6b36b18

File tree

4 files changed

+317
-20
lines changed

4 files changed

+317
-20
lines changed

libc-test/semver/linux-gnu.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ DEBUGFS_MAGIC
5555
DEVPTS_SUPER_MAGIC
5656
ECRYPTFS_SUPER_MAGIC
5757
EFS_SUPER_MAGIC
58+
ELFOSABI_ARM_AEABI
5859
EMPTY
5960
EXT2_SUPER_MAGIC
6061
EXT3_SUPER_MAGIC

libc-test/semver/linux.txt

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,13 +364,51 @@ EFD_NONBLOCK
364364
EFD_SEMAPHORE
365365
EHWPOISON
366366
EISNAM
367+
EI_ABIVERSION
368+
EI_CLASS
369+
EI_DATA
370+
EI_MAG0
371+
EI_MAG1
372+
EI_MAG2
373+
EI_MAG3
374+
EI_NIDENT
375+
EI_OSABI
376+
EI_PAD
377+
EI_VERSION
367378
EKEYEXPIRED
368379
EKEYREJECTED
369380
EKEYREVOKED
370381
EL2HLT
371382
EL2NSYNC
372383
EL3HLT
373384
EL3RST
385+
ELFCLASS32
386+
ELFCLASS64
387+
ELFCLASSNONE
388+
ELFCLASSNUM
389+
ELFDATA2LSB
390+
ELFDATA2MSB
391+
ELFDATANONE
392+
ELFDATANUM
393+
ELFMAG0
394+
ELFMAG1
395+
ELFMAG2
396+
ELFMAG3
397+
ELFOSABI_AIX
398+
ELFOSABI_ARM
399+
ELFOSABI_FREEBSD
400+
ELFOSABI_GNU
401+
ELFOSABI_HPUX
402+
ELFOSABI_IRIX
403+
ELFOSABI_LINUX
404+
ELFOSABI_MODESTO
405+
ELFOSABI_NETBSD
406+
ELFOSABI_NONE
407+
ELFOSABI_OPENBSD
408+
ELFOSABI_SOLARIS
409+
ELFOSABI_STANDALONE
410+
ELFOSABI_SYSV
411+
ELFOSABI_TRU64
374412
ELIBACC
375413
ELIBBAD
376414
ELIBEXEC
@@ -379,6 +417,84 @@ ELIBSCN
379417
ELNRNG
380418
EMEDIUMTYPE
381419
EMULTIHOP
420+
EM_386
421+
EM_68HC05
422+
EM_68HC08
423+
EM_68HC11
424+
EM_68HC12
425+
EM_68HC16
426+
EM_68K
427+
EM_860
428+
EM_88K
429+
EM_960
430+
EM_AARCH64
431+
EM_ALPHA
432+
EM_ARC
433+
EM_ARC_A5
434+
EM_ARM
435+
EM_AVR
436+
EM_COLDFIRE
437+
EM_CRIS
438+
EM_D10V
439+
EM_D30V
440+
EM_FAKE_ALPHA
441+
EM_FIREPATH
442+
EM_FR20
443+
EM_FR30
444+
EM_FX66
445+
EM_H8_300
446+
EM_H8_300H
447+
EM_H8_500
448+
EM_H8S
449+
EM_HUANY
450+
EM_IA_64
451+
EM_JAVELIN
452+
EM_M32
453+
EM_M32R
454+
EM_ME16
455+
EM_MIPS
456+
EM_MIPS_RS3_LE
457+
EM_MIPS_X
458+
EM_MMA
459+
EM_MMIX
460+
EM_MN10200
461+
EM_MN10300
462+
EM_NCPU
463+
EM_NDR1
464+
EM_NONE
465+
EM_OPENRISC
466+
EM_PARISC
467+
EM_PCP
468+
EM_PDSP
469+
EM_PJ
470+
EM_PPC
471+
EM_PPC64
472+
EM_PRISM
473+
EM_RCE
474+
EM_RH32
475+
EM_S370
476+
EM_S390
477+
EM_SH
478+
EM_SPARC
479+
EM_SPARC32PLUS
480+
EM_SPARCV9
481+
EM_ST100
482+
EM_ST19
483+
EM_ST7
484+
EM_ST9PLUS
485+
EM_STARCORE
486+
EM_SVX
487+
EM_TILEGX
488+
EM_TILEPRO
489+
EM_TINYJ
490+
EM_TRICORE
491+
EM_V800
492+
EM_V850
493+
EM_VAX
494+
EM_VPP500
495+
EM_X86_64
496+
EM_XTENSA
497+
EM_ZSP
382498
ENAVAIL
383499
ENOANO
384500
ENOATTR
@@ -516,11 +632,24 @@ ETH_P_X25
516632
ETH_ZLEN
517633
ETOOMANYREFS
518634
ETIME
635+
ET_CORE
636+
ET_DYN
637+
ET_EXEC
638+
ET_HIOS
639+
ET_HIPROC
640+
ET_LOOS
641+
ET_LOPROC
642+
ET_NONE
643+
ET_NUM
644+
ET_REL
519645
EUCLEAN
520646
EUNATCH
521647
EUSERS
522648
EV_CNT
649+
EV_CURRENT
523650
EV_MAX
651+
EV_NONE
652+
EV_NUM
524653
EXFULL
525654
EXTA
526655
EXTB
@@ -1521,13 +1650,16 @@ PF_IUCV
15211650
PF_KEY
15221651
PF_LLC
15231652
PF_LOCAL
1653+
PF_MASKOS
1654+
PF_MASKPROC
15241655
PF_NETBEUI
15251656
PF_NETLINK
15261657
PF_NETROM
15271658
PF_NFC
15281659
PF_PACKET
15291660
PF_PHONET
15301661
PF_PPPOX
1662+
PF_R
15311663
PF_RDS
15321664
PF_ROSE
15331665
PF_ROUTE
@@ -1536,7 +1668,9 @@ PF_SECURITY
15361668
PF_SNA
15371669
PF_TIPC
15381670
PF_VSOCK
1671+
PF_W
15391672
PF_WANPIPE
1673+
PF_X
15401674
PF_X25
15411675
PIPE_BUF
15421676
PM_STR
@@ -1710,6 +1844,7 @@ PTRACE_SINGLESTEP
17101844
PTRACE_SYSCALL
17111845
PTRACE_TRACEME
17121846
PT_HIOS
1847+
PT_HISUNW
17131848
PT_LOPROC
17141849
PT_HIPROC
17151850
PT_DYNAMIC
@@ -1719,11 +1854,14 @@ PT_GNU_STACK
17191854
PT_INTERP
17201855
PT_LOAD
17211856
PT_LOOS
1857+
PT_LOSUNW
17221858
PT_NOTE
17231859
PT_NULL
17241860
PT_NUM
17251861
PT_PHDR
17261862
PT_SHLIB
1863+
PT_SUNWBSS
1864+
PT_SUNWSTACK
17271865
PT_TLS
17281866
P_ALL
17291867
P_PGID
@@ -2001,6 +2139,7 @@ SECCOMP_RET_TRACE
20012139
SECCOMP_RET_TRAP
20022140
SEEK_DATA
20032141
SEEK_HOLE
2142+
SELFMAG
20042143
SEM_FAILED
20052144
SFD_CLOEXEC
20062145
SFD_NONBLOCK

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,8 @@ pub const NT_LWPSTATUS: ::c_int = 16;
954954
pub const NT_LWPSINFO: ::c_int = 17;
955955
pub const NT_PRFPXREG: ::c_int = 20;
956956

957+
pub const ELFOSABI_ARM_AEABI: u8 = 64;
958+
957959
// linux/keyctl.h
958960
pub const KEYCTL_DH_COMPUTE: u32 = 23;
959961
pub const KEYCTL_PKEY_QUERY: u32 = 24;

0 commit comments

Comments
 (0)