Mercurial > pub > dyncall > dyncall
diff dynload/dynload_syms_elf.c @ 645:6a8aac9b2bcf
- removal of `autovar` macro detection lib:
* was a good idea, but never fully pushed through, so code was duplicating most of dyncall_macros.h
* didn't find any outside use and plans to make it a standalone lib never materialized
* so basically removing code to avoid code duplication that risks to never stay in sync
| author | Tassilo Philipp |
|---|---|
| date | Mon, 05 Feb 2024 16:43:59 +0100 |
| parents | c7f879fef352 |
| children |
line wrap: on
line diff
--- a/dynload/dynload_syms_elf.c Thu Dec 15 10:27:40 2022 +0100 +++ b/dynload/dynload_syms_elf.c Mon Feb 05 16:43:59 2024 +0100 @@ -26,7 +26,7 @@ -#include "../autovar/autovar_OS.h" +#include "../dyncall/dyncall_macros.h" /* @@ -35,13 +35,13 @@ */ #include "dynload.h" -#if defined(OS_OpenBSD) +#if defined(DC__OS_OpenBSD) # include <stdint.h> # include <elf_abi.h> -#elif defined(OS_NetBSD) +#elif defined(DC__OS_NetBSD) # include <stddef.h> # include <elf.h> -#elif defined(OS_SunOS) +#elif defined(DC__OS_SunOS) # include <libelf.h> #else # include <elf.h> @@ -65,16 +65,15 @@ #include <unistd.h> /* run-time configuration 64/32 */ -#if defined(OS_OpenBSD) +#if defined(DC__OS_OpenBSD) #else -# include "../autovar/autovar_ABI.h" -# ifdef ABI_ELF64 +# ifdef DC__Obj_ELF64 typedef Elf64_Ehdr Elf_Ehdr; typedef Elf64_Phdr Elf_Phdr; typedef Elf64_Shdr Elf_Shdr; typedef Elf64_Sym Elf_Sym; -# ifndef OS_SunOS +# ifndef DC__OS_SunOS typedef Elf64_Dyn Elf_Dyn; # endif typedef Elf64_Sxword Elf_tag; @@ -86,7 +85,7 @@ typedef Elf32_Phdr Elf_Phdr; typedef Elf32_Shdr Elf_Shdr; typedef Elf32_Sym Elf_Sym; -# ifndef OS_SunOS +# ifndef DC__OS_SunOS typedef Elf32_Dyn Elf_Dyn; # endif typedef Elf32_Sword Elf_tag; @@ -129,7 +128,7 @@ pSyms->fileSize = st.st_size; pSyms->pElf_Ehdr = (Elf_Ehdr*) mmap((void*) NULL, pSyms->fileSize, PROT_READ, MAP_SHARED, pSyms->file, 0); -#ifdef ABI_ELF32 +#ifdef DC__Obj_ELF32 assert(pSyms->pElf_Ehdr->e_ident[EI_CLASS] == ELFCLASS32); #else assert(pSyms->pElf_Ehdr->e_ident[EI_CLASS] == ELFCLASS64);