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.
This commit is contained in:
simonb 2002-12-09 22:54:09 +00:00
parent 33736c059a
commit 6a5e492b57
22 changed files with 29 additions and 85 deletions

View File

@ -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 # All supported Algor boards are MIPS3
options MIPS3_ENABLE_CLOCK_INTR
makeoptions DEFTEXTADDR="0x80100000"
makeoptions MACHINE_ARCH="mipsel"

View File

@ -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 MIPS3_L2CACHE_ABSENT # may not have L2 cache
options __NO_SOFT_SERIAL_INTERRUPT # for "com" driver
makeoptions DEFTEXTADDR="0x80200000"
makeoptions MACHINE_ARCH="mipsel"

View File

@ -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 EXEC_SCRIPT # exec #! scripts
options __NO_SOFT_SERIAL_INTERRUPT
makeoptions DEFTEXTADDR="0x80001000"
makeoptions MACHINE_ARCH="mipsel"

View File

@ -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

View File

@ -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

View File

@ -1,4 +1,4 @@
# $NetBSD: std.malta.common,v 1.1 2002/03/23 14:51:29 simonb Exp $
# $NetBSD: std.malta,v 1.3 2002/12/09 22:54:10 simonb Exp $
machine evbmips mips

View File

@ -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"

View File

@ -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"

View File

@ -1,4 +1,4 @@
# $NetBSD: std.pb1000.common,v 1.1 2002/07/29 16:23:01 simonb Exp $
# $NetBSD: std.pb1000,v 1.1 2002/12/09 22:54:11 simonb Exp $
machine evbmips mips

View File

@ -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"

View File

@ -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"

View File

@ -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_ELF32 # native exec format
options EXEC_SCRIPT # may be unsafe
makeoptions DEFTEXTADDR="0x80001000"
makeoptions MACHINE_ARCH="mipsel"
makeoptions DEFCOPTS="-Os -mmemcpy"

View File

@ -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 @@ NEED_OWN_INSTALL_TARGET?=no
##
## (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 @@ GENASSYM= ${MIPS}/mips/genassym.cf
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 @@ locore_machdep.o: ${THISMIPS}/${MACHINE}/locore_machdep.S assym.h
##
## (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

View File

@ -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 @@ options EXEC_SCRIPT # exec #! scripts
makeoptions DEFTEXTADDR="0x80021000"
makeoptions LINKFORMAT="-N"
makeoptions MACHINE_ARCH="mipseb"

View File

@ -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 @@ options EXEC_SCRIPT # exec #! scripts
makeoptions DEFTEXTADDR="0x80001000"
makeoptions LINKFORMAT="-N"
makeoptions MACHINE_ARCH="mipseb"

View File

@ -1,4 +1,4 @@
# $NetBSD: std.playstation2,v 1.4 2002/03/26 11:06:56 uch Exp $
# $NetBSD: std.playstation2,v 1.5 2002/12/09 22:54:15 simonb Exp $
machine playstation2 mips
@ -17,5 +17,4 @@ options __NO_LEADING_UNDERSCORES__
options __GP_SUPPORT__
makeoptions DEFTEXTADDR="0x80010000"
makeoptions MACHINE_ARCH="mipsel"
makeoptions DEFCOPTS="-Os -mmemcpy"

View File

@ -1,4 +1,4 @@
# $NetBSD: std.pmax,v 1.14 2001/10/23 20:40:02 thorpej Exp $
# $NetBSD: std.pmax,v 1.15 2002/12/09 22:54:16 simonb Exp $
# standard, required pmax info
machine pmax mips
@ -8,4 +8,3 @@ options EXEC_ELF32 # 32-bit ELF support (native format)
options EXEC_SCRIPT # exec of #! scripts
makeoptions DEFTEXTADDR="0x80030000"
makeoptions MACHINE_ARCH="mipsel"

View File

@ -1,11 +1,10 @@
# $NetBSD: GENERIC,v 1.17 2002/11/23 02:35:39 cgd Exp $
# $NetBSD: GENERIC,v 1.18 2002/12/09 22:54:16 simonb Exp $
include "arch/sbmips/conf/std.sbmips.eb" # big-endian mode
#include "arch/sbmips/conf/std.sbmips.el" # little-endian mode
include "arch/sbmips/conf/std.sbmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.17 $"
#ident "GENERIC-$Revision: 1.18 $"
#options LOCKDEBUG # XXX XXX XXX XXX
options DEBUG # extra kernel debugging support

View File

@ -1,4 +1,4 @@
# $NetBSD: std.sbmips.common,v 1.2 2002/11/15 01:03:53 simonb Exp $
# $NetBSD: std.sbmips,v 1.3 2002/12/09 22:54:16 simonb Exp $
machine sbmips mips

View File

@ -1,5 +0,0 @@
# $NetBSD: std.sbmips.eb,v 1.1 2002/03/17 11:00:23 simonb Exp $
include "arch/sbmips/conf/std.sbmips.common"
makeoptions MACHINE_ARCH="mipseb"

View File

@ -1,5 +0,0 @@
# $NetBSD: std.sbmips.el,v 1.1 2002/03/17 11:00:23 simonb Exp $
include "arch/sbmips/conf/std.sbmips.common"
makeoptions MACHINE_ARCH="mipsel"

View File

@ -1,4 +1,4 @@
# $NetBSD: std.sgimips,v 1.12 2001/11/22 01:11:51 soren Exp $
# $NetBSD: std.sgimips,v 1.13 2002/12/09 22:54:17 simonb Exp $
machine sgimips mips
@ -8,4 +8,3 @@ options EXEC_SCRIPT # exec #! scripts
options MIPS3_ENABLE_CLOCK_INTR
makeoptions DEFTEXTADDR="0x80069000"
makeoptions MACHINE_ARCH="mipseb"