JakeHillion/drgn
1
0
Fork 0
mirror of https://github.com/JakeHillion/drgn.git synced 2024-12-22 01:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

libdrgn: wrap system elf.h instead of vendoring

Browse Source 
In commit e5bc41f16c ("libdrgn: add latest elf.h and dwarf.h to
support elfutils 0.165"), we copied elf.h from glibc 2.33 into libdrgn.
This causes a build failure on Fedora Rawhide:

/usr/include/gelf.h:86:9: error: unknown type name 'Elf64_Relr'
   86 | typedef Elf64_Relr Gelf_Relr;

This is because an elfutils patch added to Rawhide
(https://sourceware.org/pipermail/elfutils-devel/2023q3/006337.html)
adds a typedef for a type that we don't have in our old copy of elf.h.

The reason that we have a copy in the first place is that we use some
definitions that aren't in older versions of glibc. Instead of copying
elf.h, wrap it using #include_next and add the definitions we need.

Signed-off-by: Omar Sandoval <osandov@osandov.com>
This commit is contained in:
Omar Sandoval 2023-08-24 11:22:27 -07:00
parent 7c3ac80a1b
commit 3d07cb1682
2 changed files with 296 additions and 4100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4285
libdrgn/include/elf.h
View File

File diff suppressed because it is too large Load Diff

111
scripts/gen_elf_compat.py Executable file
View File

@ -0,0 +1,111 @@
#!/usr/bin/env python3
# Copyright (c) Meta Platforms, Inc. and affiliates.
# SPDX-License-Identifier: LGPL-2.1-or-later
import argparse
import re
import subprocess
# Macros missing from glibc 2.17, which is the oldest version we test against
# (when we build manylinux2014 wheels).
MACROS = (
# Added in glibc 2.18.
"NT_FILE",
# Added in glibc 2.24.
"EM_RISCV",
# Added in glibc 2.27.
# We don't need all of the RISC-V relocation types, but it doesn't hurt.
"R_RISCV_NONE",
"R_RISCV_32",
"R_RISCV_64",
"R_RISCV_RELATIVE",
"R_RISCV_COPY",
"R_RISCV_JUMP_SLOT",
"R_RISCV_TLS_DTPMOD32",
"R_RISCV_TLS_DTPMOD64",
"R_RISCV_TLS_DTPREL32",
"R_RISCV_TLS_DTPREL64",
"R_RISCV_TLS_TPREL32",
"R_RISCV_TLS_TPREL64",
# Added in glibc 2.28.
"R_RISCV_BRANCH",
"R_RISCV_JAL",
"R_RISCV_CALL",
"R_RISCV_CALL_PLT",
"R_RISCV_GOT_HI20",
"R_RISCV_TLS_GOT_HI20",
"R_RISCV_TLS_GD_HI20",
"R_RISCV_PCREL_HI20",
"R_RISCV_PCREL_LO12_I",
"R_RISCV_PCREL_LO12_S",
"R_RISCV_HI20",
"R_RISCV_LO12_I",
"R_RISCV_LO12_S",
"R_RISCV_TPREL_HI20",
"R_RISCV_TPREL_LO12_I",
"R_RISCV_TPREL_LO12_S",
"R_RISCV_TPREL_ADD",
"R_RISCV_ADD8",
"R_RISCV_ADD16",
"R_RISCV_ADD32",
"R_RISCV_ADD64",
"R_RISCV_SUB8",
"R_RISCV_SUB16",
"R_RISCV_SUB32",
"R_RISCV_SUB64",
"R_RISCV_GNU_VTINHERIT",
"R_RISCV_GNU_VTENTRY",
"R_RISCV_ALIGN",
"R_RISCV_RVC_BRANCH",
"R_RISCV_RVC_JUMP",
"R_RISCV_RVC_LUI",
"R_RISCV_GPREL_I",
"R_RISCV_GPREL_S",
"R_RISCV_TPREL_I",
"R_RISCV_TPREL_S",
"R_RISCV_RELAX",
"R_RISCV_SUB6",
"R_RISCV_SET6",
"R_RISCV_SET8",
"R_RISCV_SET16",
"R_RISCV_SET32",
"R_RISCV_32_PCREL",
# Added in glibc 2.30.
"NT_ARM_PAC_MASK",
)
def main() -> None:
argparse.ArgumentParser(
description="Generate definitions missing from older versions of glibc for libdrgn/include/elf.h from /usr/include/elf.h"
).parse_args()
macros = {}
regex = re.compile(r"\s*#\s*define\s+(" + "|".join(MACROS) + r")\s+(.*)")
# Dump out just the macro definitions with gcc.
with subprocess.Popen(
[
"gcc",
"-dM",
"-E",
"/usr/include/elf.h",
],
stdout=subprocess.PIPE,
universal_newlines=True,
) as proc:
for line in proc.stdout:
match = regex.match(line)
if not match:
continue
macros[match.group(1)] = match.group(2)
print("// Generated by scripts/gen_elf_compat.py.")
for macro in MACROS:
print("#ifndef", macro)
print("#define", macro, macros[macro])
print("#endif")
if __name__ == "__main__":
main()