Update cpuflags to 0.97:

    - Add Infineon ADM5120
    - Fix optimize_gcc.mk for qt3-libs, and reorder so CPUFLAGS_PKGBASE is
      left defined and testable for 'make show-vars' and the like

5 files changed, 37 insertions, 40 deletions

diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 0834ed80a29..27d24eae8e1 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2005/11/06 15:31:20 abs Exp $
+# $NetBSD: Makefile,v 1.100 2006/02/04 15:08:33 abs Exp $
 #
 
-DISTNAME=	cpuflags-0.96
+DISTNAME=	cpuflags-0.97
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/cpuflags/files/Makefile b/devel/cpuflags/files/Makefile
index 72cb5a4c46d..ffc4d2b10f8 100644
--- a/devel/cpuflags/files/Makefile
+++ b/devel/cpuflags/files/Makefile
@@ -1,6 +1,6 @@
-# $Id: Makefile,v 1.5 2005/11/06 15:31:20 abs Exp $
+# $Id: Makefile,v 1.6 2006/02/04 15:08:33 abs Exp $
 
-VERSION=0.96
+VERSION=0.97
 
 PREFIX?=/usr/local
 OPSYS?=`uname`
diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD
index de18365a007..8f095087bc4 100755
--- a/devel/cpuflags/files/cpuflags.NetBSD
+++ b/devel/cpuflags/files/cpuflags.NetBSD
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.62 2005/10/23 18:47:24 minskim Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.63 2006/02/04 15:08:33 abs Exp $
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 
 AWK=awk
@@ -106,21 +106,25 @@ case $hw_machine_arch in
 
     mipseb|mipsel)
 	# cpu0 at mainbus0: QED R4600 Orion CPU (0x2020) Rev. 2.0 with ...
-	case "$(egrep '^cpu0 ' /var/run/dmesg.boot)" in
-	    *\ MIPS\ R2000\ *)	FLAGS="-march=r2000"	   ;;
-	    *\ MIPS\ R3000\ *)	FLAGS="-march=r3000"	   ;;
-	    *\ MIPS\ R3000A\ *) FLAGS="-march=r3000"	   ;;
-	    *\ Toshiba\ TX3912\ *)    FLAGS="-march=r3900"  ;;
-	    *\ Toshiba\ TX392[27]\ *) FLAGS="-march=r3900"  ;;
-	    *\ MIPS\ R4000\ *)	FLAGS="-mtune=r4000 -mips2" ;; # really mips3
-	    *\ MIPS\ R4400\ *)	FLAGS="-mtune=r4400 -mips2" ;; # really mips3
-	    *\ NEC\ VR4100\ *)	FLAGS="-mtune=r4100 -mips2" ;; # really mips3
-	    *\ NEC\ VR4300\ *)	FLAGS="-mtune=r4300 -mips2" ;; # really mips3
-	    *\ QED\ R4600\ *)	FLAGS="-mtune=r4600 -mips2" ;; # really mips3
-	    *\ MIPS\ R5000\ *)	FLAGS="-mtune=r5000 -mips2" ;; # really mips4
-	    *\ QED\ RM5200\ *)	FLAGS="-mtune=r5000 -mips2" ;; # really mips4
-	    *\ MIPS\ R6000\ *)	FLAGS="-mtune=r6000 -mips2" ;;
-	    *\ MIPS\ R8000\ *)	FLAGS="-mtune=r8000 -mips2" ;; # really mips4
+	case $hw_model in
+	    Infineon\ ADM5120)		FLAGS='-march=4kc' ;;
+	    *)
+	    case "$(egrep '^cpu0 ' /var/run/dmesg.boot)" in
+		*\ MIPS\ R2000\ *)	FLAGS="-march=r2000" ;;
+		*\ MIPS\ R3000\ *)	FLAGS="-march=r3000" ;;
+		*\ MIPS\ R3000A\ *)	FLAGS="-march=r3000" ;;
+		*\ Toshiba\ TX3912\ *)  FLAGS="-march=r3900" ;;
+		*\ Toshiba\ TX392[27]\ *) FLAGS="-march=r3900" ;;
+		*\ MIPS\ R4000\ *)	FLAGS="-mtune=r4000 -mips2" ;; # mips3
+		*\ MIPS\ R4400\ *)	FLAGS="-mtune=r4400 -mips2" ;; # mips3
+		*\ NEC\ VR4100\ *)	FLAGS="-mtune=r4100 -mips2" ;; # mips3
+		*\ NEC\ VR4300\ *)	FLAGS="-mtune=r4300 -mips2" ;; # mips3
+		*\ QED\ R4600\ *)	FLAGS="-mtune=r4600 -mips2" ;; # mips3
+		*\ MIPS\ R5000\ *)	FLAGS="-mtune=r5000 -mips2" ;; # mips4
+		*\ QED\ RM5200\ *)	FLAGS="-mtune=r5000 -mips2" ;; # mips4
+		*\ MIPS\ R6000\ *)	FLAGS="-mtune=r6000 -mips2" ;;
+		*\ MIPS\ R8000\ *)	FLAGS="-mtune=r8000 -mips2" ;; # mips4
+	    esac ;;
 	esac
 	;;
 
diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk
index 084d5c54f32..1a4d6d9a5b9 100644
--- a/devel/cpuflags/files/optimize_gcc.mk
+++ b/devel/cpuflags/files/optimize_gcc.mk
@@ -1,4 +1,4 @@
-# $Id: optimize_gcc.mk,v 1.26 2005/09/27 16:38:11 abs Exp $
+# $Id: optimize_gcc.mk,v 1.27 2006/02/04 15:08:33 abs Exp $
 
 # This file is 'experimental' - which is doublespeak for unspeakably
 # ugly, and quite broken by design.
@@ -10,45 +10,36 @@
 
 # -O3 would give -finline-functions and -frename-registers
 # As of gcc3-3.3nb4 -frename-registers still causes problems with xdm
-.if defined(USE_GCC3) || (${MACHINE} != sparc64)
-COPT_FLAGS=-finline-functions
-.else
-COPT_FLAGS=
-.endif
 
 .ifdef BSD_PKG_MK			# Try to catch various package opts
 
 # This is a horrible mess, but how else to adjust per package?
 
-COPT_FLAGS+=-ffast-math -fomit-frame-pointer
+COPT_FLAGS=-finline-functions -fomit-frame-pointer -ffast-math 
 
 PKG_EXCLUDE_OMIT_FRAME_POINTER+=firefox firefox-gtk1 galeon galeon-devel
 PKG_EXCLUDE_OMIT_FRAME_POINTER+=lua lua4 mozilla mozilla-gtk2
 PKG_EXCLUDE_OMIT_FRAME_POINTER+=thunderbird thunderbird-gtk1
-PKG_EXCLUDE_INLINE_FUNCTIONS+=qemu userppp
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=-base	# ruby18-base - NetBSD i386/3.0
+PKG_EXCLUDE_INLINE_FUNCTIONS+=qemu userppp vlc
 PKG_EXCLUDE_FAST_MATH+=firefox firefox-gtk1 # v1.0, NetBSD i386/2.0
-.if !defined(USE_GCC3)
-PKG_EXCLUDE_OMIT_FRAME_POINTER+=qt3-libs kdeedu3 koffice
-.endif
+PKG_EXCLUDE_FAST_MATH+=qt3-libs     # gcc3.3.3, NetBSD i386/3.0, breaks kde3
 
-TMPPKGNAME:=${PKGNAME:?${PKGNAME}:${DISTNAME}}
-TMPPKGBASE:=${PKGBASE:?${PKGBASE}:${TMPPKGNAME:C/-[^-]*$//}}
+CPUFLAGS_PKGNAME:=${PKGNAME:?${PKGNAME}:${DISTNAME}}
+CPUFLAGS_PKGBASE:=${PKGBASE:?${PKGBASE}:${CPUFLAGS_PKGNAME:C/-[^-]*$//}}
 
-.if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${TMPPKGBASE})
+.if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${CPUFLAGS_PKGBASE})
 COPT_FLAGS:=    ${COPT_FLAGS:S/-fomit-frame-pointer//}
 .endif
 
-.if !empty(PKG_EXCLUDE_INLINE_FUNCTIONS:M${TMPPKGBASE})
+.if !empty(PKG_EXCLUDE_INLINE_FUNCTIONS:M${CPUFLAGS_PKGBASE})
 COPT_FLAGS:=    ${COPT_FLAGS:S/-finline-functions//}
 .endif
 
-.if !empty(PKG_EXCLUDE_FAST_MATH:M${TMPPKGBASE})
+.if !empty(PKG_EXCLUDE_FAST_MATH:M${CPUFLAGS_PKGBASE})
 COPT_FLAGS:=    ${COPT_FLAGS:S/-ffast-math//}
 .endif
 
-TMPPKGNAME=
-TMPPKGBASE=
-
 CFLAGS+=${COPT_FLAGS}
 CXXFLAGS+=${COPT_FLAGS}
 MAKE_FLAGS+=CCOPTIONS="${COPT_FLAGS}"	# Override CCOPTIONS for imake
diff --git a/doc/CHANGES b/doc/CHANGES
index c1ad96bfcdf..b20dc53297b 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.12789 2006/02/04 13:45:52 wiz Exp $
+$NetBSD: CHANGES,v 1.12790 2006/02/04 15:09:49 abs Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -797,3 +797,5 @@ Changes to the packages collection and infrastructure in 2006:
 	Updated sysutils/cdrtools-ossdvd to 2.01.1.36 [wiz 2006-02-04]
 	Updated graphics/xfig to xfig-3.2.5alpha5nb1 [markd 2006-02-04]
 	Updated devel/glade2-gnome to 2.10.0nb3 [wiz 2006-02-04]
+	Updated devel/cpuflags to 0.97 [abs 2006-02-04]
+