summaryrefslogtreecommitdiff
path: root/devel/cpuflags
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2003-06-08 12:44:09 +0000
committerabs <abs@pkgsrc.org>2003-06-08 12:44:09 +0000
commit031879db198132d973330bb2d6966c0c66f59c7c (patch)
treed732b679579d60c8e3d66aa4ae1bfe565ba61c7c /devel/cpuflags
parent86aae2823f4d6302bfb4b808318fb627c0176c3f (diff)
downloadpkgsrc-031879db198132d973330bb2d6966c0c66f59c7c.tar.gz
Update cpuflags to 0.47:
Treat AMD Duron as Athlon Replace PKG_EXCLUDE_O3 with PKG_EXCLUDE_RENAME_REGISTERS as its specifically the -frename-registers that causes problems. Set for ORBit
Diffstat (limited to 'devel/cpuflags')
-rw-r--r--devel/cpuflags/Makefile4
-rwxr-xr-xdevel/cpuflags/files/cpuflags.NetBSD3
-rw-r--r--devel/cpuflags/files/optimize_gcc.mk20
3 files changed, 15 insertions, 12 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index b859985da36..4fb07ad461c 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2003/06/06 22:54:05 abs Exp $
+# $NetBSD: Makefile,v 1.49 2003/06/08 12:44:09 abs Exp $
#
-DISTNAME= cpuflags-0.46
+DISTNAME= cpuflags-0.47
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD
index bbe5cfe2d26..7f18ebab774 100755
--- a/devel/cpuflags/files/cpuflags.NetBSD
+++ b/devel/cpuflags/files/cpuflags.NetBSD
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.39 2003/06/06 15:26:49 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.40 2003/06/08 12:44:10 abs Exp $
if [ -x /sbin/sysctl ] ;then
SYSCTL=/sbin/sysctl
@@ -66,6 +66,7 @@ case $hw_machine_arch in
*AMD\ K6-2*) FLAGS='-march=k6-2' ;;
*AMD\ K6*) FLAGS='-march=k6' ;;
*AMD\ K7*|*AMD\ Athlon*) FLAGS='-march=athlon' ;;
+ *AMD\ Duron*) FLAGS='-march=athlon' ;;
*386-class*) FLAGS='-march=i386' ;;
*486-class*) FLAGS='-march=i486' ;;
*586-class*) FLAGS='-march=pentium' ;;
diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk
index 24a4c38e80f..d812ac886f5 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.3 2003/06/06 22:54:05 abs Exp $
+# $Id: optimize_gcc.mk,v 1.4 2003/06/08 12:44:10 abs Exp $
# This file is 'experimental' - which is doublespeak for unspeakably
# ugly, and probably quite broken by design.
@@ -27,19 +27,21 @@ PKGBASE=${.CURDIR:C:.*/::}
COPT_FLAGS+=-ffast-math -fomit-frame-pointer
-PKG_EXCLUDE_OMIT_FRAME_POINTER=lua4
-PKG_EXCLUDE_O3=
-.if defined(USE_GCC3)
+PKG_EXCLUDE_RENAME_REGISTERS+=
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=lua4
+.if defined(USE_GCC3) # 1.6.1 needs this, but not 1.6T
+PKG_EXCLUDE_RENAME_REGISTERS+=perl5 perl58 ORBit
+.else
PKG_EXCLUDE_OMIT_FRAME_POINTER+=mozilla phoenix qt3-libs kdeedu3
-PKG_EXCLUDE_O3+=perl5 perl58
.endif
-.if empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${PKGBASE})
-COPT_FLAGS+=-fomit-frame-pointer
+.if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${PKGBASE})
+COPT_FLAGS:= ${COPT_FLAGS:S/-fomit-frame-pointer//}
.endif
-.if !empty(PKG_EXCLUDE_O3:M${PKGBASE})
-COPT_FLAGS:= ${COPT_FLAGS:S/-O3//}
+# -O3 implies -finline-functions and -frename-registers
+.if !empty(PKG_EXCLUDE_RENAME_REGISTERS:M${PKGBASE})
+COPT_FLAGS:= ${COPT_FLAGS:S/-O3/-finline-functions/}
.endif
CFLAGS+=${COPT_FLAGS}