From 8321344c07e13af3280130d79f1e4e472360a5f2 Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Wed, 11 Jun 2003 20:50:50 +0000
Subject: Update for the fact that 'arm' ports have been called NetBSD-*-arm
 for a while now and not NetBSD-*-arm32. Changes include one or more of:     -
 Change MACHINE_ARCH == arm32 to also match arm     - Where ONLY_FOR_PLATFORM
 includes NetBSD-*-arm32, add NetBSD-*-arm     - Where BROKEN or worked around
 for arm gcc bugs, set USE_GCC3 The last may shake out a few more broken
 packages the next bulk build.

---
 emulators/compat13/Makefile | 8 ++++----
 emulators/stella/Makefile   | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'emulators')

diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index 956a19ee132..98b5decd3c3 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/06/02 01:20:00 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/11 20:50:53 abs Exp $
 #
 
 DISTNAME=		compat13-${MACHINE_ARCH}${PKGMINOR}
@@ -10,9 +10,9 @@ MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.netbsd.org/Releases/formal-1.3/index.html
 COMMENT=		Shared libraries for NetBSD 1.3 (and earlier) compatibility
 
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
-			NetBSD-*-m68k NetBSD-*-mipsel NetBSD-*-ns32k \
-			NetBSD-*-sparc
+ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32	\
+			NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-mipsel	\
+			NetBSD-*-ns32k NetBSD-*-sparc
 NOT_FOR_PLATFORM=	NetBSD-1.3*-*
 
 NO_MTREE=		# defined
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 6d2afe0226d..9f3d0102d23 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/06/02 01:19:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/06/11 20:50:53 abs Exp $
 
 DISTNAME=	stella-1.1-src
 PKGNAME=	stella-1.1
@@ -15,10 +15,8 @@ USE_X11=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	unix-x
 
-.if (${MACHINE_ARCH} == arm32 || ${MACHINE_ARCH} == arm)
-.if (${CXXFLAGS:M-O2} == "-O2")
-CXXFLAGS:=        ${CXXFLAGS:S/-O2/-O0/}
-.endif
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+.  include "../../mk/gcc.buildlink2.mk"
 .endif
 
 MAKE_ENV=	CXXFLAGS="${CXXFLAGS} -fno-rtti"
-- 
cgit v1.2.3