From 1bc6d8a294c442f178453c46c5edf80772b5cc91 Mon Sep 17 00:00:00 2001 From: naddy Date: Tue, 24 Feb 2004 00:06:43 +0000 Subject: [PATCH] remove workarounds for gcc2.95/sparc64 optimizer bugs --- databases/db/v4/Makefile | 6 +----- databases/db/v4/patches/gcc-dist_Makefile_in | 11 ----------- databases/openldap/Makefile | 7 +------ .../patches/gcc-libraries_liblutil_Makefile_in | 13 ------------- devel/gputils/Makefile | 7 +------ devel/libslang/Makefile | 7 +------ devel/libslang/patches/gcc-patch-src_Makefile.in | 11 ----------- graphics/tiff/Makefile | 7 +------ graphics/tiff/patches/sup-sparc64 | 12 ------------ 9 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 databases/db/v4/patches/gcc-dist_Makefile_in delete mode 100644 databases/openldap/patches/gcc-libraries_liblutil_Makefile_in delete mode 100644 devel/libslang/patches/gcc-patch-src_Makefile.in delete mode 100644 graphics/tiff/patches/sup-sparc64 diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile index 7ab7837eca5..5adf4d2aca7 100644 --- a/databases/db/v4/Makefile +++ b/databases/db/v4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2004/01/14 19:50:15 sturm Exp $ +# $OpenBSD: Makefile,v 1.6 2004/02/24 00:06:43 naddy Exp $ REVISION= 4 VERSION= ${REVISION}.2.52 @@ -10,8 +10,4 @@ CONFIGURE_STYLE=gnu DEST_SUBDIR= ${REVISION} -.if ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* gcc-* -.endif - .include diff --git a/databases/db/v4/patches/gcc-dist_Makefile_in b/databases/db/v4/patches/gcc-dist_Makefile_in deleted file mode 100644 index 584e41d98b1..00000000000 --- a/databases/db/v4/patches/gcc-dist_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- dist/Makefile.in.orig Fri Aug 30 20:11:56 2002 -+++ dist/Makefile.in Wed Dec 3 20:44:10 2003 -@@ -1203,7 +1206,7 @@ - rijndael-api-fst@o@: $(srcdir)/crypto/rijndael/rijndael-api-fst.c - $(CC) $(CFLAGS) $? - sha1@o@: $(srcdir)/hmac/sha1.c -- $(CC) $(CFLAGS) $? -+ $(CC) $(CFLAGS) -O0 $? - txn@o@: $(srcdir)/txn/txn.c - $(CC) $(CFLAGS) $? - txn_auto@o@: $(srcdir)/txn/txn_auto.c diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 2a43560d25f..d0ed870e4b7 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2004/02/17 07:22:17 kevlo Exp $ +# $OpenBSD: Makefile,v 1.38 2004/02/24 00:06:43 naddy Exp $ COMMENT= "Open source LDAP software (client)" COMMENT-server= "Open source LDAP software (server)" @@ -58,11 +58,6 @@ CONFIGURE_ARGS+= \ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/build -# XXX workaround sparc64 gcc optimization bug -.if ${MACHINE_ARCH:Msparc64} -PATCH_LIST= gcc-* patch-* -.endif - REGRESS_TARGET= test FLAVORS= sasl bdb diff --git a/databases/openldap/patches/gcc-libraries_liblutil_Makefile_in b/databases/openldap/patches/gcc-libraries_liblutil_Makefile_in deleted file mode 100644 index 17292c179dc..00000000000 --- a/databases/openldap/patches/gcc-libraries_liblutil_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: gcc-libraries_liblutil_Makefile_in,v 1.1 2002/01/29 06:10:22 pvalchev Exp $ ---- libraries/liblutil/Makefile.in.orig Fri Jan 4 13:38:24 2002 -+++ libraries/liblutil/Makefile.in Fri Jan 25 23:03:43 2002 -@@ -31,6 +31,9 @@ CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_LIB_DE - # It's ok for them to be here because the clean rule is harmless, and - # slapdmsg.res won't get built unless it's declared in OBJS. - -+sha1.o: sha1.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -I$(LDAP_INCDIR) -O0 -c $< -+ - slapdmsg.res: slapdmsg.rc slapdmsg.bin - windres $< -O coff -o $@ - diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile index 866576af16f..c50937dd23e 100644 --- a/devel/gputils/Makefile +++ b/devel/gputils/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2004/01/30 01:01:11 naddy Exp $ +# $OpenBSD: Makefile,v 1.4 2004/02/24 00:06:43 naddy Exp $ COMMENT= "GNU PIC assembler and utilities" @@ -22,11 +22,6 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gputils/} MASTER_SITES0= http://www.ajd.net.au/ports/ -# From Jolan: -.if ${MACHINE_ARCH:Msparc64} -CFLAGS+= -O0 -.endif - CONFIGURE_STYLE= gnu autoconf AUTOCONF_VERSION= 2.57 CONFIGURE_ENV= "CC=${CC}" "CPP=${CPP}" "CFLAGS=${CFLAGS}" "CPPFLAGS=${CPPFLAGS}" "LDFLAGS=${LDFLAGS}" diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 07f4fb76a07..90be4dbae5e 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2004/01/11 07:05:31 brad Exp $ +# $OpenBSD: Makefile,v 1.38 2004/02/24 00:06:43 naddy Exp $ COMMENT= "stack-based interpreter for terminal applications" @@ -19,11 +19,6 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -# work around an optimizer bug in gcc 2.95 -.if ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= gcc-patch-* patch-* -.endif - CONFIGURE_STYLE= autoconf MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf diff --git a/devel/libslang/patches/gcc-patch-src_Makefile.in b/devel/libslang/patches/gcc-patch-src_Makefile.in deleted file mode 100644 index fc3043a1b42..00000000000 --- a/devel/libslang/patches/gcc-patch-src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: gcc-patch-src_Makefile.in,v 1.1 2003/08/13 23:41:02 naddy Exp $ ---- src/Makefile.in.orig 2003-08-14 00:25:45.000000000 +0200 -+++ src/Makefile.in 2003-08-14 00:26:19.000000000 +0200 -@@ -105,6 +105,7 @@ sltoken_O_DEP = keywhash.c - slarith_O_DEP = slarith.inc - slarrfun_O_DEP = slarrfun.inc - slmisc_O_DEP = slang.h -+slmisc_C_FLAGS = -O0 - slstd_C_FLAGS = -DSLANG_DOC_DIR='"$(install_doc_dir)"' - slimport_C_FLAGS = -DMODULE_INSTALL_DIR='"$(MODULE_INSTALL_DIR)"' - sltermin_C_FLAGS = -DMISC_TERMINFO_DIRS='"$(MISC_TERMINFO_DIRS)"' diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index fd7f5962b8a..b202a22b535 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2003/12/23 23:45:41 brad Exp $ +# $OpenBSD: Makefile,v 1.27 2004/02/24 00:06:43 naddy Exp $ COMMENT= "tools and library routines for working with TIFF images" @@ -30,11 +30,6 @@ CONFIGURE_ARGS= --prefix="${PREFIX}" --with-ZIP --with-JPEG \ --with-INSTALL="sh ${WRKSRC}/port/install.sh" \ --noninteractive -# Internal Compiler Error -.if ${MACHINE_ARCH} == "sparc64" -PATCH_LIST= patch-* sup-sparc64 -.endif - DOCDIR= ${PREFIX}/share/doc/tiff post-extract: diff --git a/graphics/tiff/patches/sup-sparc64 b/graphics/tiff/patches/sup-sparc64 deleted file mode 100644 index 46335728792..00000000000 --- a/graphics/tiff/patches/sup-sparc64 +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: sup-sparc64,v 1.2 2003/12/23 23:45:41 brad Exp $ ---- libtiff/Makefile.in.orig 2003-08-20 06:42:17.000000000 -0400 -+++ libtiff/Makefile.in 2003-12-13 02:36:14.000000000 -0500 -@@ -290,7 +290,7 @@ tif_dir.o: ${SRCDIR}/tif_dir.c - tif_dirinfo.o: ${SRCDIR}/tif_dirinfo.c - ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirinfo.c - tif_dirread.o: ${SRCDIR}/tif_dirread.c -- ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirread.c -+ ${CC} -c ${CFLAGS} -O0 ${SRCDIR}/tif_dirread.c - tif_dirwrite.o: ${SRCDIR}/tif_dirwrite.c - ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirwrite.c - tif_dumpmode.o: ${SRCDIR}/tif_dumpmode.c