diff options
| -rw-r--r-- | COPYING.SOFORT | 2 | ||||
| -rw-r--r-- | sofort/ccenv/ccenv.sh | 25 | ||||
| -rw-r--r-- | sofort/cfgtest/cfgtest.sh | 2 | ||||
| -rw-r--r-- | src/hdrdump/pe_hdrdump_coff_opt_hdr.c | 31 |
4 files changed, 44 insertions, 16 deletions
diff --git a/COPYING.SOFORT b/COPYING.SOFORT index 75a98e1..1c8a6c1 100644 --- a/COPYING.SOFORT +++ b/COPYING.SOFORT @@ -2,7 +2,7 @@ /* */ /* sofort: portable software project skeleton */ /* */ -/* Copyright (C) 2015--2023 SysDeer Technologies, LLC */ +/* Copyright (C) 2015--2024 SysDeer Technologies, LLC */ /* */ /* sofort provides a build system that can be incorporated into Works */ /* which may or may not be covered by a copyleft license. THE FOLLOWING */ diff --git a/sofort/ccenv/ccenv.sh b/sofort/ccenv/ccenv.sh index fdba47e..d975c6b 100644 --- a/sofort/ccenv/ccenv.sh +++ b/sofort/ccenv/ccenv.sh @@ -1118,10 +1118,6 @@ ccenv_set_os() fi case "$ccenv_cchost" in - *-*-*-* ) - ccenv_tip=${ccenv_cchost%-*} - ccenv_os=${ccenv_tip#*-*-} - ;; *-*-musl | *-*-gnu ) ccenv_tip=${ccenv_cchost%-*} ccenv_os=${ccenv_tip#*-} @@ -1129,6 +1125,13 @@ ccenv_set_os() *-*-solaris* ) ccenv_os='solaris' ;; + *-*-*bsd* | *-*-dragonfly* ) + ccenv_os='bsd' + ;; + *-*-*-* ) + ccenv_tip=${ccenv_cchost%-*} + ccenv_os=${ccenv_tip#*-*-} + ;; *-*-* ) ccenv_os=${ccenv_cchost#*-*-} ;; @@ -1440,6 +1443,19 @@ ccenv_set_os_gate_switches() fi } +ccenv_set_os_bsd_switches() +{ + if [ "$ccenv_os" = 'bsd' ]; then + mb_cfgtest_headers='sys/mman.h' + + if ! cfgtest_macro_definition 'MAP_ANON'; then + ccenv_cflags_os="${ccenv_cflags_os} -D__BSD_VISIBLE" + fi + + mb_cfgtest_headers= + fi +} + ccenv_output_defs() { ccenv_in="$mb_project_dir/sofort/ccenv/ccenv.in" @@ -1806,6 +1822,7 @@ ccenv_set_toolchain_variables() ccenv_set_os_dso_patterns ccenv_set_os_pe_switches ccenv_set_os_gate_switches + ccenv_set_os_bsd_switches ccenv_set_cc_attr_visibility_vars ccenv_output_defs diff --git a/sofort/cfgtest/cfgtest.sh b/sofort/cfgtest/cfgtest.sh index 8e1db07..7bb27a0 100644 --- a/sofort/cfgtest/cfgtest.sh +++ b/sofort/cfgtest/cfgtest.sh @@ -423,7 +423,7 @@ cfgtest_interface_presence() # init cfgtest_prolog 'interface' "${1}" - cfgtest_code_snippet=$(printf 'void * addr = &%s;\n' "${1}") + cfgtest_code_snippet=$(printf 'void (*addr)() = (void (*)())&%s;\n' "${1}") cfgtest_common_init diff --git a/src/hdrdump/pe_hdrdump_coff_opt_hdr.c b/src/hdrdump/pe_hdrdump_coff_opt_hdr.c index 959c9c8..fbec549 100644 --- a/src/hdrdump/pe_hdrdump_coff_opt_hdr.c +++ b/src/hdrdump/pe_hdrdump_coff_opt_hdr.c @@ -23,15 +23,19 @@ static int pe_hdrdump_opt_hdr_32( const struct pe_driver_ctx * dctx, const struct pe_image_meta * meta) { - uint64_t faddr; - uint64_t vaddr; + void * uaddr; + const char * haddr; + const char * maddr; + uintptr_t faddr; + uintptr_t vaddr; char * ch; char buf[8192]; - if (!PE_ADDR) - return 0; + uaddr = &meta->r_opt->opt_hdr_32; + maddr = meta->r_image.map_addr; - faddr = (char *)(PE_ADDR) - (char *)meta->r_image.map_addr; + haddr = uaddr; + faddr = haddr - maddr; vaddr = meta->m_opt.oh_mem.coh_image_base + faddr; ch = buf; @@ -109,15 +113,19 @@ static int pe_hdrdump_opt_hdr_64( const struct pe_driver_ctx * dctx, const struct pe_image_meta * meta) { - uint64_t faddr; - uint64_t vaddr; + void * uaddr; + const char * haddr; + const char * maddr; + uintptr_t faddr; + uintptr_t vaddr; char * ch; char buf[8192]; - if (!PE_ADDR) - return 0; + uaddr = PE_ADDR; + maddr = meta->r_image.map_addr; - faddr = (char *)(PE_ADDR) - (char *)meta->r_image.map_addr; + haddr = uaddr; + faddr = haddr - maddr; vaddr = meta->m_opt.oh_mem.coh_image_base + faddr; ch = buf; @@ -186,6 +194,9 @@ int pe_hdrdump_coff_opt_hdr( const struct pe_driver_ctx * dctx, const struct pe_image_meta * meta) { + if (!meta->r_opt) + return 0; + switch (pe_image_bits(meta)) { case 32: return pe_hdrdump_opt_hdr_32(dctx,meta); |