[src/trunk]: src use MACIHNE_CPU to determine architecture-dependent source c...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src use MACIHNE_CPU to determine architecture-dependent source c...
From: itojun <itojun%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 08:26:34 +0000
details:   https://anonhg.NetBSD.org/src/rev/fb86ab7efbf4
branches:  trunk
changeset: 501842:fb86ab7efbf4
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Jan 08 08:29:59 2001 +0000

description:
use MACIHNE_CPU to determine architecture-dependent source code directory.
is use of exists(foo) safe enough?
TODO: many other places to fix

diffstat:

 gnu/lib/libg2c/Makefile       |  20 +++++++++++---------
 gnu/lib/libgcc/Makefile       |  16 ++++++++++------
 gnu/lib/libobjc/Makefile      |  14 ++++++++------
 gnu/usr.bin/egcs/Makefile.inc |  18 ++++++++++--------
 gnu/usr.bin/gas.new/Makefile  |  14 ++++++++------
 lib/csu/Makefile              |  12 ++++++++++--
 lib/libc/Makefile             |  13 +++++++++++--
 lib/libkvm/Makefile           |  17 ++++++++++-------
 lib/libposix/Makefile         |  15 +++++++++------
 9 files changed, 87 insertions(+), 52 deletions(-)

diffs (286 lines):

diff -r 03053f828846 -r fb86ab7efbf4 gnu/lib/libg2c/Makefile
--- a/gnu/lib/libg2c/Makefile   Mon Jan 08 08:24:17 2001 +0000
+++ b/gnu/lib/libg2c/Makefile   Mon Jan 08 08:29:59 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2001/01/04 09:22:06 itojun Exp $
+#      $NetBSD: Makefile,v 1.9 2001/01/08 08:29:59 itojun Exp $
 
 .include <bsd.own.mk>
 
@@ -70,14 +70,6 @@
 
 MKLINT=                no
 
-.if (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb")
-ARCHSUBDIR= mips
-.elif (${MACHINE_ARCH} == "sh3el") || (${MACHINE_ARCH} == "sh3eb")
-ARCHSUBDIR= sh3
-.else
-ARCHSUBDIR= ${MACHINE_ARCH}
-.endif
-
 CPPFLAGS+=     -I. -I${.CURDIR} -I${ARCH} -I${ARCH}/${ARCHSUBDIR} \
                -I${DIST}/libf2c -I${DIST}/libf2c/libF77 \
                -I${DIST}/libf2c/libI77 -I${DIST}/libf2c/libU77 \
@@ -97,6 +89,16 @@
 DIST=          ${.CURDIR}/../../dist
 ARCH=          ${.CURDIR}/../../usr.bin/egcs/arch
 
+.if exists(${ARCH}/${MACHINE_ARCH})
+ARCHSUBDIR= ${MACHINE_ARCH}
+.elif exists(${ARCH}/${MACHINE_CPU})
+ARCHSUBDIR= ${MACHINE_CPU}
+.else
+.BEGIN:
+       @echo no egcs/arch/${MACHINE_ARCH} nor egcs/arch/${MACHINE_CPU} exists
+       @false
+.endif
+
 .PATH:${DIST}/libf2c ${DIST}/gcc/f
 
 g2ctypes.sed: g2ctypes.c
diff -r 03053f828846 -r fb86ab7efbf4 gnu/lib/libgcc/Makefile
--- a/gnu/lib/libgcc/Makefile   Mon Jan 08 08:24:17 2001 +0000
+++ b/gnu/lib/libgcc/Makefile   Mon Jan 08 08:29:59 2001 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.15 2001/01/04 09:17:42 itojun Exp $
+#      $NetBSD: Makefile,v 1.16 2001/01/08 08:29:59 itojun Exp $
+
+.include <bsd.own.mk>
 
 HAVE_GCC28!=   ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 
@@ -9,12 +11,14 @@
 DIST=          ${.CURDIR}/../../dist/gcc
 ARCH=          ${.CURDIR}/../../usr.bin/egcs/arch
 
-.if (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb")
-ARCHSUBDIR= mips
-.elif (${MACHINE_ARCH} == "sh3el") || (${MACHINE_ARCH} == "sh3eb")
-ARCHSUBDIR= sh3
+.if exists(${ARCH}/${MACHINE_ARCH})
+ARCHSUBDIR= ${MACHINE_ARCH}
+.elif exists(${ARCH}/${MACHINE_CPU})
+ARCHSUBDIR= ${MACHINE_CPU}
 .else
-ARCHSUBDIR= ${MACHINE_ARCH}
+.BEGIN:
+       @echo no egcs/arch/${MACHINE_ARCH} nor egcs/arch/${MACHINE_CPU} exists
+       @false
 .endif
 
 CPPFLAGS+=     -I${ARCH}/${ARCHSUBDIR} -I${ARCH} \
diff -r 03053f828846 -r fb86ab7efbf4 gnu/lib/libobjc/Makefile
--- a/gnu/lib/libobjc/Makefile  Mon Jan 08 08:24:17 2001 +0000
+++ b/gnu/lib/libobjc/Makefile  Mon Jan 08 08:29:59 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2001/01/04 09:22:06 itojun Exp $
+#      $NetBSD: Makefile,v 1.10 2001/01/08 08:29:59 itojun Exp $
 
 HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 
@@ -15,12 +15,14 @@
                Object.h Protocol.h encoding.h typedstream.h thr.h
 INCSDIR=       /usr/include/objc
 
-.if (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb")
-ARCHSUBDIR= mips
-.elif (${MACHINE_ARCH} == "sh3el") || (${MACHINE_ARCH} == "sh3eb")
-ARCHSUBDIR= sh3
+.if exists(${ARCH}/${MACHINE_ARCH})
+ARCHSUBDIR= ${MACHINE_ARCH}
+.elif exists(${ARCH}/${MACHINE_CPU})
+ARCHSUBDIR= ${MACHINE_CPU}
 .else
-ARCHSUBDIR= ${MACHINE_ARCH}
+.BEGIN:
+       @echo no egcs/arch/${MACHINE_ARCH} nor egcs/arch/${MACHINE_CPU} exists
+       @false
 .endif
 
 CPPFLAGS+=     -I. -I${ARCH}/${ARCHSUBDIR} -I${ARCH} \
diff -r 03053f828846 -r fb86ab7efbf4 gnu/usr.bin/egcs/Makefile.inc
--- a/gnu/usr.bin/egcs/Makefile.inc     Mon Jan 08 08:24:17 2001 +0000
+++ b/gnu/usr.bin/egcs/Makefile.inc     Mon Jan 08 08:29:59 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.27 2001/01/04 10:43:24 itojun Exp $
+#      $NetBSD: Makefile.inc,v 1.28 2001/01/08 08:29:59 itojun Exp $
 
 .if !defined(GCC_MAKEFILE_INC)
 GCC_MAKEFILE_INC=1
@@ -21,12 +21,14 @@
 COMMONOBJ!=    cd ${.CURDIR}/../common; ${MAKE} print-objdir
 .endif
 
-.if (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb")
-ARCHSUBDIR= mips
-.elif (${MACHINE_ARCH} == "sh3el") || (${MACHINE_ARCH} == "sh3eb")
-ARCHSUBDIR= sh3
+.if exists(${.CURDIR}/../arch/${MACHINE_ARCH})
+ARCHSUBDIR= ${MACHINE_ARCH}
+.elif exists(${.CURDIR}/../arch/${MACHINE_CPU})
+ARCHSUBDIR= ${MACHINE_CPU}
 .else
-ARCHSUBDIR= ${MACHINE_ARCH}
+.BEGIN:
+       @echo no ../arch/${MACHINE_ARCH} nor ../arch/${MACHINE_CPU} exists
+       @false
 .endif
 
 CPPFLAGS+=     -I${.CURDIR}/../arch \
@@ -46,11 +48,11 @@
 CPPFLAGS+=-DDEFAULT_ELF
 .endif
 
-.if (${MACHINE_ARCH} == "mipseb")
+.if (${MACHINE_ARCH} == "mipseb") || (${MACHINE_ARCH} == "sh3eb")
 CPPFLAGS+=-DTARGET_BIG_ENDIAN_DEFAULT
 .endif
 
-.if (${MACHINE_ARCH} == "mipsel")
+.if (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "sh3el")
 CPPFLAGS+=-DTARGET_LITTLE_ENDIAN_DEFAULT
 .endif
 
diff -r 03053f828846 -r fb86ab7efbf4 gnu/usr.bin/gas.new/Makefile
--- a/gnu/usr.bin/gas.new/Makefile      Mon Jan 08 08:24:17 2001 +0000
+++ b/gnu/usr.bin/gas.new/Makefile      Mon Jan 08 08:29:59 2001 +0000
@@ -1,15 +1,17 @@
-#      $NetBSD: Makefile,v 1.15 2001/01/04 08:08:39 itojun Exp $
+#      $NetBSD: Makefile,v 1.16 2001/01/08 08:30:00 itojun Exp $
 #
 
 .include <bsd.own.mk>
 
 # Override to make a cross assembler.
-.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
-TARGET_ARCH ?= mips
-.elif ${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el"
-TARGET_ARCH ?= sh3
+.if exists(${.CURDIR}/arch/${MACHINE_ARCH})
+TARGET_ARCH= ${MACHINE_ARCH}
+.elif exists(${.CURDIR}/arch/${MACHINE_CPU})
+TARGET_ARCH= ${MACHINE_CPU}
 .else
-TARGET_ARCH ?= ${MACHINE_ARCH}
+.BEGIN:
+       @echo no arch/${MACHINE_ARCH} nor arch/${MACHINE_CPU} exists
+       @false
 .endif
 
 .if (${MACHINE_ARCH} != "m68k" && ${MACHINE_ARCH} != "ns32k") ||       \
diff -r 03053f828846 -r fb86ab7efbf4 lib/csu/Makefile
--- a/lib/csu/Makefile  Mon Jan 08 08:24:17 2001 +0000
+++ b/lib/csu/Makefile  Mon Jan 08 08:29:59 2001 +0000
@@ -1,11 +1,19 @@
-#      $NetBSD: Makefile,v 1.21 2001/01/04 08:01:49 itojun Exp $
+#      $NetBSD: Makefile,v 1.22 2001/01/08 08:30:00 itojun Exp $
 
 .include <bsd.own.mk>
 
 .if ${OBJECT_FMT} == "ELF" && exists(${MACHINE_ARCH}_elf)
 SUBDIR=        ${MACHINE_ARCH}_elf
+.elif ${OBJECT_FMT} == "ELF" && exists(${MACHINE_CPU}_elf)
+SUBDIR=        ${MACHINE_ARCH}_elf
+.elif exists(${MACHINE_ARCH})
+SUBDIR=        ${MACHINE_ARCH}
+.elif exists(${MACHINE_CPU})
+SUBDIR=        ${MACHINE_CPU}
 .else
-SUBDIR=        ${MACHINE_ARCH:C/mipse[bl]/mips/:C/sh3e[bl]/sh3/}
+.BEGIN:
+       @echo no SUBDIR for ${MACHINE_ARCH}_elf, ${MACHINE_ARCH} nor ${MACHINE_CPU}
+       @false
 .endif
 
 .if (${OBJECT_FMT} != "ELF" && ${MACHINE_ARCH} != "arm32")
diff -r 03053f828846 -r fb86ab7efbf4 lib/libc/Makefile
--- a/lib/libc/Makefile Mon Jan 08 08:24:17 2001 +0000
+++ b/lib/libc/Makefile Mon Jan 08 08:29:59 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.94 2001/01/04 06:53:45 itojun Exp $
+#      $NetBSD: Makefile,v 1.95 2001/01/08 08:30:00 itojun Exp $
 #      @(#)Makefile    8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -27,7 +27,16 @@
 #LINTFLAGS+=   -w
 LINTFLAGS+=-X 272
 
-ARCHSUBDIR=    ${MACHINE_ARCH:C/mipse[bl]/mips/:S/arm26/arm/:C/sh3e[bl]/sh3/}
+.if exists(${.CURDIR}/arch/${MACHINE_ARCH})
+ARCHSUBDIR=    ${MACHINE_ARCH}
+.elif exists(${.CURDIR}/arch/${MACHINE_CPU}) 
+ARCHSUBDIR=    ${MACHINE_CPU}
+.else
+.BEGIN:
+       @echo no ARCHSUBDIR for ${MACHINE_ARCH} nor ${MACHINE_CPU}
+       @false
+.endif
+
 ARCHDIR=       ${.CURDIR}/arch/${ARCHSUBDIR}
 AINC=          -I${ARCHDIR}
 .if defined(DESTDIR)
diff -r 03053f828846 -r fb86ab7efbf4 lib/libkvm/Makefile
--- a/lib/libkvm/Makefile       Mon Jan 08 08:24:17 2001 +0000
+++ b/lib/libkvm/Makefile       Mon Jan 08 08:29:59 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.33 2001/01/04 08:59:24 itojun Exp $
+#      $NetBSD: Makefile,v 1.34 2001/01/08 08:30:00 itojun Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/4/93
 
 LIB=   kvm
@@ -11,14 +11,17 @@
 # If it is necessary to run different code based on ${MACHINE} then
 # the dispatch on ${MACHINE} should be done at run time (see m68k).
 
-.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
-SRCS+= kvm_mips.c
-.elif ${MACHINE_ARCH} == "arm26"
+.include <bsd.own.mk>
+.if ${MACHINE_ARCH} == "arm26"
 SRCS+= kvm_arm32.c
-.elif ${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el"
-SRCS+= kvm_sh3.c
+.elif exists(kvm_${MACHINE_ARCH}.c)
+SRCS+= kvm_${MACHINE_ARCH}.c
+.elif  exists(kvm_${MACHINE_CPU}.c)
+SRCS+= kvm_${MACHINE_CPU}.c
 .else
-SRCS+= kvm_${MACHINE_ARCH}.c
+.BEGIN:
+       @echo no kvm_xx.c for ${MACHINE_ARCH} nor ${MACHINE_CPU}
+       @false
 .endif
 
 # Additional modules needed for m68k
diff -r 03053f828846 -r fb86ab7efbf4 lib/libposix/Makefile
--- a/lib/libposix/Makefile     Mon Jan 08 08:24:17 2001 +0000
+++ b/lib/libposix/Makefile     Mon Jan 08 08:29:59 2001 +0000
@@ -1,17 +1,20 @@
-#      $NetBSD: Makefile,v 1.7 2001/01/04 09:00:24 itojun Exp $
+#      $NetBSD: Makefile,v 1.8 2001/01/08 08:30:00 itojun Exp $
 
 LIB=   posix
 
 .include <bsd.own.mk>
 
 CPPFLAGS+=-D_REENTRANT -I${.CURDIR}/../libc/include
-.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
-ARCHDIR=       ${.CURDIR}/../libc/arch/mips
-.elif ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb"
-ARCHDIR=       ${.CURDIR}/../libc/arch/sh3
+.if exists(${.CURDIR}/../libc/arch/${MACHINE_ARCH})
+ARCHDIR=       ${.CURDIR}/../libc/arch/${MACHINE_ARCH}
+.elif exists(${.CURDIR}/../libc/arch/${MACHINE_CPU})
+ARCHDIR=       ${.CURDIR}/../libc/arch/${MACHINE_CPU}
 .else
-ARCHDIR=       ${.CURDIR}/../libc/arch/${MACHINE_ARCH}
+.BEGIN:
+       @echo no ARCHDIR for ${MACHINE_ARCH} nor ${MACHINE_CPU}
+       @false
 .endif
+
 AINC=  -I${ARCHDIR}
 .if defined(DESTDIR)
 AINC+= -nostdinc -idirafter ${DESTDIR}/usr/include
Prev by Date: [src/trunk]: src/sys/dev/pci regen
Next by Date: [src/trunk]: src/usr.bin/file/magdir fix arm32 confusion. There was a regress...
Previous by Thread: [src/trunk]: src/sys/dev/pci regen
Next by Thread: [src/trunk]: src/usr.bin/file/magdir fix arm32 confusion. There was a regress...
Indexes:
Home | Main Index | Thread Index | Old Index