diff --git a/sys/arch/x68k/conf/ALL b/sys/arch/x68k/conf/ALL index 3b386447ba33..e8da3c4f5b3c 100644 --- a/sys/arch/x68k/conf/ALL +++ b/sys/arch/x68k/conf/ALL @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.45 2001/11/25 01:27:49 minoura Exp $ +# $NetBSD: ALL,v 1.46 2001/12/06 04:13:12 minoura Exp $ # # ALL -- everything that currently exist including experimental @@ -6,7 +6,7 @@ include "arch/x68k/conf/std.x68k" -#ident "ALL-$Revision: 1.45 $" +#ident "ALL-$Revision: 1.46 $" maxusers 32 @@ -136,11 +136,11 @@ options COMPAT_11 # NetBSD 1.1 binary compatibility options COMPAT_12 # NetBSD 1.2 binary compatibility options COMPAT_13 # NetBSD 1.3 binary compatibility options COMPAT_14 # NetBSD 1.4 binary compatibility +#options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out options COMPAT_M68K4K # NetBSD/m68k4k binaries #options COMPAT_SUNOS # SunOS 4.x binary compatibility; broken options COMPAT_SVR4 # SVR4 binary compatibility; broken options COMPAT_LINUX # Linux/m68k binary compatibility -options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. ## File systems. diff --git a/sys/arch/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC index 604e6f2e290e..f6a8d6bcff0f 100644 --- a/sys/arch/x68k/conf/GENERIC +++ b/sys/arch/x68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.67 2001/11/25 01:23:45 minoura Exp $ +# $NetBSD: GENERIC,v 1.68 2001/12/06 04:13:12 minoura Exp $ # # GENERIC @@ -6,7 +6,7 @@ include "arch/x68k/conf/std.x68k" -#ident "GENERIC-$Revision: 1.67 $" +#ident "GENERIC-$Revision: 1.68 $" maxusers 8 @@ -136,11 +136,11 @@ options COMPAT_11 # NetBSD 1.1 binary compatibility options COMPAT_12 # NetBSD 1.2 binary compatibility options COMPAT_13 # NetBSD 1.3 binary compatibility options COMPAT_14 # NetBSD 1.4 binary compatibility +#options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out #options COMPAT_M68K4K # NetBSD/m68k4k binaries #options COMPAT_SUNOS # SunOS 4.x binary compatibility; broken #options COMPAT_SVR4 # SVR4 binary compatibility; broken #options COMPAT_LINUX # Linux/m68k binary compatibility -#options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. ## File systems. diff --git a/sys/arch/x68k/conf/INSTALL b/sys/arch/x68k/conf/INSTALL index 934fa35a03cd..47821880736e 100644 --- a/sys/arch/x68k/conf/INSTALL +++ b/sys/arch/x68k/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.44 2001/11/25 05:21:12 isaki Exp $ +# $NetBSD: INSTALL,v 1.45 2001/12/06 04:13:12 minoura Exp $ # # INSTALL -- installation kernel. @@ -6,7 +6,7 @@ include "arch/x68k/conf/std.x68k" -#ident "INSTALL-$Revision: 1.44 $" +#ident "INSTALL-$Revision: 1.45 $" makeoptions COPTS="-Os" # Optimise for space. Implies -O2 @@ -18,7 +18,7 @@ options MEMORY_DISK_IS_ROOT # Force root on memory-disk options MEMORY_DISK_SERVER=0 # No user space hooks #options MINIROOTSIZE=2400 # 1.2M, same as a 130mm floppy #options MINIROOTSIZE=2880 # 1.44M, same as a 90mm floppy -options MINIROOTSIZE=2400 +options MINIROOTSIZE=2550 ## System kernel configuration. See options(4) for more detail. @@ -142,11 +142,11 @@ options RTC_OFFSET=-540 # hardware clock is this many mins. west of GMT #options COMPAT_12 # NetBSD 1.2 binary compatibility #options COMPAT_13 # NetBSD 1.3 binary compatibility #options COMPAT_14 # NetBSD 1.4 binary compatibility +#options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out #options COMPAT_M68K4K # NetBSD/m68k4k binaries #options COMPAT_SUNOS # SunOS 4.x binary compatibility; broken #options COMPAT_SVR4 # SVR4 binary compatibility; broken #options COMPAT_LINUX # Linux/m68k binary compatibility -#options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. ## File systems. diff --git a/sys/arch/x68k/conf/TOKOCHAN b/sys/arch/x68k/conf/TOKOCHAN index 790a84233782..554b3d49f181 100644 --- a/sys/arch/x68k/conf/TOKOCHAN +++ b/sys/arch/x68k/conf/TOKOCHAN @@ -1,4 +1,4 @@ -# $NetBSD: TOKOCHAN,v 1.22 2001/11/25 01:27:49 minoura Exp $ +# $NetBSD: TOKOCHAN,v 1.23 2001/12/06 04:13:12 minoura Exp $ # # TOKOCHAN -- Believe in the BSD power; Toko to issyo-ni make all! @@ -6,7 +6,7 @@ include "arch/x68k/conf/std.x68k" -#ident "TOKOCHAN-$Revision: 1.22 $" +#ident "TOKOCHAN-$Revision: 1.23 $" maxusers 10 @@ -137,11 +137,11 @@ options COMPAT_43 # 4.3BSD system interfaces #options COMPAT_12 # NetBSD 1.2 binary compatibility options COMPAT_13 # NetBSD 1.3 binary compatibility options COMPAT_14 # NetBSD 1.4 binary compatibility +#options COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out #options COMPAT_M68K4K # NetBSD/m68k4k binaries #options COMPAT_SUNOS # SunOS 4.x binary compatibility; broken #options COMPAT_SVR4 # SVR4 binary compatibility; broken #options COMPAT_LINUX # Linux/m68k binary compatibility -#options EXEC_ELF32 # 32-bit ELF executables (Linux, SVR4) #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. ## File systems. diff --git a/sys/arch/x68k/conf/std.x68k b/sys/arch/x68k/conf/std.x68k index 77e029867f66..23604949f71d 100644 --- a/sys/arch/x68k/conf/std.x68k +++ b/sys/arch/x68k/conf/std.x68k @@ -1,4 +1,4 @@ -# $NetBSD: std.x68k,v 1.9 2000/06/22 20:27:57 fvdl Exp $ +# $NetBSD: std.x68k,v 1.10 2001/12/06 04:13:12 minoura Exp $ # # Mandatory NetBSD/x68k kernel options. @@ -6,6 +6,7 @@ machine x68k m68k # Machine architecture; required by config(8) +options EXEC_ELF32 # execve(2) support for ELF binaries options EXEC_AOUT # execve(2) support for a.out binaries options EXEC_SCRIPT # execve(2) support for scripts diff --git a/sys/arch/x68k/include/db_machdep.h b/sys/arch/x68k/include/db_machdep.h index c858956f82b4..dc98d00942c4 100644 --- a/sys/arch/x68k/include/db_machdep.h +++ b/sys/arch/x68k/include/db_machdep.h @@ -1,4 +1,7 @@ -/* $NetBSD: db_machdep.h,v 1.1.1.1 1996/05/05 12:17:03 oki Exp $ */ +/* $NetBSD: db_machdep.h,v 1.2 2001/12/06 04:13:12 minoura Exp $ */ /* Just use the common m68k definition */ #include + +#define DB_ELF_SYMBOLS +#define DB_ELFSIZE 32