[src/trunk]: src/sys/arch Revert back to a machinearch (really cputype) of mi...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/27bd7124ecb6
branches:  trunk
changeset: 499990:27bd7124ecb6
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Dec 03 07:05:21 2000 +0000

description:
Revert back to a machinearch (really cputype) of mips.  Put ENDIAN back.

diffstat:

 sys/arch/arc/conf/std.arc           |   5 ++++-
 sys/arch/cobalt/conf/std.cobalt     |   5 ++++-
 sys/arch/hpcmips/conf/std.hpcmips   |   5 ++++-
 sys/arch/mips/conf/Makefile.mips    |  18 +++++++++---------
 sys/arch/mipsco/conf/std.mipsco     |   5 +++--
 sys/arch/newsmips/conf/std.newsmips |   5 +++--
 sys/arch/sgimips/conf/std.sgimips   |   5 +++--
 7 files changed, 30 insertions(+), 18 deletions(-)

diffs (168 lines):

diff -r da7a61a09273 -r 27bd7124ecb6 sys/arch/arc/conf/std.arc
--- a/sys/arch/arc/conf/std.arc Sun Dec 03 06:43:36 2000 +0000
+++ b/sys/arch/arc/conf/std.arc Sun Dec 03 07:05:21 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: std.arc,v 1.10 2000/06/22 20:27:50 fvdl Exp $
+#      $NetBSD: std.arc,v 1.11 2000/12/03 07:05:21 matt Exp $
 # standard arc info
 
 machine arc mips
@@ -20,3 +20,6 @@
 options        MIPS3_L2CACHE_ABSENT    # may not have L2 cache
 
 options        __NO_SOFT_SERIAL_INTERRUPT      # for "com" driver
+
+makeoptions    DEFTEXTADDR="0x80200000"
+makeoptions    ENDIAN="-EL"
diff -r da7a61a09273 -r 27bd7124ecb6 sys/arch/cobalt/conf/std.cobalt
--- a/sys/arch/cobalt/conf/std.cobalt   Sun Dec 03 06:43:36 2000 +0000
+++ b/sys/arch/cobalt/conf/std.cobalt   Sun Dec 03 07:05:21 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: std.cobalt,v 1.2 2000/06/22 20:27:51 fvdl Exp $
+#      $NetBSD: std.cobalt,v 1.3 2000/12/03 07:05:22 matt Exp $
 
 machine cobalt mips
 
@@ -10,3 +10,6 @@
 options        EXEC_SCRIPT     # exec #! scripts
 
 options __NO_SOFT_SERIAL_INTERRUPT
+
+makeoptions    DEFTEXTADDR="0x80001000"
+makeoptions    ENDIAN="-EL"
diff -r da7a61a09273 -r 27bd7124ecb6 sys/arch/hpcmips/conf/std.hpcmips
--- a/sys/arch/hpcmips/conf/std.hpcmips Sun Dec 03 06:43:36 2000 +0000
+++ b/sys/arch/hpcmips/conf/std.hpcmips Sun Dec 03 07:05:21 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: std.hpcmips,v 1.5 2000/06/22 20:27:52 fvdl Exp $
+#      $NetBSD: std.hpcmips,v 1.6 2000/12/03 07:05:22 matt Exp $
 # standard, required hpcmips info
 
 machine hpcmips mips
@@ -9,3 +9,6 @@
 # Standard exec-package options
 options                EXEC_ELF32              # native exec format
 options                EXEC_SCRIPT             # may be unsafe
+
+makeoptions    DEFTEXTADDR="0x80003000"
+makeoptions    ENDIAN="-EL"
diff -r da7a61a09273 -r 27bd7124ecb6 sys/arch/mips/conf/Makefile.mips
--- a/sys/arch/mips/conf/Makefile.mips  Sun Dec 03 06:43:36 2000 +0000
+++ b/sys/arch/mips/conf/Makefile.mips  Sun Dec 03 07:05:21 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mips,v 1.4 2000/12/03 06:04:50 matt Exp $
+#      $NetBSD: Makefile.mips,v 1.5 2000/12/03 07:05:23 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -42,12 +42,12 @@
 .ifndef S
 S=     ../../../..
 .endif
-THISMIPS=      $S/arch/${MACHINE}
+THISMIPS=      $S/arch/${TARGET_MACHINE}
 MIPS=          $S/arch/mips
 
 HAVE_EGCS!=    ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
 INCLUDES=      -I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${MACHINE}
+CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${TARGET_MACHINE}
 CWARNFLAGS?=   -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes \
                -Wpointer-arith
 # XXX Delete -Wuninitialized for now, since the compiler doesn't
@@ -61,7 +61,7 @@
                -mno-abicalls -mno-half-pic
 AFLAGS=                -x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS+=    -Ttext ${TEXTADDR} -e start ${GP}
-.if (${MACHINE_ARCH} == "mipseb")
+.if (${ENDIAN} == "-EB")
 LINKFLAGS+=    -T ${MIPS}/conf/kern.ldscript.be
 CFLAGS+=       -EB
 AFLAGS+=       -EB
@@ -74,8 +74,8 @@
 .endif
 STRIPFLAGS=    -g -X -x
 
-.if exists(${THISMIPS}/conf/Makefile.${MACHINE}.inc)
-.include "${THISMIPS}/conf/Makefile.${MACHINE}.inc"
+.if exists(${THISMIPS}/conf/Makefile.${TARGET_MACHINE}.inc)
+.include "${THISMIPS}/conf/Makefile.${TARGET_MACHINE}.inc"
 .endif
 
 %INCLUDES
@@ -203,7 +203,7 @@
        sh makelinks && rm -f dontlink
 
 SRCS=  ${MIPS}/mips/locore.S \
-       ${THISMIPS}/${MACHINE}/locore_machdep.S \
+       ${THISMIPS}/${TARGET_MACHINE}/locore_machdep.S \
        param.c ioconf.c ${CFILES} ${SFILES}
 .if !empty(IDENT:M-DMIPS1)
 SRCS+= ${MIPS}/mips/locore_mips1.S
@@ -227,7 +227,7 @@
 .if !empty(IDENT:M-DNOFPU)
        ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${MIPS}/mips/fp.S
 .endif
-       ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${THISMIPS}/${MACHINE}/locore_machdep.S
+       ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${THISMIPS}/${TARGET_MACHINE}/locore_machdep.S
        ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 .if (${SFILES} != "")
        ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
@@ -267,7 +267,7 @@
 fp.o: ${MIPS}/mips/fp.S assym.h
        ${NORMAL_S}
 
-locore_machdep.o: ${THISMIPS}/${MACHINE}/locore_machdep.S assym.h
+locore_machdep.o: ${THISMIPS}/${TARGET_MACHINE}/locore_machdep.S assym.h
        ${NORMAL_S}
 
 # The install target can be redefined by putting a
diff -r da7a61a09273 -r 27bd7124ecb6 sys/arch/mipsco/conf/std.mipsco
--- a/sys/arch/mipsco/conf/std.mipsco   Sun Dec 03 06:43:36 2000 +0000
+++ b/sys/arch/mipsco/conf/std.mipsco   Sun Dec 03 07:05:21 2000 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: std.mipsco,v 1.3 2000/12/03 05:30:31 matt Exp $
+#      $NetBSD: std.mipsco,v 1.4 2000/12/03 07:05:23 matt Exp $
 
-machine mipsco mipseb
+machine mipsco mips
 
 options        EXEC_ELF32      # exec ELF32 binaries
 options        EXEC_SCRIPT     # exec #! scripts
 
 makeoptions    DEFTEXTADDR="0x80021000"
 makeoptions    LINKFLAGS="-N"
+makeoptions    ENDIAN="-EB"
diff -r da7a61a09273 -r 27bd7124ecb6 sys/arch/newsmips/conf/std.newsmips
--- a/sys/arch/newsmips/conf/std.newsmips       Sun Dec 03 06:43:36 2000 +0000
+++ b/sys/arch/newsmips/conf/std.newsmips       Sun Dec 03 07:05:21 2000 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: std.newsmips,v 1.9 2000/12/03 05:30:31 matt Exp $
+#      $NetBSD: std.newsmips,v 1.10 2000/12/03 07:05:23 matt Exp $
 
-machine newsmips mipseb
+machine newsmips mips
 
 options        EXEC_ELF32      # exec ELF32 binaries
 options        EXEC_SCRIPT     # exec #! scripts
 
 makeoptions    DEFTEXTADDR="0x80001000"
 makeoptions    LINKFLAGS="-N"
+makeoptions    ENDIAN="-EB"
diff -r da7a61a09273 -r 27bd7124ecb6 sys/arch/sgimips/conf/std.sgimips
--- a/sys/arch/sgimips/conf/std.sgimips Sun Dec 03 06:43:36 2000 +0000
+++ b/sys/arch/sgimips/conf/std.sgimips Sun Dec 03 07:05:21 2000 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: std.sgimips,v 1.5 2000/12/03 05:30:31 matt Exp $
+#      $NetBSD: std.sgimips,v 1.6 2000/12/03 07:05:23 matt Exp $
 
-machine sgimips mipseb
+machine sgimips mips
 
 options        EXEC_ELF32      # exec ELF32 binaries
 options        EXEC_SCRIPT     # exec #! scripts
@@ -16,3 +16,4 @@
 options TLP_MATCH_21142
 
 makeoptions    DEFTEXTADDR="0x80002000"
+makeoptions    ENDIAN="-EB"