[src/trunk]: src System utilities, boot programs and kernel modules are machine

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src System utilities, boot programs and kernel modules are machine
From: nakayama <nakayama%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 18:15:27 +0000
details:   https://anonhg.NetBSD.org/src/rev/bdff30ee924c
branches:  trunk
changeset: 749925:bdff30ee924c
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Sun Dec 13 05:01:32 2009 +0000

description:
System utilities, boot programs and kernel modules are machine
(port) specific not CPU, so use MACHINE not MACHINE_ARCH.

diffstat:

 sbin/disklabel/Makefile             |  4 ++--
 sbin/edlabel/Makefile               |  4 ++--
 sys/arch/Makefile                   |  4 ++--
 sys/arch/sparc/stand/Makefile       |  4 ++--
 sys/arch/sparc/stand/boot/Makefile  |  4 ++--
 sys/arch/sparc64/stand/Makefile     |  4 ++--
 sys/modules/compat_sunos/Makefile   |  6 +++---
 sys/modules/compat_sunos32/Makefile |  6 +++---
 usr.sbin/apm/Makefile               |  4 ++--
 usr.sbin/apmd/Makefile              |  4 ++--
 usr.sbin/eeprom/Makefile            |  8 ++++----
 usr.sbin/ofctl/Makefile             |  6 +++---
 usr.sbin/screenblank/Makefile       |  4 ++--
 usr.sbin/tadpolectl/Makefile        |  4 ++--
 14 files changed, 33 insertions(+), 33 deletions(-)

diffs (245 lines):

diff -r cce453b6c8a4 -r bdff30ee924c sbin/disklabel/Makefile
--- a/sbin/disklabel/Makefile   Sun Dec 13 04:57:16 2009 +0000
+++ b/sbin/disklabel/Makefile   Sun Dec 13 05:01:32 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.65 2009/12/05 16:29:11 pooka Exp $
+#      $NetBSD: Makefile,v 1.66 2009/12/13 05:01:32 nakayama Exp $
 #      @(#)Makefile    8.2 (Berkeley) 3/17/94
 
 PROG=  disklabel
@@ -10,7 +10,7 @@
 .endif
 
 # these have additional requirements on the alignment of a partition
-.if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64") \
+.if (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") \
        || (${MACHINE} == "sun3")
 CPPFLAGS+= -DSTRICT_CYLINDER_ALIGNMENT
 .endif
diff -r cce453b6c8a4 -r bdff30ee924c sbin/edlabel/Makefile
--- a/sbin/edlabel/Makefile     Sun Dec 13 04:57:16 2009 +0000
+++ b/sbin/edlabel/Makefile     Sun Dec 13 05:01:32 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2009/02/16 13:38:21 is Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/13 05:01:32 nakayama Exp $
 # edlabel (Edit Disk LABEL)
 
 NOMAN= # defined
 
 .if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
+    ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
 PROG=  edlabel
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
diff -r cce453b6c8a4 -r bdff30ee924c sys/arch/Makefile
--- a/sys/arch/Makefile Sun Dec 13 04:57:16 2009 +0000
+++ b/sys/arch/Makefile Sun Dec 13 05:01:32 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.39 2009/12/05 16:29:12 pooka Exp $
+#      $NetBSD: Makefile,v 1.40 2009/12/13 05:01:33 nakayama Exp $
 
 # For now, we install the machine and arch includes, and symlink 'machine'
 # to the location of the machine includes (usually).
@@ -22,7 +22,7 @@
 SUBDIR+= ${ARCHSUBDIR}
 .endif
 .endif
-.if ${MACHINE_ARCH} == sparc
+.if ${MACHINE} == sparc
 SUBDIR+= sparc64
 .endif
 .if (${MACHINE} == hpcmips || ${MACHINE} == hpcsh)
diff -r cce453b6c8a4 -r bdff30ee924c sys/arch/sparc/stand/Makefile
--- a/sys/arch/sparc/stand/Makefile     Sun Dec 13 04:57:16 2009 +0000
+++ b/sys/arch/sparc/stand/Makefile     Sun Dec 13 05:01:32 2009 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.21 2009/02/14 13:52:51 abs Exp $
+#      $NetBSD: Makefile,v 1.22 2009/12/13 05:01:33 nakayama Exp $
 
-.if ${MACHINE_ARCH} == sparc
+.if ${MACHINE} == sparc
 SUBDIR= boot bootxx bootblk ofwboot binstall
 .endif
 
diff -r cce453b6c8a4 -r bdff30ee924c sys/arch/sparc/stand/boot/Makefile
--- a/sys/arch/sparc/stand/boot/Makefile        Sun Dec 13 04:57:16 2009 +0000
+++ b/sys/arch/sparc/stand/boot/Makefile        Sun Dec 13 05:01:32 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.35 2009/02/14 13:52:51 abs Exp $
+#      $NetBSD: Makefile,v 1.36 2009/12/13 05:01:33 nakayama Exp $
 
 STRIPFLAG=
 PROGSOURCE=    boot.c net.c netif_sun.c conf.c openfirm.c bootinfo.c \
@@ -16,7 +16,7 @@
 
 .include "../Makefile.buildboot"
 
-.if ${MACHINE_ARCH} == sparc64
+.if ${MACHINE} == sparc64
 CFLAGS+=       -m32
 LDFLAGS+=      -m elf32_sparc
 AFLAGS+=       -Wa,-32
diff -r cce453b6c8a4 -r bdff30ee924c sys/arch/sparc64/stand/Makefile
--- a/sys/arch/sparc64/stand/Makefile   Sun Dec 13 04:57:16 2009 +0000
+++ b/sys/arch/sparc64/stand/Makefile   Sun Dec 13 05:01:32 2009 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.8 2009/02/14 13:56:41 abs Exp $
+#      $NetBSD: Makefile,v 1.9 2009/12/13 05:01:34 nakayama Exp $
 
-.if ${MACHINE_ARCH} == sparc64
+.if ${MACHINE} == sparc64
 SUBDIR=        ../../sparc/stand/ofwboot
 SUBDIR+=../../sparc/stand/bootblk
 SUBDIR+=../../sparc/stand/binstall 
diff -r cce453b6c8a4 -r bdff30ee924c sys/modules/compat_sunos/Makefile
--- a/sys/modules/compat_sunos/Makefile Sun Dec 13 04:57:16 2009 +0000
+++ b/sys/modules/compat_sunos/Makefile Sun Dec 13 05:01:32 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2009/02/14 13:56:41 abs Exp $
+#      $NetBSD: Makefile,v 1.4 2009/12/13 05:01:34 nakayama Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.assym"
@@ -12,12 +12,12 @@
 SRCS+= sunos_exec.c sunos_ioctl.c sunos_mod.c sunos_sysent.c
 SRCS+= sunos_exec_aout.c sunos_misc.c sunos_syscalls.c
 
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE} == "sparc64"
 .PATH: ${S}/arch/sparc64/sparc64
 SRCS+= sunos_machdep.c
 .endif
 
-.if ${MACHINE_ARCH} == "sparc"
+.if ${MACHINE} == "sparc"
 .PATH: ${S}/arch/sparc/sparc
 SRCS+= sunos_machdep.c
 .endif
diff -r cce453b6c8a4 -r bdff30ee924c sys/modules/compat_sunos32/Makefile
--- a/sys/modules/compat_sunos32/Makefile       Sun Dec 13 04:57:16 2009 +0000
+++ b/sys/modules/compat_sunos32/Makefile       Sun Dec 13 05:01:32 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2009/02/14 13:56:41 abs Exp $
+#      $NetBSD: Makefile,v 1.4 2009/12/13 05:01:34 nakayama Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.assym"
@@ -12,12 +12,12 @@
 SRCS+= sunos32_exec.c sunos32_ioctl.c sunos32_mod.c sunos32_sysent.c
 SRCS+= sunos32_exec_aout.c sunos32_misc.c sunos32_syscalls.c
 
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE} == "sparc64"
 .PATH: ${S}/arch/sparc64/sparc64
 SRCS+= sunos32_machdep.c
 .endif
 
-.if ${MACHINE_ARCH} == "sparc"
+.if ${MACHINE} == "sparc"
 .PATH: ${S}/arch/sparc/sparc
 SRCS+= sunos32_machdep.c
 .endif
diff -r cce453b6c8a4 -r bdff30ee924c usr.sbin/apm/Makefile
--- a/usr.sbin/apm/Makefile     Sun Dec 13 04:57:16 2009 +0000
+++ b/usr.sbin/apm/Makefile     Sun Dec 13 05:01:32 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2009/02/14 13:56:41 abs Exp $
+#      $NetBSD: Makefile,v 1.17 2009/12/13 05:01:33 nakayama Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
      ${MACHINE} == "hpcmips" || \
      ${MACHINE} == "hpcsh" || \
      ${MACHINE} == "macppc" || \
-     ${MACHINE_ARCH} == "sparc" || \
+     ${MACHINE} == "sparc" || \
      ${MACHINE} == "zaurus")
 PROG=  apm
 SRCS=  apm.c apmsubr.c
diff -r cce453b6c8a4 -r bdff30ee924c usr.sbin/apmd/Makefile
--- a/usr.sbin/apmd/Makefile    Sun Dec 13 04:57:16 2009 +0000
+++ b/usr.sbin/apmd/Makefile    Sun Dec 13 05:01:32 2009 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.14 2009/04/22 15:23:02 lukem Exp $
+#      $NetBSD: Makefile,v 1.15 2009/12/13 05:01:33 nakayama Exp $
 
 .if (${MACHINE_ARCH} == "i386" || \
      ${MACHINE} == "hpcmips" || \
      ${MACHINE} == "hpcsh" || \
      ${MACHINE} == "macppc" || \
-     ${MACHINE_ARCH} == "sparc" || \
+     ${MACHINE} == "sparc" || \
      ${MACHINE} == "zaurus")
 PROG=  apmd
 SRCS=  apmd.c apmsubr.c
diff -r cce453b6c8a4 -r bdff30ee924c usr.sbin/eeprom/Makefile
--- a/usr.sbin/eeprom/Makefile  Sun Dec 13 04:57:16 2009 +0000
+++ b/usr.sbin/eeprom/Makefile  Sun Dec 13 05:01:32 2009 +0000
@@ -1,8 +1,8 @@
 #      from: @(#)Makefile      5.8 (Berkeley) 7/28/90
-#      $NetBSD: Makefile,v 1.15 2009/02/14 13:56:41 abs Exp $
+#      $NetBSD: Makefile,v 1.16 2009/12/13 05:01:33 nakayama Exp $
 
 .if ${MACHINE} == "sun3" || ${MACHINE} == "sun3x" \
-       || ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" \
+       || ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" \
        || ${MACHINE} == "macppc" || ${MACHINE} == "prep"
 PROG=  eeprom
 
@@ -10,11 +10,11 @@
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 
-.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
 SRCS+= ophandlers.c
 .endif
 
-.if ${MACHINE} == "sun3" || ${MACHINE} == "sun3x" || ${MACHINE_ARCH} == "sparc" 
+.if ${MACHINE} == "sun3" || ${MACHINE} == "sun3x" || ${MACHINE} == "sparc" 
 SRCS+= eehandlers.c
 .endif
 
diff -r cce453b6c8a4 -r bdff30ee924c usr.sbin/ofctl/Makefile
--- a/usr.sbin/ofctl/Makefile   Sun Dec 13 04:57:16 2009 +0000
+++ b/usr.sbin/ofctl/Makefile   Sun Dec 13 05:01:32 2009 +0000
@@ -1,8 +1,8 @@
 #      from: @(#)Makefile      5.8 (Berkeley) 7/28/90
-#      $NetBSD: Makefile,v 1.5 2009/02/14 13:56:42 abs Exp $
+#      $NetBSD: Makefile,v 1.6 2009/12/13 05:01:33 nakayama Exp $
 
-.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE} == "macppc" \
-       || ${MACHINE} == "shark" || ${MACHINE_ARCH} == "sparc"
+.if ${MACHINE} == "sparc64" || ${MACHINE} == "macppc" \
+       || ${MACHINE} == "shark" || ${MACHINE} == "sparc"
 
 PROG=  ofctl
 
diff -r cce453b6c8a4 -r bdff30ee924c usr.sbin/screenblank/Makefile
--- a/usr.sbin/screenblank/Makefile     Sun Dec 13 04:57:16 2009 +0000
+++ b/usr.sbin/screenblank/Makefile     Sun Dec 13 05:01:32 2009 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.11 2009/04/22 15:23:08 lukem Exp $
+#      $NetBSD: Makefile,v 1.12 2009/12/13 05:01:33 nakayama Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 .if ${MACHINE} == "pmax" || ${MACHINE} == "sun3" || ${MACHINE} == "sun3x" \
-   || ${MACHINE_ARCH} == "sparc" || ${MACHINE} == "amiga"
+   || ${MACHINE} == "sparc" || ${MACHINE} == "amiga"
 CPPFLAGS+=-DHAVE_FBIO
 .endif
 
diff -r cce453b6c8a4 -r bdff30ee924c usr.sbin/tadpolectl/Makefile
--- a/usr.sbin/tadpolectl/Makefile      Sun Dec 13 04:57:16 2009 +0000
+++ b/usr.sbin/tadpolectl/Makefile      Sun Dec 13 05:01:32 2009 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.4 2009/02/14 13:56:42 abs Exp $
+#      $NetBSD: Makefile,v 1.5 2009/12/13 05:01:33 nakayama Exp $
 
-.if ${MACHINE_ARCH} == "sparc"
+.if ${MACHINE} == "sparc"
 PROG=  tadpolectl
 SRCS=  tadpolectl.c
 .endif
Prev by Date: [src/trunk]: src/doc note support Xorg for zaurus.
Next by Date: [src/trunk]: src Added keyboard config files for Sharp Zaurus SL-C3x00.
Previous by Thread: [src/trunk]: src/doc note support Xorg for zaurus.
Next by Thread: [src/trunk]: src Added keyboard config files for Sharp Zaurus SL-C3x00.
Indexes:
Home | Main Index | Thread Index | Old Index