Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Remove the explicit `makeoptions MACHINE_ARCH="mips...
details: https://anonhg.NetBSD.org/src/rev/272f46afd052
branches: trunk
changeset: 540327:272f46afd052
user: simonb <simonb%NetBSD.org@localhost>
date: Mon Dec 09 22:54:09 2002 +0000
description:
Remove the explicit `makeoptions MACHINE_ARCH="mipse{b,l}"' for kernel
builds and use the endianness of the toolchain being used to determine
the endianness of the kernel.
diffstat:
sys/arch/algor/conf/std.algor | 3 +-
sys/arch/arc/conf/std.arc | 3 +-
sys/arch/cobalt/conf/std.cobalt | 3 +-
sys/arch/evbmips/conf/MALTA | 7 ++---
sys/arch/evbmips/conf/PB1000 | 7 ++---
sys/arch/evbmips/conf/std.malta | 16 +++++++++++++++
sys/arch/evbmips/conf/std.malta.common | 16 ---------------
sys/arch/evbmips/conf/std.malta.eb | 5 ----
sys/arch/evbmips/conf/std.malta.el | 5 ----
sys/arch/evbmips/conf/std.pb1000 | 17 ++++++++++++++++
sys/arch/evbmips/conf/std.pb1000.common | 17 ----------------
sys/arch/evbmips/conf/std.pb1000.eb | 5 ----
sys/arch/evbmips/conf/std.pb1000.el | 5 ----
sys/arch/hpcmips/conf/std.hpcmips | 3 +-
sys/arch/mips/conf/Makefile.mips | 30 +++++++---------------------
sys/arch/mipsco/conf/std.mipsco | 3 +-
sys/arch/newsmips/conf/std.newsmips | 3 +-
sys/arch/playstation2/conf/std.playstation2 | 3 +-
sys/arch/pmax/conf/std.pmax | 3 +-
sys/arch/sbmips/conf/GENERIC | 7 ++---
sys/arch/sbmips/conf/std.sbmips | 13 ++++++++++++
sys/arch/sbmips/conf/std.sbmips.common | 13 ------------
sys/arch/sbmips/conf/std.sbmips.eb | 5 ----
sys/arch/sbmips/conf/std.sbmips.el | 5 ----
sys/arch/sgimips/conf/std.sgimips | 3 +-
25 files changed, 72 insertions(+), 128 deletions(-)
diffs (truncated from 413 to 300 lines):
diff -r 44699565f523 -r 272f46afd052 sys/arch/algor/conf/std.algor
--- a/sys/arch/algor/conf/std.algor Mon Dec 09 22:28:21 2002 +0000
+++ b/sys/arch/algor/conf/std.algor Mon Dec 09 22:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.algor,v 1.4 2001/10/23 20:40:00 thorpej Exp $
+# $NetBSD: std.algor,v 1.5 2002/12/09 22:54:09 simonb Exp $
machine algor mips
@@ -10,4 +10,3 @@
options MIPS3_ENABLE_CLOCK_INTR
makeoptions DEFTEXTADDR="0x80100000"
-makeoptions MACHINE_ARCH="mipsel"
diff -r 44699565f523 -r 272f46afd052 sys/arch/arc/conf/std.arc
--- a/sys/arch/arc/conf/std.arc Mon Dec 09 22:28:21 2002 +0000
+++ b/sys/arch/arc/conf/std.arc Mon Dec 09 22:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.arc,v 1.12 2001/10/23 20:40:01 thorpej Exp $
+# $NetBSD: std.arc,v 1.13 2002/12/09 22:54:09 simonb Exp $
# standard arc info
machine arc mips
@@ -22,4 +22,3 @@
options __NO_SOFT_SERIAL_INTERRUPT # for "com" driver
makeoptions DEFTEXTADDR="0x80200000"
-makeoptions MACHINE_ARCH="mipsel"
diff -r 44699565f523 -r 272f46afd052 sys/arch/cobalt/conf/std.cobalt
--- a/sys/arch/cobalt/conf/std.cobalt Mon Dec 09 22:28:21 2002 +0000
+++ b/sys/arch/cobalt/conf/std.cobalt Mon Dec 09 22:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.cobalt,v 1.5 2001/11/20 12:56:24 lukem Exp $
+# $NetBSD: std.cobalt,v 1.6 2002/12/09 22:54:10 simonb Exp $
machine cobalt mips
@@ -12,4 +12,3 @@
options __NO_SOFT_SERIAL_INTERRUPT
makeoptions DEFTEXTADDR="0x80001000"
-makeoptions MACHINE_ARCH="mipsel"
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/MALTA
--- a/sys/arch/evbmips/conf/MALTA Mon Dec 09 22:28:21 2002 +0000
+++ b/sys/arch/evbmips/conf/MALTA Mon Dec 09 22:54:09 2002 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: MALTA,v 1.11 2002/09/18 02:43:57 lukem Exp $
+# $NetBSD: MALTA,v 1.12 2002/12/09 22:54:10 simonb Exp $
-#include "arch/evbmips/conf/std.malta.eb" # big-endian mode
-include "arch/evbmips/conf/std.malta.el" # little-endian mode
+include "arch/evbmips/conf/std.malta"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.11 $"
+#ident "GENERIC-$Revision: 1.12 $"
maxusers 32
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/PB1000
--- a/sys/arch/evbmips/conf/PB1000 Mon Dec 09 22:28:21 2002 +0000
+++ b/sys/arch/evbmips/conf/PB1000 Mon Dec 09 22:54:09 2002 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: PB1000,v 1.3 2002/12/09 06:54:25 simonb Exp $
+# $NetBSD: PB1000,v 1.4 2002/12/09 22:54:10 simonb Exp $
#
# Kernel config for the Alchemy Semiconductor (AMD) PB1000 and PB1500
# evaluation boards.
-#include "arch/evbmips/conf/std.pb1000.eb" # big-endian mode
-include "arch/evbmips/conf/std.pb1000.el" # little-endian mode
+include "arch/evbmips/conf/std.pb1000"
-#ident "GENERIC-$Revision: 1.3 $"
+#ident "GENERIC-$Revision: 1.4 $"
maxusers 32
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/std.malta
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbmips/conf/std.malta Mon Dec 09 22:54:09 2002 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: std.malta,v 1.3 2002/12/09 22:54:10 simonb Exp $
+
+machine evbmips mips
+
+options MIPS3_ENABLE_CLOCK_INTR
+
+# Platform support
+options MIPS_MALTA
+
+options EXEC_ELF32 # exec ELF32 binaries
+options EXEC_SCRIPT # exec #! scripts
+
+makeoptions DEFTEXTADDR="0x80100000"
+makeoptions BOARDTYPE="malta"
+
+include "arch/evbmips/conf/files.malta"
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/std.malta.common
--- a/sys/arch/evbmips/conf/std.malta.common Mon Dec 09 22:28:21 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: std.malta.common,v 1.1 2002/03/23 14:51:29 simonb Exp $
-
-machine evbmips mips
-
-options MIPS3_ENABLE_CLOCK_INTR
-
-# Platform support
-options MIPS_MALTA
-
-options EXEC_ELF32 # exec ELF32 binaries
-options EXEC_SCRIPT # exec #! scripts
-
-makeoptions DEFTEXTADDR="0x80100000"
-makeoptions BOARDTYPE="malta"
-
-include "arch/evbmips/conf/files.malta"
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/std.malta.eb
--- a/sys/arch/evbmips/conf/std.malta.eb Mon Dec 09 22:28:21 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: std.malta.eb,v 1.1 2002/03/23 14:51:29 simonb Exp $
-
-include "arch/evbmips/conf/std.malta.common"
-
-makeoptions MACHINE_ARCH="mipseb"
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/std.malta.el
--- a/sys/arch/evbmips/conf/std.malta.el Mon Dec 09 22:28:21 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: std.malta.el,v 1.1 2002/03/23 14:51:29 simonb Exp $
-
-include "arch/evbmips/conf/std.malta.common"
-
-makeoptions MACHINE_ARCH="mipsel"
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/std.pb1000
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbmips/conf/std.pb1000 Mon Dec 09 22:54:09 2002 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: std.pb1000,v 1.1 2002/12/09 22:54:11 simonb Exp $
+
+machine evbmips mips
+
+options MIPS3_ENABLE_CLOCK_INTR
+
+# Platform support
+options ALCHEMY_PB1000
+
+options EXEC_ELF32 # exec ELF32 binaries
+options EXEC_SCRIPT # exec #! scripts
+
+makeoptions DEFTEXTADDR="0x800a0000"
+makeoptions BOARDTYPE="pb1000"
+
+include "arch/evbmips/conf/files.pb1000"
+include "arch/mips/conf/files.alchemy"
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/std.pb1000.common
--- a/sys/arch/evbmips/conf/std.pb1000.common Mon Dec 09 22:28:21 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: std.pb1000.common,v 1.1 2002/07/29 16:23:01 simonb Exp $
-
-machine evbmips mips
-
-options MIPS3_ENABLE_CLOCK_INTR
-
-# Platform support
-options ALCHEMY_PB1000
-
-options EXEC_ELF32 # exec ELF32 binaries
-options EXEC_SCRIPT # exec #! scripts
-
-makeoptions DEFTEXTADDR="0x800a0000"
-makeoptions BOARDTYPE="pb1000"
-
-include "arch/evbmips/conf/files.pb1000"
-include "arch/mips/conf/files.alchemy"
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/std.pb1000.eb
--- a/sys/arch/evbmips/conf/std.pb1000.eb Mon Dec 09 22:28:21 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: std.pb1000.eb,v 1.1 2002/07/29 16:23:02 simonb Exp $
-
-include "arch/evbmips/conf/std.pb1000.common"
-
-makeoptions MACHINE_ARCH="mipseb"
diff -r 44699565f523 -r 272f46afd052 sys/arch/evbmips/conf/std.pb1000.el
--- a/sys/arch/evbmips/conf/std.pb1000.el Mon Dec 09 22:28:21 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# $NetBSD: std.pb1000.el,v 1.1 2002/07/29 16:23:02 simonb Exp $
-
-include "arch/evbmips/conf/std.pb1000.common"
-
-makeoptions MACHINE_ARCH="mipsel"
diff -r 44699565f523 -r 272f46afd052 sys/arch/hpcmips/conf/std.hpcmips
--- a/sys/arch/hpcmips/conf/std.hpcmips Mon Dec 09 22:28:21 2002 +0000
+++ b/sys/arch/hpcmips/conf/std.hpcmips Mon Dec 09 22:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.hpcmips,v 1.15 2002/02/11 19:10:29 uch Exp $
+# $NetBSD: std.hpcmips,v 1.16 2002/12/09 22:54:13 simonb Exp $
# standard, required hpcmips info
machine hpcmips mips
@@ -14,5 +14,4 @@
options EXEC_SCRIPT # may be unsafe
makeoptions DEFTEXTADDR="0x80001000"
-makeoptions MACHINE_ARCH="mipsel"
makeoptions DEFCOPTS="-Os -mmemcpy"
diff -r 44699565f523 -r 272f46afd052 sys/arch/mips/conf/Makefile.mips
--- a/sys/arch/mips/conf/Makefile.mips Mon Dec 09 22:28:21 2002 +0000
+++ b/sys/arch/mips/conf/Makefile.mips Mon Dec 09 22:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.31 2002/11/09 20:34:26 thorpej Exp $
+# $NetBSD: Makefile.mips,v 1.32 2002/12/09 22:54:14 simonb Exp $
# Makefile for NetBSD
#
@@ -24,15 +24,6 @@
##
## (1) port identification
##
-.if ${MACHINE_ARCH} == "mipsel"
-ENDIAN=-EL
-.elif ${MACHINE_ARCH} == "mipseb"
-ENDIAN=-EB
-.else
-.BEGIN:
- @echo "MACHINE_ARCH ${MACHINE_ARCH} is invalid"
- @false
-.endif
.ifndef S
S= ../../../..
.endif
@@ -47,8 +38,8 @@
CPPFLAGS+= -D${MACHINE}
DEFGP?= -G 0
GP?= ${DEFGP}
-CFLAGS+= ${ENDIAN} ${GP} -mno-abicalls -msoft-float
-AFLAGS+= ${ENDIAN} -mno-abicalls -x assembler-with-cpp -traditional-cpp
+CFLAGS+= ${GP} -mno-abicalls -msoft-float
+AFLAGS+= -mno-abicalls -x assembler-with-cpp -traditional-cpp
##
## (3) libkern and compat
@@ -70,18 +61,13 @@
##
## (5) link settings
##
-TEXTADDR?= ${DEFTEXTADDR}
-KERNLDSCRIPT?= ${MIPS}/conf/kern.ldscript
+TEXTADDR?= ${DEFTEXTADDR}
+KERNLDSCRIPT?= ${MIPS}/conf/kern.ldscript
# some mips ports specify a "magic" format
-LINKFORMAT+= -T ${KERNLDSCRIPT}
-EXTRA_LINKFLAGS= ${ENDIAN} ${GP}
-.if (${ENDIAN} == "-EB")
-EXTRA_LINKFLAGS+= --oformat elf32-bigmips
-.else
-EXTRA_LINKFLAGS+= --oformat elf32-littlemips
-.endif
+LINKFORMAT+= -T ${KERNLDSCRIPT}
+EXTRA_LINKFLAGS= ${GP}
LINKFLAGS_NORMAL= -x
-STRIPFLAGS= -g -X -x
+STRIPFLAGS= -g -X -x
##
## (6) port specific target dependencies
diff -r 44699565f523 -r 272f46afd052 sys/arch/mipsco/conf/std.mipsco
--- a/sys/arch/mipsco/conf/std.mipsco Mon Dec 09 22:28:21 2002 +0000
+++ b/sys/arch/mipsco/conf/std.mipsco Mon Dec 09 22:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.mipsco,v 1.7 2001/12/09 05:00:46 atatat Exp $
+# $NetBSD: std.mipsco,v 1.8 2002/12/09 22:54:15 simonb Exp $
machine mipsco mips
@@ -7,4 +7,3 @@
makeoptions DEFTEXTADDR="0x80021000"
makeoptions LINKFORMAT="-N"
-makeoptions MACHINE_ARCH="mipseb"
diff -r 44699565f523 -r 272f46afd052 sys/arch/newsmips/conf/std.newsmips
--- a/sys/arch/newsmips/conf/std.newsmips Mon Dec 09 22:28:21 2002 +0000
+++ b/sys/arch/newsmips/conf/std.newsmips Mon Dec 09 22:54:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: std.newsmips,v 1.13 2001/12/09 05:00:48 atatat Exp $
+# $NetBSD: std.newsmips,v 1.14 2002/12/09 22:54:15 simonb Exp $
machine newsmips mips
@@ -7,4 +7,3 @@
makeoptions DEFTEXTADDR="0x80001000"
makeoptions LINKFORMAT="-N"
-makeoptions MACHINE_ARCH="mipseb"
Home |
Main Index |
Thread Index |
Old Index