From owner-svn-src-all@FreeBSD.ORG Thu Mar 29 02:54:36 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4888106564A; Thu, 29 Mar 2012 02:54:36 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CA7EB8FC0C; Thu, 29 Mar 2012 02:54:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2T2saiV072521; Thu, 29 Mar 2012 02:54:36 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2T2sate072489; Thu, 29 Mar 2012 02:54:36 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201203290254.q2T2sate072489@svn.freebsd.org> From: Juli Mallett Date: Thu, 29 Mar 2012 02:54:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233644 - in head: . gnu/lib/libgcc gnu/usr.bin/binutils gnu/usr.bin/cc gnu/usr.bin/gdb gnu/usr.bin/gdb/libgdb kerberos5/lib/libkafs5 share/man/man5 share/mk sys/conf sys/mips/atheros s... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2012 02:54:37 -0000 Author: jmallett Date: Thu Mar 29 02:54:35 2012 New Revision: 233644 URL: http://svn.freebsd.org/changeset/base/233644 Log: Assume a big-endian default on MIPS and drop the "eb" suffix from MACHINE_ARCH. This makes our naming scheme more closely match other systems and the expectations of much third-party software. MIPS builds which are little-endian should require and exhibit no changes. Big-endian TARGET_ARCHes must be changed: From: To: mipseb mips mipsn32eb mipsn32 mips64eb mips64 An entry has been added to UPDATING and some foot-shooting protection (complete with warnings which should become errors in the near future) to the top-level base system Makefile. Modified: head/Makefile head/Makefile.inc1 head/UPDATING head/gnu/lib/libgcc/Makefile head/gnu/usr.bin/binutils/Makefile.inc0 head/gnu/usr.bin/cc/Makefile.tgt head/gnu/usr.bin/gdb/Makefile.inc head/gnu/usr.bin/gdb/libgdb/Makefile head/kerberos5/lib/libkafs5/Makefile head/share/man/man5/src.conf.5 head/share/mk/bsd.endian.mk head/share/mk/sys.mk head/sys/conf/kern.pre.mk head/sys/conf/kmod.mk head/sys/mips/atheros/std.ar71xx head/sys/mips/cavium/std.octeon1 head/sys/mips/conf/AR71XX_BASE head/sys/mips/conf/AR91XX_BASE head/sys/mips/conf/SWARM head/sys/mips/conf/SWARM64 head/sys/mips/conf/SWARM64_SMP head/sys/mips/conf/SWARM_SMP head/sys/mips/conf/XLP head/sys/mips/conf/XLP64 head/sys/mips/conf/XLPN32 head/sys/mips/conf/XLR head/sys/mips/conf/XLR64 head/sys/mips/conf/XLRN32 head/sys/mips/include/param.h head/usr.bin/xlint/Makefile.inc head/usr.sbin/Makefile.mips Modified: head/Makefile ============================================================================== --- head/Makefile Thu Mar 29 02:47:01 2012 (r233643) +++ head/Makefile Thu Mar 29 02:54:35 2012 (r233644) @@ -132,20 +132,19 @@ _MAKE= PATH=${PATH} ${BINMAKE} -f Makefi # 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} Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Thu Mar 29 02:47:01 2012 (r233643) +++ head/Makefile.inc1 Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Mar 29 02:47:01 2012 (r233643) +++ head/UPDATING Thu Mar 29 02:54:35 2012 (r233644) @@ -22,6 +22,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 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. Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Thu Mar 29 02:47:01 2012 (r233643) +++ head/gnu/lib/libgcc/Makefile Thu Mar 29 02:54:35 2012 (r233644) @@ -122,7 +122,7 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns .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 Modified: head/gnu/usr.bin/binutils/Makefile.inc0 ============================================================================== --- head/gnu/usr.bin/binutils/Makefile.inc0 Thu Mar 29 02:47:01 2012 (r233643) +++ head/gnu/usr.bin/binutils/Makefile.inc0 Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/gnu/usr.bin/cc/Makefile.tgt ============================================================================== --- head/gnu/usr.bin/cc/Makefile.tgt Thu Mar 29 02:47:01 2012 (r233643) +++ head/gnu/usr.bin/cc/Makefile.tgt Thu Mar 29 02:54:35 2012 (r233644) @@ -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 .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" Modified: head/gnu/usr.bin/gdb/Makefile.inc ============================================================================== --- head/gnu/usr.bin/gdb/Makefile.inc Thu Mar 29 02:47:01 2012 (r233643) +++ head/gnu/usr.bin/gdb/Makefile.inc Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/gnu/usr.bin/gdb/libgdb/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/libgdb/Makefile Thu Mar 29 02:47:01 2012 (r233643) +++ head/gnu/usr.bin/gdb/libgdb/Makefile Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/kerberos5/lib/libkafs5/Makefile ============================================================================== --- head/kerberos5/lib/libkafs5/Makefile Thu Mar 29 02:47:01 2012 (r233643) +++ head/kerberos5/lib/libkafs5/Makefile Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Thu Mar 29 02:47:01 2012 (r233643) +++ head/share/man/man5/src.conf.5 Thu Mar 29 02:54:35 2012 (r233644) @@ -270,7 +270,7 @@ When set, it also enforces the following 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 suppo 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 Modified: head/share/mk/bsd.endian.mk ============================================================================== --- head/share/mk/bsd.endian.mk Thu Mar 29 02:47:01 2012 (r233643) +++ head/share/mk/bsd.endian.mk Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Thu Mar 29 02:47:01 2012 (r233643) +++ head/share/mk/sys.mk Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/sys/conf/kern.pre.mk ============================================================================== --- head/sys/conf/kern.pre.mk Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/conf/kern.pre.mk Thu Mar 29 02:54:35 2012 (r233644) @@ -6,7 +6,7 @@ .include # 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 Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/conf/kmod.mk Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/sys/mips/atheros/std.ar71xx ============================================================================== --- head/sys/mips/atheros/std.ar71xx Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/atheros/std.ar71xx Thu Mar 29 02:54:35 2012 (r233644) @@ -4,5 +4,5 @@ files "../atheros/files.ar71xx" -machine mips mipseb +machine mips mips cpu CPU_MIPS4KC Modified: head/sys/mips/cavium/std.octeon1 ============================================================================== --- head/sys/mips/cavium/std.octeon1 Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/cavium/std.octeon1 Thu Mar 29 02:54:35 2012 (r233644) @@ -5,5 +5,5 @@ # $FreeBSD$ # files "../cavium/files.octeon1" -machine mips mips64eb +machine mips mips64 cpu CPU_CNMIPS Modified: head/sys/mips/conf/AR71XX_BASE ============================================================================== --- head/sys/mips/conf/AR71XX_BASE Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/AR71XX_BASE Thu Mar 29 02:54:35 2012 (r233644) @@ -7,7 +7,7 @@ # $FreeBSD$ # -machine mips mipseb +machine mips mips ident AR71XX_BASE cpu CPU_MIPS4KC makeoptions KERNLOADADDR=0x80050000 Modified: head/sys/mips/conf/AR91XX_BASE ============================================================================== --- head/sys/mips/conf/AR91XX_BASE Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/AR91XX_BASE Thu Mar 29 02:54:35 2012 (r233644) @@ -10,7 +10,7 @@ # $FreeBSD$ # -machine mips mipseb +machine mips mips ident AR91XX_BASE cpu CPU_MIPS4KC makeoptions KERNLOADADDR=0x80050000 Modified: head/sys/mips/conf/SWARM ============================================================================== --- head/sys/mips/conf/SWARM Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/SWARM Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/sys/mips/conf/SWARM64 ============================================================================== --- head/sys/mips/conf/SWARM64 Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/SWARM64 Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/sys/mips/conf/SWARM64_SMP ============================================================================== --- head/sys/mips/conf/SWARM64_SMP Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/SWARM64_SMP Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/sys/mips/conf/SWARM_SMP ============================================================================== --- head/sys/mips/conf/SWARM_SMP Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/SWARM_SMP Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/sys/mips/conf/XLP ============================================================================== --- head/sys/mips/conf/XLP Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/XLP Thu Mar 29 02:54:35 2012 (r233644) @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mipseb +machine mips mips ident XLP makeoptions KERNLOADADDR=0x80100000 Modified: head/sys/mips/conf/XLP64 ============================================================================== --- head/sys/mips/conf/XLP64 Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/XLP64 Thu Mar 29 02:54:35 2012 (r233644) @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mips64eb +machine mips mips64 ident XLP64 makeoptions ARCH_FLAGS="-march=mips64r2 -mabi=64" Modified: head/sys/mips/conf/XLPN32 ============================================================================== --- head/sys/mips/conf/XLPN32 Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/XLPN32 Thu Mar 29 02:54:35 2012 (r233644) @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mipsn32eb +machine mips mipsn32 ident XLPN32 makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32" Modified: head/sys/mips/conf/XLR ============================================================================== --- head/sys/mips/conf/XLR Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/XLR Thu Mar 29 02:54:35 2012 (r233644) @@ -45,7 +45,7 @@ # # $FreeBSD$ -machine mips mipseb +machine mips mips ident XLR include "../rmi/std.xlr" Modified: head/sys/mips/conf/XLR64 ============================================================================== --- head/sys/mips/conf/XLR64 Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/XLR64 Thu Mar 29 02:54:35 2012 (r233644) @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mips64eb +machine mips mips64 ident XLR64 include "../rmi/std.xlr" Modified: head/sys/mips/conf/XLRN32 ============================================================================== --- head/sys/mips/conf/XLRN32 Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/conf/XLRN32 Thu Mar 29 02:54:35 2012 (r233644) @@ -17,7 +17,7 @@ # # $FreeBSD$ -machine mips mipsn32eb +machine mips mipsn32 ident XLRN32 include "../rmi/std.xlr" Modified: head/sys/mips/include/param.h ============================================================================== --- head/sys/mips/include/param.h Thu Mar 29 02:47:01 2012 (r233643) +++ head/sys/mips/include/param.h Thu Mar 29 02:54:35 2012 (r233644) @@ -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 Modified: head/usr.bin/xlint/Makefile.inc ============================================================================== --- head/usr.bin/xlint/Makefile.inc Thu Mar 29 02:47:01 2012 (r233643) +++ head/usr.bin/xlint/Makefile.inc Thu Mar 29 02:54:35 2012 (r233644) @@ -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} Modified: head/usr.sbin/Makefile.mips ============================================================================== --- head/usr.sbin/Makefile.mips Thu Mar 29 02:47:01 2012 (r233643) +++ head/usr.sbin/Makefile.mips Thu Mar 29 02:54:35 2012 (r233644) @@ -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