From 3372ef2e8e0a7d7c2a5c8080a5bd973ebbca9f7b Mon Sep 17 00:00:00 2001 From: is Date: Wed, 13 Feb 2002 12:08:57 +0000 Subject: [PATCH] move ELF32 to std.amiga --- sys/arch/amiga/conf/AMIGA | 9 +++++---- sys/arch/amiga/conf/DRACO | 9 +++++---- sys/arch/amiga/conf/GENERIC | 7 ++++--- sys/arch/amiga/conf/INSTALL | 8 +++++--- sys/arch/amiga/conf/std.amiga | 4 ++-- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/sys/arch/amiga/conf/AMIGA b/sys/arch/amiga/conf/AMIGA index 4a79e500df89..a6244dd905f6 100644 --- a/sys/arch/amiga/conf/AMIGA +++ b/sys/arch/amiga/conf/AMIGA @@ -1,9 +1,9 @@ -# $NetBSD: AMIGA,v 1.44 2002/01/27 13:36:58 is Exp $ +# $NetBSD: AMIGA,v 1.45 2002/02/13 12:09:25 is Exp $ # # This file was automatically created. Changes will be # lost when running make in this directory. # -# Created from: #NetBSD: GENERIC,v 1.173 2002/01/27 13:27:51 is Exp $ +# Created from: #NetBSD: GENERIC,v 1.174 2002/02/13 12:08:57 is Exp $ #GENERIC machine description file @@ -24,7 +24,7 @@ #device. include "arch/amiga/conf/std.amiga" -#ident "GENERIC-$Revision: 1.44 $" +#ident "GENERIC-$Revision: 1.45 $" maxusers 8 options RTC_OFFSET=0 @@ -120,7 +120,8 @@ options COMPAT_SUNOS # Support to run Sun (m68k) executables options COMPAT_SVR4 # Support to run SVR4 (m68k) executables options COMPAT_NOMID # allow nonvalid machine id executables #options COMPAT_LINUX # Support to run Linux/m68k executables -options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) + +options EXEC_AOUT # 32-bit aout executables (NetBSD-1.5.x) #Support for System V IPC facilities. diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO index 81f84a94e04c..c5bffc62d664 100644 --- a/sys/arch/amiga/conf/DRACO +++ b/sys/arch/amiga/conf/DRACO @@ -1,9 +1,9 @@ -# $NetBSD: DRACO,v 1.60 2002/01/27 13:36:59 is Exp $ +# $NetBSD: DRACO,v 1.61 2002/02/13 12:09:25 is Exp $ # # This file was automatically created. Changes will be # lost when running make in this directory. # -# Created from: #NetBSD: GENERIC,v 1.173 2002/01/27 13:27:51 is Exp $ +# Created from: #NetBSD: GENERIC,v 1.174 2002/02/13 12:08:57 is Exp $ #GENERIC machine description file @@ -24,7 +24,7 @@ #device. include "arch/amiga/conf/std.amiga" -#ident "GENERIC-$Revision: 1.60 $" +#ident "GENERIC-$Revision: 1.61 $" maxusers 8 options RTC_OFFSET=0 @@ -108,7 +108,8 @@ options COMPAT_SUNOS # Support to run Sun (m68k) executables options COMPAT_SVR4 # Support to run SVR4 (m68k) executables options COMPAT_NOMID # allow nonvalid machine id executables #options COMPAT_LINUX # Support to run Linux/m68k executables -options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) + +options EXEC_AOUT # 32-bit aout executables (NetBSD-1.5.x) #Support for System V IPC facilities. diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC index c9a3d428cf40..8357bf994a56 100644 --- a/sys/arch/amiga/conf/GENERIC +++ b/sys/arch/amiga/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.173 2002/01/27 13:27:51 is Exp $ +# $NetBSD: GENERIC,v 1.174 2002/02/13 12:08:57 is Exp $ # # GENERIC machine description file # @@ -34,7 +34,7 @@ include "arch/amiga/conf/std.amiga" -#ident "GENERIC-$Revision: 1.173 $" +#ident "GENERIC-$Revision: 1.174 $" #ifdef INSTALL_CONFIGURATION makeoptions COPTS="-Os" @@ -155,9 +155,10 @@ options COMPAT_SUNOS # Support to run Sun (m68k) executables options COMPAT_SVR4 # Support to run SVR4 (m68k) executables options COMPAT_NOMID # allow nonvalid machine id executables #options COMPAT_LINUX # Support to run Linux/m68k executables -options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) #endif +options EXEC_AOUT # 32-bit aout executables (NetBSD-1.5.x) + #ifndef INSTALL_CONFIGURATION # # Support for System V IPC facilities. diff --git a/sys/arch/amiga/conf/INSTALL b/sys/arch/amiga/conf/INSTALL index d8860f2da3a6..6c86390d480c 100644 --- a/sys/arch/amiga/conf/INSTALL +++ b/sys/arch/amiga/conf/INSTALL @@ -1,9 +1,9 @@ -# $NetBSD: INSTALL,v 1.22 2002/01/27 13:36:59 is Exp $ +# $NetBSD: INSTALL,v 1.23 2002/02/13 12:09:25 is Exp $ # # This file was automatically created. Changes will be # lost when running make in this directory. # -# Created from: #NetBSD: GENERIC,v 1.173 2002/01/27 13:27:51 is Exp $ +# Created from: #NetBSD: GENERIC,v 1.174 2002/02/13 12:08:57 is Exp $ #GENERIC machine description file @@ -24,7 +24,7 @@ #device. include "arch/amiga/conf/std.amiga" -#ident "GENERIC-$Revision: 1.22 $" +#ident "GENERIC-$Revision: 1.23 $" makeoptions COPTS="-Os" @@ -90,6 +90,8 @@ file-system KERNFS # kernel data-structure filesystem #Compatibility options for various existing systems +options EXEC_AOUT # 32-bit aout executables (NetBSD-1.5.x) + #Support for various kernel options #options INSECURE # disable kernel security levels diff --git a/sys/arch/amiga/conf/std.amiga b/sys/arch/amiga/conf/std.amiga index 18f13e77c65e..7f8882c52660 100644 --- a/sys/arch/amiga/conf/std.amiga +++ b/sys/arch/amiga/conf/std.amiga @@ -1,4 +1,4 @@ -# $NetBSD: std.amiga,v 1.18 2000/06/22 20:27:50 fvdl Exp $ +# $NetBSD: std.amiga,v 1.19 2002/02/13 12:08:57 is Exp $ # standard amiga information @@ -10,5 +10,5 @@ clock0 at mainbus0 kbd0 at mainbus0 zbus0 at mainbus0 -options EXEC_AOUT +options EXEC_ELF32 options EXEC_SCRIPT