From d11a561f9e662f6bda81b1f826622f93b7f71a6c Mon Sep 17 00:00:00 2001 From: guenther Date: Mon, 31 Jan 2022 05:44:13 +0000 Subject: [PATCH] Nothing depends on archdep.h pulling in other #includes anymore, so delete the #includes and hide the RELOC_* functions that are only used by lib/csu behind "#ifdef RCRT0" matches the others and it's hard to see how it will fail --- libexec/ld.so/alpha/archdep.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libexec/ld.so/alpha/archdep.h b/libexec/ld.so/alpha/archdep.h index 24cc66535c5..f952fea5252 100644 --- a/libexec/ld.so/alpha/archdep.h +++ b/libexec/ld.so/alpha/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.24 2021/11/14 22:07:38 guenther Exp $ */ +/* $OpenBSD: archdep.h,v 1.25 2022/01/31 05:44:13 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -32,15 +32,11 @@ #define RELOC_TAG DT_RELA #define MACHID EM_ALPHA_EXP /* ELF e_machine ID value checked */ -#include -#include -#include "syscall.h" -#include "util.h" - - /* Only used in lib/csu/boot.h */ +#ifdef RCRT0 + static inline void -RELOC_DYN(Elf_RelA *r, const Elf_Sym *s, Elf_Addr *p, unsigned long v) +RELOC_DYN(const Elf_RelA *r, const Elf_Sym *s, Elf_Addr *p, unsigned long v) { if (ELF_R_TYPE(r->r_info) == RELOC_RELATIVE) { *p += v; @@ -58,4 +54,5 @@ RELOC_DYN(Elf_RelA *r, const Elf_Sym *s, Elf_Addr *p, unsigned long v) } } +#endif /* RCRT0 */ #endif /* _ALPHA_ARCHDEP_H_ */ -- 2.20.1