Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/xlint for mips64*, use mips64 subdir, otherwise use ...



details:   https://anonhg.NetBSD.org/src/rev/44d756569429
branches:  trunk
changeset: 753273:44d756569429
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Mar 22 05:12:24 2010 +0000

description:
for mips64*, use mips64 subdir, otherwise use $MACHINE_ARCH if exists,
or $MACHINE_CPU.  idea from dennis.c.ferguson%gmail.com@localhost in PR#43021.

diffstat:

 usr.bin/xlint/Makefile.inc |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (28 lines):

diff -r fecd1510e9b5 -r 44d756569429 usr.bin/xlint/Makefile.inc
--- a/usr.bin/xlint/Makefile.inc        Mon Mar 22 05:10:19 2010 +0000
+++ b/usr.bin/xlint/Makefile.inc        Mon Mar 22 05:12:24 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.11 2009/12/14 00:42:06 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.12 2010/03/22 05:12:24 mrg Exp $
 
 WARNS?=                3       # XXX: fails -Wsign-compare
 
@@ -6,13 +6,12 @@
 
 .PATH:         ${.CURDIR}/../common
 
-# On the m68000, MACHINE_CPU is "m68k", but we have different
-# target parameters (namely, long double is a different size
-# on the m68000), so we special case the directory name here.
-.if ${MACHINE_ARCH} == "m68000"
-ARCHSUBDIR=    m68000
-.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+# Special cases first, then check for a MACHINE_ARCH specific
+# subdir before looking for MACHINE_CPU.
+.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
 ARCHSUBDIR=    mips64
+.elif exists(${.CURDIR}/../arch/${MACHINE_ARCH})
+ARCHSUBDIR=    ${MACHINE_ARCH}
 .else
 ARCHSUBDIR=    ${MACHINE_CPU}
 .endif



Home | Main Index | Thread Index | Old Index