From 472e8651f05e5f8589a58fc9c48cfe7b9a3581e7 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 31 Mar 2024 00:12:17 +0000 Subject: [PATCH] elftoolchain: Undo the whole BUILTIN_ELF_HEADERS mistake. This was: - half bogus workarounds for missing build_install dependencies in tools/Makefile, which are no longer missing now, and - half futile attempt to use src/sys/sys/exec_elf.h via nbincludes in tools involving libelf instead of libelf's elfdefinitions.h, which collides. --- .../dist/libdwarf/libdwarf_reloc.c | 5 +---- external/bsd/elftoolchain/dist/libelf/libelf.h | 18 +----------------- .../bsd/elftoolchain/lib/libdwarf/Makefile | 1 - external/cddl/osnet/sys/elf.h | 2 +- external/cddl/osnet/sys/sys/elf.h | 4 ++-- tools/ctfconvert/Makefile | 4 ++-- tools/ctfmerge/Makefile | 4 ++-- tools/elftoolchain/libdwarf/Makefile | 3 +-- tools/elftoolchain/libelf/Makefile | 2 +- tools/libctf/Makefile | 1 - 10 files changed, 11 insertions(+), 33 deletions(-) diff --git a/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c b/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c index ff82a2af11b6..2888629b9aae 100644 --- a/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c +++ b/external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c @@ -36,7 +36,7 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg, int is64) { assert(dbg != NULL); -#ifdef BUILTIN_ELF_HEADERS + switch (dbg->dbgp_isa) { case DW_ISA_AARCH64: return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32); @@ -59,7 +59,6 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg, int is64) default: break; } -#endif return (0); /* NOT REACHED */ } @@ -67,7 +66,6 @@ int _dwarf_get_reloc_size(Dwarf_Debug dbg, Dwarf_Unsigned rel_type) { -#ifdef BUILTIN_ELF_HEADERS switch (dbg->dbg_machine) { case EM_NONE: break; @@ -129,7 +127,6 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, Dwarf_Unsigned rel_type) default: break; } -#endif /* unknown relocation. */ return (0); diff --git a/external/bsd/elftoolchain/dist/libelf/libelf.h b/external/bsd/elftoolchain/dist/libelf/libelf.h index 2452460959f5..f23d7d28d535 100644 --- a/external/bsd/elftoolchain/dist/libelf/libelf.h +++ b/external/bsd/elftoolchain/dist/libelf/libelf.h @@ -35,23 +35,7 @@ # include "nbtool_config.h" #endif - -#ifdef BUILTIN_ELF_HEADERS -# include -# include -# include "elfdefinitions.h" -#elif HAVE_NBTOOL_CONFIG_H -# include -#elif defined(__NetBSD__) -# include -# include -#elif defined(__FreeBSD__) -# include -# include -# include -#else - #error "No valid elf headers" -#endif +#include "elfdefinitions.h" /* Library private data structures */ typedef struct _Elf Elf; diff --git a/external/bsd/elftoolchain/lib/libdwarf/Makefile b/external/bsd/elftoolchain/lib/libdwarf/Makefile index 63e42753ef51..5ffbb9ccd1f4 100644 --- a/external/bsd/elftoolchain/lib/libdwarf/Makefile +++ b/external/bsd/elftoolchain/lib/libdwarf/Makefile @@ -82,7 +82,6 @@ GENSRCS= dwarf_pubnames.c dwarf_pubtypes.c dwarf_weaks.c \ dwarf_pro_funcs.c dwarf_pro_types.c \ dwarf_pro_vars.c CLEANFILES= ${GENSRCS} -CPPFLAGS+= -DBUILTIN_ELF_HEADERS CPPFLAGS+= -I. -I${SRCDIR} -I${TOP}/common -I${TOP}/libelf LIBDPLIBS+= elf ${.CURDIR}/../libelf diff --git a/external/cddl/osnet/sys/elf.h b/external/cddl/osnet/sys/elf.h index 9cde17aa6612..dbec85972749 100644 --- a/external/cddl/osnet/sys/elf.h +++ b/external/cddl/osnet/sys/elf.h @@ -30,7 +30,7 @@ #define _ELF_H_ #if HAVE_NBTOOL_CONFIG_H -#include +#include #else #include #endif diff --git a/external/cddl/osnet/sys/sys/elf.h b/external/cddl/osnet/sys/sys/elf.h index 92f43cb35390..3e7c41779a46 100644 --- a/external/cddl/osnet/sys/sys/elf.h +++ b/external/cddl/osnet/sys/sys/elf.h @@ -30,12 +30,12 @@ #define _SYS__ELF_SOLARIS_H_ #if HAVE_NBTOOL_CONFIG_H -#include +#include #else #include +#define SHT_SUNW_dof 0x6ffffff4 #endif -#define SHT_SUNW_dof 0x6ffffff4 #define EM_AMD64 EM_X86_64 #define __ELF_WORD_SIZE ELFSIZE diff --git a/tools/ctfconvert/Makefile b/tools/ctfconvert/Makefile index 357104aa0043..e5030bb3e671 100644 --- a/tools/ctfconvert/Makefile +++ b/tools/ctfconvert/Makefile @@ -37,7 +37,8 @@ HOST_CPPFLAGS+= -I${OSNETDIR}/sys \ -I${OPENSOLARIS_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_DISTDIR}/uts/common \ -I${LIBELF_DIR} \ - -I${LIBDWARF_DIR} + -I${LIBDWARF_DIR} \ + -I${TOOLDIR}/include HOST_CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 @@ -57,5 +58,4 @@ DPADD+= ${ELFOBJ}/libelf.a .PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/cvt -.include "${.CURDIR}/../Makefile.nbincludes" .include "${.CURDIR}/../Makefile.host" diff --git a/tools/ctfmerge/Makefile b/tools/ctfmerge/Makefile index cefb7179f857..d7e22081c17b 100644 --- a/tools/ctfmerge/Makefile +++ b/tools/ctfmerge/Makefile @@ -17,7 +17,8 @@ HOST_CPPFLAGS+= -I${OSNETDIR}/sys \ -I${OPENSOLARIS_DISTDIR}/tools/ctf/cvt \ -I${OPENSOLARIS_DISTDIR}/uts/common \ -I${LIBELF_DIR} \ - -I${LIBDWARF_DIR} + -I${LIBDWARF_DIR} \ + -I${TOOLDIR}/include HOST_CPPFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1 @@ -37,5 +38,4 @@ HOST_CFLAGS+= -pthread .PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_DISTDIR}/tools/ctf/cvt -.include "${.CURDIR}/../Makefile.nbincludes" .include "${.CURDIR}/../Makefile.host" diff --git a/tools/elftoolchain/libdwarf/Makefile b/tools/elftoolchain/libdwarf/Makefile index eb620cc8c278..82f681a427c8 100644 --- a/tools/elftoolchain/libdwarf/Makefile +++ b/tools/elftoolchain/libdwarf/Makefile @@ -73,12 +73,11 @@ COMPATLIB_NO_LIB= yes # only the include files, not the library LIBDWARF_OBJDIR!= cd ${.CURDIR} && ${PRINTOBJDIR} -CPPFLAGS+= -DBUILTIN_ELF_HEADERS CPPFLAGS+= -I${.CURDIR}/../../compat CPPFLAGS+= -I${.CURDIR}/../../common CPPFLAGS+= -I${LIBDWARF_OBJDIR}/../common CPPFLAGS+= -I${LIBDWARF_DIR} -I${LIBELF_DIR} -I${COMMON_DIR} -CPPFLAGS+= -I${TOOLDIR}/include -I${TOOLDIR}/include/nbinclude +CPPFLAGS+= -I${TOOLDIR}/include BUILD_OSTYPE!= uname -s diff --git a/tools/elftoolchain/libelf/Makefile b/tools/elftoolchain/libelf/Makefile index b4a911a5267e..d9bc4342d1e0 100644 --- a/tools/elftoolchain/libelf/Makefile +++ b/tools/elftoolchain/libelf/Makefile @@ -54,7 +54,7 @@ CLEANFILES+= ${LIBELF_GENSRCS} CPPFLAGS+= -I${.CURDIR}/../../compat CPPFLAGS+= -I${LIBELF_DIR} -I${LIBELF_DIR}/../common CPPFLAGS+= -I${LIBELF_OBJDIR}/../common -CPPFLAGS+= -I${TOOLDIR}/include -I${TOOLDIR}/include/nbinclude +CPPFLAGS+= -I${TOOLDIR}/include CPPFLAGS+= -DLIBELF_TEST_HOOKS diff --git a/tools/libctf/Makefile b/tools/libctf/Makefile index 374f97751e24..95dc2d61f74f 100644 --- a/tools/libctf/Makefile +++ b/tools/libctf/Makefile @@ -62,5 +62,4 @@ ${TOOLDIR}/lib/libctf.a:: libctf.a mkdir -p ${TOOLDIR}/lib ${HOST_INSTALL_FILE} -m ${BINMODE} libctf.a ${.TARGET} -.include "${.CURDIR}/../Makefile.nbincludes" .include