diff options
31 files changed, 54 insertions, 47 deletions
@@ -132,20 +132,19 @@ _MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${ # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) -_TARGET_ARCH= ${TARGET:S/pc98/i386/:S/mips/mipsel/} +_TARGET_ARCH= ${TARGET:S/pc98/i386/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -_TARGET= ${TARGET_ARCH:C/mips.*e[lb]/mips/:C/armeb/arm/} +_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/} .endif -# Legacy names, for a transition period mips:mips -> mipsel:mips +# Legacy names, for another transition period mips:mips(n32|64)?eb -> mips:mips\1 .if defined(TARGET) && defined(TARGET_ARCH) && \ - ${TARGET_ARCH} == "mips" && ${TARGET} == "mips" -.warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb" -.if defined(TARGET_BIG_ENDIAN) -_TARGET_ARCH=mipseb -.else -_TARGET_ARCH=mipsel + ${TARGET} == "mips" && ${TARGET_ARCH:Mmips*eb} +_TARGET_ARCH= ${TARGET_ARCH:C/eb$//} +.warning "TARGET_ARCH of ${TARGET_ARCH} is deprecated in favor of ${_TARGET_ARCH}" .endif +.if defined(TARGET) && ${TARGET} == "mips" && defined(TARGET_BIG_ENDIAN) +.warning "TARGET_BIG_ENDIAN is no longer necessary for MIPS. Big-endian is not the default." .endif # arm with TARGET_BIG_ENDIAN -> armeb .if defined(TARGET_ARCH) && ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN) @@ -331,7 +330,7 @@ kernel-toolchains: .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 TARGET_ARCHES_arm?= arm armeb -TARGET_ARCHES_mips?= mipsel mipseb mips64el mips64eb mipsn32eb +TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 TARGET_ARCHES_pc98?= i386 .for target in ${TARGETS} diff --git a/Makefile.inc1 b/Makefile.inc1 index 09cc03c..195d161 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -136,7 +136,7 @@ VERSION!= uname -srp VERSION+= ${OSRELDATE} .endif -KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 mipsel/mips mipseb/mips mips64el/mips mips64eb/mips mipsn32el/mips mipsn32eb/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= amd64 arm armeb/arm i386 i386/pc98 ia64 mipsel/mips mips/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else @@ -22,6 +22,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW: machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20120328: + Big-endian MIPS TARGET_ARCH values no longer end in "eb". mips64eb + is now spelled mips64. mipsn32eb is now spelled mipsn32. mipseb is + now spelled mips. This is to aid compatibility with third-party + software that expects this naming scheme in uname(3). Little-endian + settings are unchanged. + 20120306: Disable by default the option VFS_ALLOW_NONMPSAFE for all supported platforms. diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 7f6fc0d..2296d19 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -122,7 +122,7 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c .if ${TARGET_CPUARCH} == mips LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c # ABIs other than o32 need this -.if ${TARGET_ARCH:Mmipse[lb]} == "" +.if ${TARGET_ARCH} != "mips" && ${TARGET_ARCH} != "mipsel" LIB2FUNCS_EXTRA+= floatdidf.c fixunsdfsi.c LIB2FUNCS_EXTRA+= floatdisf.c floatundidf.c LIB2FUNCS_EXTRA+= fixsfdi.c floatundisf.c diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0 index 7c91150..8ac7952 100644 --- a/gnu/usr.bin/binutils/Makefile.inc0 +++ b/gnu/usr.bin/binutils/Makefile.inc0 @@ -7,7 +7,7 @@ VERSION= "2.17.50 [FreeBSD] 2007-07-03" .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mips.*e[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} +TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/} .else TARGET_CPUARCH=${MACHINE_CPUARCH} .endif @@ -16,7 +16,8 @@ TARGET_VENDOR?= unknown TARGET_OS?= freebsd BINUTILS_ARCH=${TARGET_ARCH:C/amd64/x86_64/} TARGET_TUPLE?= ${BINUTILS_ARCH}-${TARGET_VENDOR}-${TARGET_OS} -.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH:Mmips*eb} != "" +.if ${TARGET_ARCH} == "armeb" || \ + (${TARGET_CPUARCH} == "mips" && ${TARGET_ARCH:Mmips*el} == "") TARGET_BIG_ENDIAN=t .endif diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt index e50abd0..3fd18e6 100644 --- a/gnu/usr.bin/cc/Makefile.tgt +++ b/gnu/usr.bin/cc/Makefile.tgt @@ -4,7 +4,7 @@ # MACHINE_CPUARCH, but there's no easy way to export make functions... .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mips.*e[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} +TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/} .else TARGET_CPUARCH=${MACHINE_CPUARCH} .endif @@ -17,7 +17,8 @@ TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD .if ${TARGET_ARCH} == "sparc64" TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc .endif -.if ${TARGET_ARCH} == "armeb" || ${TARGET_ARCH:Mmips*eb} != "" +.if ${TARGET_ARCH} == "armeb" || \ + (${TARGET_CPUARCH} == "mips" && ${TARGET_ARCH:Mmips*el} == "") TARGET_BIG_ENDIAN=t .endif .if ${TARGET_ARCH} == "powerpc64" diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc index 5b8bb9b..73d5863 100644 --- a/gnu/usr.bin/gdb/Makefile.inc +++ b/gnu/usr.bin/gdb/Makefile.inc @@ -20,7 +20,7 @@ OBJ_GDB= ${OBJ_ROOT}/gdb # MACHINE_CPUARCH, but there's no easy way to export make functions... .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mips.*e[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} +TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/} .else TARGET_CPUARCH=${MACHINE_CPUARCH} .endif diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile index ce16b2a..ec01a0e 100644 --- a/gnu/usr.bin/gdb/libgdb/Makefile +++ b/gnu/usr.bin/gdb/libgdb/Makefile @@ -4,7 +4,7 @@ # MACHINE_CPUARCH, but there's no easy way to export make functions... .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mips.*e[bl]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} +TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/} .else TARGET_CPUARCH=${MACHINE_CPUARCH} .endif diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile index 457b637..d17b6b8 100644 --- a/kerberos5/lib/libkafs5/Makefile +++ b/kerberos5/lib/libkafs5/Makefile @@ -10,8 +10,7 @@ MAN= kafs5.3 # Linking with libkrb5 uncovers a bug in binutils. # See http://repo.or.cz/w/binutils.git/commit/ee05170bf71819c99cb5a36a44735c231ae03c56 . # -.if ${MACHINE_ARCH} != "mipsn32eb" && ${MACHINE_ARCH} != "mipsel" && \ - ${MACHINE_ARCH} != "mipseb" && ${MACHINE_ARCH} != "mips" +.if ${MACHINE} != "mips" LDADD+= -lkrb5 LDFLAGS= -Wl,--no-undefined .endif diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 08e08c5..73e97cb 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -270,7 +270,7 @@ When set, it also enforces the following options: Set to not build the Clang C/C++ compiler. .Pp It is a default setting on -arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mipseb, mips/mips64el, mips/mips64eb, mips/mipsn32eb and sparc64/sparc64. +arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32eb and sparc64/sparc64. When set, it also enforces the following options: .Pp .Bl -item -compact @@ -384,7 +384,7 @@ Set to build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. .Pp It is a default setting on -arm/arm, arm/armeb, mips/mipsel, mips/mipseb, mips/mips64el, mips/mips64eb, mips/mipsn32eb, powerpc/powerpc and powerpc/powerpc64. +arm/arm, arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64. .It Va WITHOUT_FLOPPY .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru Set to not build or install programs diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk index c9e0e6b..c4381bc 100644 --- a/share/mk/bsd.endian.mk +++ b/share/mk/bsd.endian.mk @@ -10,6 +10,6 @@ TARGET_ENDIANNESS= 1234 ${MACHINE_ARCH} == "powerpc64" || \ ${MACHINE_ARCH} == "sparc64" || \ ${MACHINE_ARCH} == "armeb" || \ - ${MACHINE_ARCH:Mmips*eb} != "" + ${MACHINE_ARCH:Mmips*} != "" TARGET_ENDIANNESS= 4321 .endif diff --git a/share/mk/sys.mk b/share/mk/sys.mk index e8ec4c1..c984295 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -13,7 +13,7 @@ unix ?= We run FreeBSD, not UNIX. # and/or endian. This is called MACHINE_CPU in NetBSD, but that's used # for something different in FreeBSD. # -MACHINE_CPUARCH=${MACHINE_ARCH:C/mips.*e[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} +MACHINE_CPUARCH=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/} .endif # If the special target .POSIX appears (without prerequisites or diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index b093428..f50a2a0 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -6,7 +6,7 @@ .include <bsd.own.mk> # backwards compat option for older systems. -MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} +MACHINE_CPUARCH?=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/} # Can be overridden by makeoptions or /etc/make.conf KERNEL_KO?= kernel diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index cb460ee..929cec6 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -61,7 +61,7 @@ # # backwards compat option for older systems. -MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} +MACHINE_CPUARCH?=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/} AWK?= awk KMODLOAD?= /sbin/kldload diff --git a/sys/mips/atheros/std.ar71xx b/sys/mips/atheros/std.ar71xx index b437719..2ba920c 100644 --- a/sys/mips/atheros/std.ar71xx +++ b/sys/mips/atheros/std.ar71xx @@ -4,5 +4,5 @@ files "../atheros/files.ar71xx" -machine mips mipseb +machine mips mips cpu CPU_MIPS4KC diff --git a/sys/mips/cavium/std.octeon1 b/sys/mips/cavium/std.octeon1 index a99c6df..8f8a54a 100644 --- a/sys/mips/cavium/std.octeon1 +++ b/sys/mips/cavium/std.octeon1 @@ -5,5 +5,5 @@ # $FreeBSD$ # files "../cavium/files.octeon1" -machine mips mips64eb +machine mips mips64 cpu CPU_CNMIPS diff --git a/sys/mips/conf/AR71XX_BASE b/sys/mips/conf/AR71XX_BASE index 4e5a794..65d01254 100644 --- a/sys/mips/conf/AR71XX_BASE +++ b/sys/mips/conf/AR71XX_BASE @@ -7,7 +7,7 @@ # $FreeBSD$ # -machine mips mipseb +machine mips mips ident AR71XX_BASE cpu CPU_MIPS4KC makeoptions KERNLOADADDR=0x80050000 diff --git a/sys/mips/conf/AR91XX_BASE b/sys/mips/conf/AR91XX_BASE index 571f974..12e8d3f 100644 --- a/sys/mips/conf/AR91XX_BASE +++ b/sys/mips/conf/AR91XX_BASE @@ -10,7 +10,7 @@ # $FreeBSD$ # -machine mips mipseb +machine mips mips ident AR91XX_BASE cpu CPU_MIPS4KC makeoptions KERNLOADADDR=0x80050000 diff --git a/sys/mips/conf/SWARM b/sys/mips/conf/SWARM index 10d6a12..16766a4 100644 --- a/sys/mips/conf/SWARM +++ b/sys/mips/conf/SWARM @@ -6,7 +6,7 @@ include "std.SWARM" ident SWARM -machine mips mipseb +machine mips mips makeoptions ARCH_FLAGS="-mabi=32 -march=mips32" makeoptions LDSCRIPT_NAME= ldscript.mips.cfe diff --git a/sys/mips/conf/SWARM64 b/sys/mips/conf/SWARM64 index 30c59d0..5f69124 100644 --- a/sys/mips/conf/SWARM64 +++ b/sys/mips/conf/SWARM64 @@ -6,7 +6,7 @@ include "std.SWARM" ident SWARM64 -machine mips mips64eb +machine mips mips64 makeoptions ARCH_FLAGS="-mabi=64 -march=mips64" makeoptions LDSCRIPT_NAME=ldscript.mips.cfe makeoptions KERNLOADADDR=0xffffffff80001000 diff --git a/sys/mips/conf/SWARM64_SMP b/sys/mips/conf/SWARM64_SMP index 708559f..b4cd666 100644 --- a/sys/mips/conf/SWARM64_SMP +++ b/sys/mips/conf/SWARM64_SMP @@ -9,7 +9,7 @@ ident SWARM64_SMP options SMP options PRINTF_BUFR_SIZE=128 -machine mips mips64eb +machine mips mips64 makeoptions ARCH_FLAGS="-mabi=64 -march=mips64" makeoptions LDSCRIPT_NAME=ldscript.mips.cfe makeoptions KERNLOADADDR=0xffffffff80001000 diff --git a/sys/mips/conf/SWARM_SMP b/sys/mips/conf/SWARM_SMP index a3ec092..d4f1541 100644 --- a/sys/mips/conf/SWARM_SMP +++ b/sys/mips/conf/SWARM_SMP @@ -9,7 +9,7 @@ ident SWARM_SMP options SMP options PRINTF_BUFR_SIZE=128 -machine mips mipseb +machine mips mips makeoptions ARCH_FLAGS="-mabi=32 -march=mips32" makeoptions LDSCRIPT_NAME= ldscript.mips.cfe diff --git a/sys/mips/conf/XLP b/sys/mips/conf/XLP index 9c1de77..6105fa0 100644 --- a/sys/mips/conf/XLP +++ b/sys/mips/conf/XLP @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mipseb +machine mips mips ident XLP makeoptions KERNLOADADDR=0x80100000 diff --git a/sys/mips/conf/XLP64 b/sys/mips/conf/XLP64 index 165eb75..adefda5 100644 --- a/sys/mips/conf/XLP64 +++ b/sys/mips/conf/XLP64 @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mips64eb +machine mips mips64 ident XLP64 makeoptions ARCH_FLAGS="-march=mips64r2 -mabi=64" diff --git a/sys/mips/conf/XLPN32 b/sys/mips/conf/XLPN32 index 74c3627..2b345f8 100644 --- a/sys/mips/conf/XLPN32 +++ b/sys/mips/conf/XLPN32 @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mipsn32eb +machine mips mipsn32 ident XLPN32 makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32" diff --git a/sys/mips/conf/XLR b/sys/mips/conf/XLR index 98fd11a..df6bdff 100644 --- a/sys/mips/conf/XLR +++ b/sys/mips/conf/XLR @@ -45,7 +45,7 @@ # # $FreeBSD$ -machine mips mipseb +machine mips mips ident XLR include "../rmi/std.xlr" diff --git a/sys/mips/conf/XLR64 b/sys/mips/conf/XLR64 index 6480c59..e137022 100644 --- a/sys/mips/conf/XLR64 +++ b/sys/mips/conf/XLR64 @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mips64eb +machine mips mips64 ident XLR64 include "../rmi/std.xlr" diff --git a/sys/mips/conf/XLRN32 b/sys/mips/conf/XLRN32 index 605893e..c6f2602 100644 --- a/sys/mips/conf/XLRN32 +++ b/sys/mips/conf/XLRN32 @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mipsn32eb +machine mips mipsn32 ident XLRN32 include "../rmi/std.xlr" diff --git a/sys/mips/include/param.h b/sys/mips/include/param.h index bd6d800..c700a44 100644 --- a/sys/mips/include/param.h +++ b/sys/mips/include/param.h @@ -59,14 +59,14 @@ #ifndef MACHINE_ARCH #if _BYTE_ORDER == _BIG_ENDIAN #ifdef __mips_n64 -#define MACHINE_ARCH "mips64eb" +#define MACHINE_ARCH "mips64" #ifndef MACHINE_ARCH32 -#define MACHINE_ARCH32 "mipseb" +#define MACHINE_ARCH32 "mips" #endif #elif defined(__mips_n32) -#define MACHINE_ARCH "mipsn32eb" +#define MACHINE_ARCH "mipsn32" #else -#define MACHINE_ARCH "mipseb" +#define MACHINE_ARCH "mips" #endif #else #ifdef __mips_n64 diff --git a/usr.bin/xlint/Makefile.inc b/usr.bin/xlint/Makefile.inc index e27a4cd..cd8de6f 100644 --- a/usr.bin/xlint/Makefile.inc +++ b/usr.bin/xlint/Makefile.inc @@ -8,7 +8,7 @@ WARNS?= 0 # These assignments duplicate much of the functionality of # MACHINE_CPUARCH, but there's no easy way to export make functions... .if defined(TARGET_ARCH) -TARGET_CPUARCH= ${TARGET_ARCH:C/mips.*e[bl]/mips/:C/armeb/arm/} +TARGET_CPUARCH= ${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/} .else TARGET_CPUARCH= ${MACHINE_CPUARCH} TARGET_ARCH= ${MACHINE_ARCH} diff --git a/usr.sbin/Makefile.mips b/usr.sbin/Makefile.mips index a2063d3..99fd0a2 100644 --- a/usr.sbin/Makefile.mips +++ b/usr.sbin/Makefile.mips @@ -1,6 +1,6 @@ # $FreeBSD$ -# uathload broken for n32 and n64 due to toolchain issues -.if ${MACHINE_ARCH:Mmipse[lb]} == "" +# uathload broken for n32 and n64 due to toolchain issues, only build for o32 +.if ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "mipsel" SUBDIR:= ${SUBDIR:Nuathload} .endif |
