diff options
| author | jmallett <jmallett@FreeBSD.org> | 2012-03-29 02:54:35 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2012-03-29 02:54:35 +0000 |
| commit | 4544b2987d0d95e6ea49d4f0c3281c2a11ce8f77 (patch) | |
| tree | 1fac0394055b095aec90d117db2f722cff6a8dcb /Makefile | |
| parent | 362bad78cae4d38646200d3ebffd68a6bcdc6921 (diff) | |
| download | FreeBSD-src-4544b2987d0d95e6ea49d4f0c3281c2a11ce8f77.zip FreeBSD-src-4544b2987d0d95e6ea49d4f0c3281c2a11ce8f77.tar.gz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 9 insertions, 10 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} |
