summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonathan <jonathan@NetBSD.org>1999-03-03 12:00:18 +0000
committerjonathan <jonathan@NetBSD.org>1999-03-03 12:00:18 +0000
commit3eeb52dee07aafcfabce219f5dfa7bd11cba830f (patch)
tree50b687461cf70b05e50412451ade030c957d8468
parent5129c4fcd5f8f3092ab075f8ebbbd0dfb848fc21 (diff)
Makefile ${MACHINE_ARCH} changes for mips{eb,el}, as suggested by
Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
-rw-r--r--lib/libarch/Makefile6
-rw-r--r--lib/libarch/Makefile.inc4
-rw-r--r--libexec/ld.elf_so/Makefile13
-rw-r--r--sys/Makefile7
-rw-r--r--sys/arch/Makefile6
-rw-r--r--sys/lib/libkern/Makefile4
-rw-r--r--usr.bin/Makefile4
7 files changed, 24 insertions, 20 deletions
diff --git a/lib/libarch/Makefile b/lib/libarch/Makefile
index 563e7573867..a8b4bf52a19 100644
--- a/lib/libarch/Makefile
+++ b/lib/libarch/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 1999/02/09 22:32:33 is Exp $
+# $NetBSD: Makefile,v 1.10 1999/03/03 12:00:18 jonathan Exp $
-.if exists(${MACHINE_ARCH})
-SUBDIR+= ${MACHINE_ARCH}
+.if exists(${MACHINE_ARCH:S/mipse[bl]/mips/})
+SUBDIR+= ${MACHINE_ARCH:S/mipse[bl]/mips/}
.endif
.include <bsd.subdir.mk>
diff --git a/lib/libarch/Makefile.inc b/lib/libarch/Makefile.inc
index b6a1b8ee6f6..4babfbe7013 100644
--- a/lib/libarch/Makefile.inc
+++ b/lib/libarch/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 1999/02/09 22:32:33 is Exp $
+# $NetBSD: Makefile.inc,v 1.3 1999/03/03 12:00:18 jonathan Exp $
#
# This Makefile includes boiler-plate stuff included by each subdir's Makefile.
@@ -6,4 +6,4 @@ OBJS+= ${ASM}
POBJS+= ${ASM:.o=.po}
CLEANFILES+= ${ASM} ${POBJS}
-LIB= ${MACHINE_ARCH}
+LIB= ${MACHINE_ARCH:S/mipse[bl]/mips/}
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
index 360d7dd2ff2..82e0e0b9c1e 100644
--- a/libexec/ld.elf_so/Makefile
+++ b/libexec/ld.elf_so/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 1999/02/24 18:31:00 christos Exp $
+# $NetBSD: Makefile,v 1.23 1999/03/03 12:00:19 jonathan Exp $
.include <bsd.own.mk> # for OBJECT_FMT definition
@@ -6,13 +6,16 @@
PROG= ld.elf_so
.endif
-.if (${MACHINE} == "alpha") || (${MACHINE_ARCH} == "mips") || \
+M= ${.CURDIR}/arch/${MACHINE_ARCH:S/mipse[bl]/mips/}
+
+.if (${MACHINE} == "alpha") || \
+ (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") || \
(${MACHINE_ARCH} == "powerpc") || (${MACHINE} == "sparc64") || \
(${MACHINE} == "i386") || (${MACHINE} == "sparc")
# Adds SRCS, CPPFLAGS, LDFLAGS, etc. Must go first so MD startup source
# is first.
-.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc)
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+.if exists($M/Makefile.inc)
+.include "$M/Makefile.inc"
.endif
CLIBOBJ!=cd ${.CURDIR}/../../lib/libc; \
@@ -37,7 +40,7 @@ INCSDIR=/usr/include
STRIPFLAG=
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
+.PATH: $M
${PROG}: ${OBJS} ${DPADD}
${LD} ${LDFLAGS} -o ${PROG} ${OBJS} ${LDADD}
diff --git a/sys/Makefile b/sys/Makefile
index 2e59811332f..b3cb2cd2d6e 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.31 1998/10/02 20:20:29 drochner Exp $
+# $NetBSD: Makefile,v 1.32 1999/03/03 12:00:20 jonathan Exp $
SUBDIR= adosfs arch compat dev filecorefs isofs miscfs msdosfs net \
netatalk netccitt netinet netiso netnatm netns nfs sys ufs uvm vm
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips" && \
- ${MACHINE_ARCH} != "powerpc")
+.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "powerpc" && \
+ ${MACHINE_ARCH} != "mipseb" &&${MACHINE_ARCH} != "mipsel")
+
SUBDIR+= lkm
.endif
diff --git a/sys/arch/Makefile b/sys/arch/Makefile
index b4d25f136d5..fe3d9985152 100644
--- a/sys/arch/Makefile
+++ b/sys/arch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/25 11:52:26 matthias Exp $
+# $NetBSD: Makefile,v 1.4 1999/03/03 12:00:19 jonathan Exp $
# For now, we install the machine and arch includes, and symlink 'machine'
# to the location of the machine includes.
@@ -6,8 +6,8 @@
# Eventually, we should install everything.
SUBDIR= ${MACHINE}
-.if ${MACHINE} != ${MACHINE_ARCH} && exists(${MACHINE_ARCH})
-SUBDIR+= ${MACHINE_ARCH}
+.if ${MACHINE} != ${MACHINE_ARCH} && exists(${MACHINE_ARCH:S/mipse[bl]/mips/})
+SUBDIR+= ${MACHINE_ARCH:S/mipse[bl]/mips/}
.endif
#SUBDIR= alpha amiga arm32 atari bebox hp300 i386 m68k mac68k macppc mips \
diff --git a/sys/lib/libkern/Makefile b/sys/lib/libkern/Makefile
index 7c2d1237784..0dfbc2b8f5a 100644
--- a/sys/lib/libkern/Makefile
+++ b/sys/lib/libkern/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.48 1999/02/24 16:22:42 chs Exp $
+# $NetBSD: Makefile,v 1.49 1999/03/03 12:00:20 jonathan Exp $
LIB= kern
MKPIC= no
-M= ${.CURDIR}/arch/${MACHINE_ARCH}
+M= ${.CURDIR}/arch/${MACHINE_ARCH:S/mipse[bl]/mips/}
CPPFLAGS= -I$M ${KERNCPPFLAGS} ${KERNMISCCPPFLAGS}
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 145ed664b94..8b52e240172 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 1999/03/02 14:07:24 christos Exp $
+# $NetBSD: Makefile,v 1.100 1999/03/03 12:00:19 jonathan Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include <bsd.own.mk> # for EXPORTABLE_SYSTEM definition
@@ -32,7 +32,7 @@ SUBDIR+=elf2aout elf2ecoff telnet
.else
# Build ELF to {ecoff, aout} tools on mips, for old bootblocks/PROMs.
-.if (${MACHINE_ARCH} == "mips")
+.if (${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb")
SUBDIR+= elf2aout elf2ecoff
.endif