From 0b661859bada8f3ec5b867a3af1930873fa5c90c Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Thu, 7 Jun 2001 16:05:10 +0000
Subject: Update cpuflags to 0.3     Correctly distinguish a dnard from a
 strongarm based risc-pc,     and fall back to the safer risc-pc flags in case
 of doubt.

---
 devel/cpuflags/Makefile              |  4 ++--
 devel/cpuflags/files/cpuflags.NetBSD | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'devel/cpuflags')

diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 88fa7e1d63e..662ced0da36 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/06/07 11:56:46 abs Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/07 16:05:10 abs Exp $
 #
 
-DISTNAME=		cpuflags-0.2
+DISTNAME=		cpuflags-0.3
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD
index 8b3da8d9eb8..7ec692e5dfe 100755
--- a/devel/cpuflags/files/cpuflags.NetBSD
+++ b/devel/cpuflags/files/cpuflags.NetBSD
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.2 2001/06/07 11:56:46 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.3 2001/06/07 16:05:10 abs Exp $
 
 gcc_ver=`gcc -v 2>&1 | awk '/gcc version/ {print $3}'`
 hw_model=`sysctl -n hw.model`
@@ -48,10 +48,15 @@ else					# Modern gcc
 	# arm32
 	ARM610*)		FLAGS="-mcpu=arm610"		;; # risc pc
 	ARM710*)		FLAGS="-mcpu=arm710"		;; # risc pc
-	"SA-110 rev 3 (SA-1 core) DC enabled IC enabled WB enabled EABT")	
-		    FLAGS="-march=armv3m -mtune=strongarm"	;; # risc pc
-	"SA-110 rev 3 DC enabled IC enabled WB enabled EABT")
-				FLAGS="-mcpu=strongarm110"	;; # shark
+	SA-110*)	
+	    # The memorybus in strongarm risc pc machines cannot support
+	    # certain strongarm instructions, but we cannot tell a shark
+	    # from such a risc pc via uname or sysctl (Certainly for 1.5)
+	    if grep -q ofbus0 /var/run/dmesg.boot 2>/dev/null ; then
+		FLAGS="-mcpu=strongarm110"			   # shark
+	    else
+		FLAGS="-march=armv3m -mtune=strongarm"		   # risc pc
+	    fi							;;
 	#
 	*)			echo "Unknown hw.model '$hw_model'" >&2
     esac
-- 
cgit v1.2.3