diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/alpha/include/exec.h | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/include/exec.h | 6 | ||||
| -rw-r--r-- | sys/arch/hppa64/include/exec.h | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/include/exec.h | 32 |
4 files changed, 6 insertions, 42 deletions
diff --git a/sys/arch/alpha/include/exec.h b/sys/arch/alpha/include/exec.h index cad397b9923..76662e27069 100644 --- a/sys/arch/alpha/include/exec.h +++ b/sys/arch/alpha/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.12 2012/09/11 15:44:15 deraadt Exp $ */ +/* $OpenBSD: exec.h,v 1.13 2013/02/09 19:20:39 miod Exp $ */ /* $NetBSD: exec.h,v 1.1 1995/02/13 23:07:37 cgd Exp $ */ /* @@ -31,8 +31,6 @@ #ifndef _MACHINE_EXEC_H_ #define _MACHINE_EXEC_H_ -#define cpu_exec_aout_makecmds(p, epp) ENOEXEC - /* Size of a page in an object file. */ #define __LDPGSZ 8192 diff --git a/sys/arch/hppa/include/exec.h b/sys/arch/hppa/include/exec.h index 6373e18e7fc..279b1c1c447 100644 --- a/sys/arch/hppa/include/exec.h +++ b/sys/arch/hppa/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.11 2012/09/11 15:44:17 deraadt Exp $ */ +/* $OpenBSD: exec.h,v 1.12 2013/02/09 19:20:39 miod Exp $ */ /* * Copyright (c) 1994, The University of Utah and @@ -26,8 +26,6 @@ #ifndef _MACHINE_EXEC_H_ #define _MACHINE_EXEC_H_ -#define cpu_exec_aout_makecmds(p, epp) ENOEXEC - /* Size of a page in an object file. */ #define __LDPGSZ 4096 @@ -41,7 +39,7 @@ #define _KERN_DO_ELF /* - * the following MD ELF values defenitions are from the: + * the following MD ELF values definitions are from the: * "Processor-Specific ELF Supplement for PA-RISC. * Including HP and HP-UX Extensions. Version 1.43. October 6, 1997" * http://devrsrc1.external.hp.com/STK/partner/elf-pa.pdf diff --git a/sys/arch/hppa64/include/exec.h b/sys/arch/hppa64/include/exec.h index af7abf6de51..0daa428782f 100644 --- a/sys/arch/hppa64/include/exec.h +++ b/sys/arch/hppa64/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.4 2012/09/11 15:44:17 deraadt Exp $ */ +/* $OpenBSD: exec.h,v 1.5 2013/02/09 19:20:39 miod Exp $ */ /* * Copyright (c) 1994, The University of Utah and @@ -26,8 +26,6 @@ #ifndef _MACHINE_EXEC_H_ #define _MACHINE_EXEC_H_ -#define cpu_exec_aout_makecmds(p, epp) ENOEXEC - /* Size of a page in an object file. */ #define __LDPGSZ 4096 @@ -41,7 +39,7 @@ #define _KERN_DO_ELF64 /* - * the following MD ELF values defenitions are from the: + * the following MD ELF values definitions are from the: * "Processor-Specific ELF Supplement for PA-RISC. * Including HP and HP-UX Extensions. Version 1.43. October 6, 1997" * http://devrsrc1.external.hp.com/STK/partner/elf-pa.pdf diff --git a/sys/arch/sparc/include/exec.h b/sys/arch/sparc/include/exec.h index ecf35ae258e..addb144422f 100644 --- a/sys/arch/sparc/include/exec.h +++ b/sys/arch/sparc/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.15 2012/09/11 15:44:18 deraadt Exp $ */ +/* $OpenBSD: exec.h,v 1.16 2013/02/09 19:20:39 miod Exp $ */ /* $NetBSD: exec.h,v 1.7 1994/11/20 20:53:02 deraadt Exp $ */ /* @@ -33,32 +33,6 @@ #define __LDPGSZ 8192 /* linker page size */ -#ifndef __ELF__ -enum reloc_type { - RELOC_8, RELOC_16, RELOC_32, - RELOC_DISP8, RELOC_DISP16, RELOC_DISP32, - RELOC_WDISP30, RELOC_WDISP22, - RELOC_HI22, RELOC_22, - RELOC_13, RELOC_LO10, - RELOC_UNUSED1, RELOC_UNUSED2, - RELOC_BASE10, RELOC_BASE13, RELOC_BASE22, - RELOC_PC10, RELOC_PC22, - RELOC_JMP_TBL, - RELOC_UNUSED3, - RELOC_GLOB_DAT, RELOC_JMP_SLOT, RELOC_RELATIVE -}; - -/* Relocation format. */ -struct relocation_info_sparc { - int r_address; /* offset in text or data segment */ - unsigned int r_symbolnum : 24, /* ordinal number of add symbol */ - r_extern : 1, /* 1 if need to add symbol to value */ - : 2; /* unused bits */ - enum reloc_type r_type : 5; /* relocation type time copy */ - long r_addend; /* relocation addend */ -}; -#define relocation_info relocation_info_sparc -#else #define R_SPARC_NONE 0 #define R_SPARC_8 1 #define R_SPARC_16 2 @@ -113,7 +87,6 @@ struct relocation_info_sparc { #define R_SPARC_TLS_TPOFF64 79 #define R_TYPE(name) __CONCAT(R_SPARC_,name) -#endif #define ARCH_ELFSIZE 32 @@ -124,9 +97,6 @@ struct relocation_info_sparc { #define _NLIST_DO_AOUT #define _NLIST_DO_ELF -#define cpu_exec_aout_makecmds(p, epp) (ENOEXEC) - - #define _KERN_DO_ELF #endif /* _MACHINE_EXEC_H_ */ |