diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2022-01-12 21:41:07 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2022-01-12 21:41:07 +0000 |
| commit | 11df38c2a4d38ff2388494db4078ec521d9bb9db (patch) | |
| tree | b46008e948c716d3ba341072990b81d024d77b01 /lib/csu/boot.h | |
| parent | 55317f1dda12809885af07d6bbc141daeb7cb792 (diff) | |
Lift the '#ifdef RCRT0' conditional out of boot*.h to crt0.c
Prep for dropping #includes from archdep.h: pull in <machine/reloc.h>
and declare _dl_exit() in boot*.h
ok kettenis@
Diffstat (limited to 'lib/csu/boot.h')
| -rw-r--r-- | lib/csu/boot.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/csu/boot.h b/lib/csu/boot.h index e4d3bf34778..f9b6a641a1f 100644 --- a/lib/csu/boot.h +++ b/lib/csu/boot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.h,v 1.32 2021/11/16 02:46:46 guenther Exp $ */ +/* $OpenBSD: boot.h,v 1.33 2022/01/12 21:41:06 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -34,9 +34,13 @@ #define _DYN_LOADER -#include <sys/types.h> -#include <sys/mman.h> #include <sys/exec_elf.h> +#include <sys/mman.h> + +#include <machine/reloc.h> + +__dead +void _dl_exit(int); #include "archdep.h" @@ -47,8 +51,6 @@ #define REDIRECT_SYSCALL(x) typeof(x) x asm("_libc_"#x) __dso_hidden REDIRECT_SYSCALL(mprotect); -#ifdef RCRT0 - #if RELOC_TAG == DT_RELA typedef Elf_RelA RELOC_TYPE; #elif RELOC_TAG == DT_REL @@ -167,5 +169,3 @@ _dl_boot_bind(const long sp, long *dl_data, Elf_Dyn *dynp) } } } - -#endif /* RCRT0 */ |