diff options
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/alpha/include/exec.h | 9 | ||||
-rw-r--r-- | sys/arch/amiga/include/exec.h | 9 | ||||
-rw-r--r-- | sys/arch/arc/include/exec.h | 13 | ||||
-rw-r--r-- | sys/arch/arm32/include/exec.h | 4 | ||||
-rw-r--r-- | sys/arch/atari/include/exec.h | 9 | ||||
-rw-r--r-- | sys/arch/hp300/include/exec.h | 9 | ||||
-rw-r--r-- | sys/arch/i386/include/exec.h | 9 | ||||
-rw-r--r-- | sys/arch/mac68k/include/exec.h | 11 | ||||
-rw-r--r-- | sys/arch/mvme68k/include/exec.h | 11 | ||||
-rw-r--r-- | sys/arch/mvme88k/include/exec.h | 7 | ||||
-rw-r--r-- | sys/arch/pc532/include/exec.h | 4 | ||||
-rw-r--r-- | sys/arch/pmax/include/exec.h | 14 | ||||
-rw-r--r-- | sys/arch/powerpc/include/exec.h | 10 | ||||
-rw-r--r-- | sys/arch/sparc/include/exec.h | 9 | ||||
-rw-r--r-- | sys/arch/sun3/include/exec.h | 5 | ||||
-rw-r--r-- | sys/arch/vax/include/exec.h | 4 |
16 files changed, 92 insertions, 45 deletions
diff --git a/sys/arch/alpha/include/exec.h b/sys/arch/alpha/include/exec.h index bbe03bd1f7e..163eae5dad1 100644 --- a/sys/arch/alpha/include/exec.h +++ b/sys/arch/alpha/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.3 1996/07/29 22:58:42 niklas Exp $ */ +/* $OpenBSD: exec.h,v 1.4 1996/12/23 02:42:24 deraadt Exp $ */ /* $NetBSD: exec.h,v 1.1 1995/02/13 23:07:37 cgd Exp $ */ /* @@ -40,7 +40,10 @@ #define ELF_TARG_DATA ELFDATA2LSB #define ELF_TARG_MACH EM_ALPHA -#define DO_AOUT /* support a.out */ -#define DO_ECOFF /* support ECOFF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ECOFF + +#define _KERN_DO_AOUT +#define _KERN_DO_ECOFF #endif /* !_ALPHA_EXEC_H_ */ diff --git a/sys/arch/amiga/include/exec.h b/sys/arch/amiga/include/exec.h index 5eaeccc4a3b..4850a249ac2 100644 --- a/sys/arch/amiga/include/exec.h +++ b/sys/arch/amiga/include/exec.h @@ -49,7 +49,12 @@ struct relocation_info_m68k { #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_68K -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF + +#define _KERN_DO_AOUT +#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4) +#define _KERN_DO_KERN +#endif #endif /* _MACHINE_EXEC_H_ */ diff --git a/sys/arch/arc/include/exec.h b/sys/arch/arc/include/exec.h index d4f4e03159f..18ea54bdc82 100644 --- a/sys/arch/arc/include/exec.h +++ b/sys/arch/arc/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.1 1996/06/24 09:07:17 pefo Exp $ */ +/* $OpenBSD: exec.h,v 1.2 1996/12/23 02:42:26 deraadt Exp $ */ /* $NetBSD: exec.h,v 1.5 1994/10/26 21:09:39 cgd Exp $ */ /*- @@ -48,10 +48,9 @@ #define ELF_TARG_DATA ELFDATA2LSB #define ELF_TARG_MACH EM_MIPS -/* - * This is what we want nlist(3) to handle. - */ -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ -#define DO_ECOFF /* support ECOFF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF +#define _NLIST_DO_ECOFF +#define _KERN_DO_ECOFF +#define _KERN_DO_ELF diff --git a/sys/arch/arm32/include/exec.h b/sys/arch/arm32/include/exec.h index a366d2f339f..0761398bc52 100644 --- a/sys/arch/arm32/include/exec.h +++ b/sys/arch/arm32/include/exec.h @@ -60,6 +60,8 @@ struct relocation_info_arm6 { #define ELF_TARG_DATA ELFDATA2LSB #define ELF_TARG_MACH EM_ARM -#define DO_AOUT /* support a.out */ +#define _NLIST_DO_AOUT + +#define _KERN_DO_AOUT #endif /* _ARM_EXEC_H_ */ diff --git a/sys/arch/atari/include/exec.h b/sys/arch/atari/include/exec.h index 73355376a1e..2537bb10931 100644 --- a/sys/arch/atari/include/exec.h +++ b/sys/arch/atari/include/exec.h @@ -50,7 +50,12 @@ struct relocation_info_m68k { #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_68K -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF + +#define _KERN_DO_AOUT +#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4) +#define _KERN_DO_ELF +#endif #endif /* _MACHINE_EXEC_H_ */ diff --git a/sys/arch/hp300/include/exec.h b/sys/arch/hp300/include/exec.h index b19b2fda177..c38c46f767e 100644 --- a/sys/arch/hp300/include/exec.h +++ b/sys/arch/hp300/include/exec.h @@ -50,7 +50,12 @@ struct relocation_info_m68k { #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_68K -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF + +#define _KERN_DO_AOUT +#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4) +#define _KERN_DO_ELF +#endif #endif /* _MACHINE_EXEC_H_ */ diff --git a/sys/arch/i386/include/exec.h b/sys/arch/i386/include/exec.h index 3e84579c225..f7e6b6401b9 100644 --- a/sys/arch/i386/include/exec.h +++ b/sys/arch/i386/include/exec.h @@ -51,7 +51,12 @@ struct relocation_info_i386 { #define ELF_TARG_MACH EM_386 /* XXX - EM_486 is currently unused by all OSs/compilers/linkers */ -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF + +#define _KERN_DO_AOUT +#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4) || !defined(_KERNEL) +#define _KERN_DO_ELF +#endif #endif /* _I386_EXEC_H_ */ diff --git a/sys/arch/mac68k/include/exec.h b/sys/arch/mac68k/include/exec.h index a2867f86c67..de2b2485753 100644 --- a/sys/arch/mac68k/include/exec.h +++ b/sys/arch/mac68k/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.4 1996/05/29 03:05:00 deraadt Exp $ */ +/* $OpenBSD: exec.h,v 1.5 1996/12/23 02:42:30 deraadt Exp $ */ /* $NetBSD: exec.h,v 1.8 1996/05/05 06:17:40 briggs Exp $ */ /*- @@ -59,7 +59,12 @@ struct relocation_info_mac68k { #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_68K -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF + +#define _KERN_DO_AOUT +#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4) +#define _KERN_DO_ELF +#endif #endif /* _EXEC_MACHINE_ */ diff --git a/sys/arch/mvme68k/include/exec.h b/sys/arch/mvme68k/include/exec.h index d16cf3bc72b..ef5cfd8e3e2 100644 --- a/sys/arch/mvme68k/include/exec.h +++ b/sys/arch/mvme68k/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.4 1996/05/29 03:05:01 deraadt Exp $ */ +/* $OpenBSD: exec.h,v 1.5 1996/12/23 02:42:31 deraadt Exp $ */ /* * Copyright (c) 1993 Christopher G. Demetriou @@ -49,7 +49,12 @@ struct relocation_info_m68k { #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_68K -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF + +#define _KERN_DO_AOUT +#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4) +#define _KERN_DO_ELF +#endif #endif /* _MACHINE_EXEC_H_ */ diff --git a/sys/arch/mvme88k/include/exec.h b/sys/arch/mvme88k/include/exec.h index bf2d01aa06e..bbff3a67156 100644 --- a/sys/arch/mvme88k/include/exec.h +++ b/sys/arch/mvme88k/include/exec.h @@ -328,7 +328,10 @@ struct relocation_info #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_88K -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF + +#define _KERN_DO_AOUT +#define _KERN_DO_ELF #endif /* __A_OUT_GNU_H__ */ diff --git a/sys/arch/pc532/include/exec.h b/sys/arch/pc532/include/exec.h index 780505f14f8..c8055f80b5b 100644 --- a/sys/arch/pc532/include/exec.h +++ b/sys/arch/pc532/include/exec.h @@ -51,6 +51,8 @@ struct relocation_info_pc532 { #define ELF_TARG_DATA ELFDATA2LSB #define ELF_TARG_MACH EM_32K -#define DO_AOUT /* support a.out */ +#define _NLIST_DO_AOUT + +#define _KERN_DO_AOUT #endif /* _PC532_EXEC_H_ */ diff --git a/sys/arch/pmax/include/exec.h b/sys/arch/pmax/include/exec.h index 34ffd0bf1d2..22ad23ebf19 100644 --- a/sys/arch/pmax/include/exec.h +++ b/sys/arch/pmax/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.6 1996/12/22 15:22:22 graichen Exp $ */ +/* $OpenBSD: exec.h,v 1.7 1996/12/23 02:42:34 deraadt Exp $ */ /* $NetBSD: exec.h,v 1.5 1994/10/26 21:09:39 cgd Exp $ */ /*- @@ -48,10 +48,10 @@ #define ELF_TARG_DATA ELFDATA2LSB #define ELF_TARG_MACH EM_MIPS -/* - * This is what we want nlist(3) to handle. - */ -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ -#define DO_ECOFF /* support ECOFF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF +#define _NLIST_DO_ECOFF +#undef _KERN_DO_AOUT +#define _KERN_DO_ELF +#define _KERN_DO_ECOFF diff --git a/sys/arch/powerpc/include/exec.h b/sys/arch/powerpc/include/exec.h index 1028944d194..54357834d22 100644 --- a/sys/arch/powerpc/include/exec.h +++ b/sys/arch/powerpc/include/exec.h @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: exec.h,v 1.1 1996/12/21 20:35:54 rahnds Exp $ + * $Id: exec.h,v 1.2 1996/12/23 02:42:35 deraadt Exp $ */ #ifndef _PPC_EXEC_H_ @@ -51,11 +51,9 @@ struct relocation_info_powerpc { #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_PPC -/* - * This is what we want nlist(3) to handle. - */ -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF +#define _KERN_DO_ELF #endif /* _PPC_EXEC_H_ */ diff --git a/sys/arch/sparc/include/exec.h b/sys/arch/sparc/include/exec.h index 50ee2751730..b4c3925fd48 100644 --- a/sys/arch/sparc/include/exec.h +++ b/sys/arch/sparc/include/exec.h @@ -61,7 +61,12 @@ struct relocation_info_sparc { #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_SPARC -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT +#define _NLIST_DO_ELF + +#define _KERN_DO_AOUT +#if defined(COMPAT_LINUX) || defined(COMPAT_SVR4) +#define _KERN_DO_ELF +#endif #endif /* _SPARC_EXEC_H_ */ diff --git a/sys/arch/sun3/include/exec.h b/sys/arch/sun3/include/exec.h index 22d46f1bd7e..2aa79fc0d5a 100644 --- a/sys/arch/sun3/include/exec.h +++ b/sys/arch/sun3/include/exec.h @@ -50,7 +50,8 @@ struct relocation_info_m68k { #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_68K -#define DO_AOUT /* support a.out */ -#define DO_ELF /* support ELF */ +#define _NLIST_DO_AOUT + +#define _KERN_DO_AOUT #endif /* _SUN3_EXEC_H_ */ diff --git a/sys/arch/vax/include/exec.h b/sys/arch/vax/include/exec.h index 3493e317afa..74e73c549e8 100644 --- a/sys/arch/vax/include/exec.h +++ b/sys/arch/vax/include/exec.h @@ -46,4 +46,8 @@ struct relocation_info_vax { }; #define relocation_info relocation_info_vax +#define _NLIST_DO_AOUT + +#define _KERN_DO_AOUT + #endif /* _VAX_EXEC_H_ */ |