diff options
| author | abs <abs@pkgsrc.org> | 2003-07-10 11:52:02 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2003-07-10 11:52:02 +0000 |
| commit | d8e3aa79f8f4597e5859185304f76992cee7ee23 (patch) | |
| tree | c3fb51f83c926c681651f470a46ed5af4957ad03 /devel/cpuflags | |
| parent | ccd2555155627381f6fc193694143830bb65217c (diff) | |
| download | pkgsrc-d8e3aa79f8f4597e5859185304f76992cee7ee23.tar.gz | |
Updated cpuflags to cpuflags-0.54
Handle hw.model frmatting from hp300
On gcc3 -frename-registers still causes problems for xdm with _some_
-march=XXX values. Next time I might just listen to fredb first...
Diffstat (limited to 'devel/cpuflags')
| -rw-r--r-- | devel/cpuflags/Makefile | 4 | ||||
| -rwxr-xr-x | devel/cpuflags/files/cpuflags.NetBSD | 10 | ||||
| -rw-r--r-- | devel/cpuflags/files/optimize_gcc.mk | 12 |
3 files changed, 11 insertions, 15 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index e4747896d08..78b019366f5 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2003/07/09 14:35:28 abs Exp $ +# $NetBSD: Makefile,v 1.56 2003/07/10 11:52:02 abs Exp $ # -DISTNAME= cpuflags-0.53 +DISTNAME= cpuflags-0.54 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD index 7f18ebab774..163c66951c2 100755 --- a/devel/cpuflags/files/cpuflags.NetBSD +++ b/devel/cpuflags/files/cpuflags.NetBSD @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: cpuflags.NetBSD,v 1.40 2003/06/08 12:44:10 abs Exp $ +# $NetBSD: cpuflags.NetBSD,v 1.41 2003/07/10 11:52:03 abs Exp $ if [ -x /sbin/sysctl ] ;then SYSCTL=/sbin/sysctl @@ -74,10 +74,10 @@ case $hw_machine_arch in esac ;; m68k) case $hw_model in # Examples - *\(68020*) FLAGS='-m68020' ;; # Untested - *\(68030*) FLAGS='-m68030' ;; # Mac LC III - *\(68040*) FLAGS='-m68040' ;; # Untested - *\(68060*) FLAGS='-m68060' ;; # Upgr amiga 3000 + *\(68020*|*\ MC68020\ *) FLAGS='-m68020' ;; # Untested + *\(68030*|*\ MC68030\ *) FLAGS='-m68030' ;; # Mac LC III + *\(68040*|*\ MC68040\ *) FLAGS='-m68040' ;; # Untested + *\(68060*|*\ MC68060\ *) FLAGS='-m68060' ;; # Upgr amiga 3000 esac case "`egrep '^fpu0 ' /var/run/dmesg.boot`" in *\(emulator\)*) FLAGS="$FLAGS -msoft-float" ;; diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk index 119b6499076..85a285e739c 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.10 2003/07/09 14:35:28 abs Exp $ +# $Id: optimize_gcc.mk,v 1.11 2003/07/10 11:52:03 abs Exp $ # This file is 'experimental' - which is doublespeak for unspeakably # ugly, and probably quite broken by design. @@ -8,8 +8,10 @@ # compile some code, and even generate curdled binaries. It is completely # unsupported. Any questions should be directed to <abs@netbsd.org>. +# -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=-O3 +COPT_FLAGS=-finline-functions .else COPT_FLAGS= .endif @@ -27,7 +29,6 @@ PKGBASE=${.CURDIR:C:.*/::} COPT_FLAGS+=-ffast-math -fomit-frame-pointer -PKG_EXCLUDE_RENAME_REGISTERS+= PKG_EXCLUDE_OMIT_FRAME_POINTER+=galeon lua4 mozilla phoenix .if !defined(USE_GCC3) PKG_EXCLUDE_OMIT_FRAME_POINTER+=qt3-libs kdeedu3 @@ -37,11 +38,6 @@ PKG_EXCLUDE_OMIT_FRAME_POINTER+=qt3-libs kdeedu3 COPT_FLAGS:= ${COPT_FLAGS:S/-fomit-frame-pointer//} .endif -# -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} CXXFLAGS+=${COPT_FLAGS} MAKE_FLAGS+=CCOPTIONS="${COPT_FLAGS}" # Override CCOPTIONS for imake |