remove workaround for gcc2.95/sparc64 optimizer bug: sha1.c compiles fine now

This commit is contained in:
naddy 2004-02-24 19:48:16 +00:00
parent 091c59ee84
commit bd873807a9
11 changed files with 5 additions and 166 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1 2004/02/19 20:42:05 brad Exp $
# $OpenBSD: Makefile.inc,v 1.2 2004/02/24 19:48:16 naddy Exp $
DISTNAME= mutt-${VERSION}i
CATEGORIES= mail
@ -21,11 +21,6 @@ PERMIT_DISTFILES_FTP= Yes
FLAVORS= slang mixmaster compressed
FLAVOR?=
# XXX workaround sparc64 gcc optimization bug
.if ${MACHINE_ARCH:Msparc64}
PATCH_LIST= gcc-* patch-*
.endif
CONFIGURE_STYLE= autoconf old
CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \
--with-docdir="${PREFIX}/share/doc/mutt" \

View File

@ -1,13 +0,0 @@
$OpenBSD: gcc-Makefile_in,v 1.2 2002/03/31 17:14:24 lebel Exp $
--- Makefile.in.orig Sun Mar 31 11:43:40 2002
+++ Makefile.in Sun Mar 31 11:46:57 2002
@@ -294,6 +294,9 @@ uninstall-binPROGRAMS:
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
+sha1.o: sha1.c
+ $(COMPILE) -O0 -c $<
+
.c.o:
$(COMPILE) -c $<

View File

@ -1,13 +0,0 @@
$OpenBSD: gcc-patch-Makefile_in,v 1.1 2002/06/14 17:43:51 fgsch Exp $
--- Makefile.in.orig Mon Jun 10 15:48:23 2002
+++ Makefile.in Mon Jun 10 15:49:05 2002
@@ -294,6 +294,9 @@ uninstall-binPROGRAMS:
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
+sha1.o:
+ $(COMPILE) -O0 -c $<
+
.c.o:
$(COMPILE) -c $<

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2003/12/13 03:22:16 margarida Exp $
# $OpenBSD: Makefile,v 1.42 2004/02/24 19:48:16 naddy Exp $
COMMENT= "GNU privacy guard - a free PGP replacement"
@ -27,11 +27,6 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
# XXX workaround gcc bugs on sparc64
.if ${MACHINE_ARCH:Msparc64}
PATCH_LIST= patch-* gcc-*
.endif
MODULES= gettext
CONFIGURE_STYLE= autoconf

View File

@ -1,16 +0,0 @@
$OpenBSD: gcc-patch-cipher_Makefile_in,v 1.1 2003/05/27 14:54:43 brad Exp $
--- cipher/Makefile.in.orig Thu May 1 08:37:15 2003
+++ cipher/Makefile.in Tue May 13 14:12:45 2003
@@ -334,6 +334,12 @@ distclean-compile:
distclean-depend:
-rm -rf ./$(DEPDIR)
+sha1.o:
+ source='$<' object='$@' libtool=no \
+ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+ $(CCDEPMODE) $(depcomp) \
+ $(COMPILE) -O0 -c `test -f '$<' || echo '$(srcdir)/'`$<
+
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2002/11/27 17:35:55 margarida Exp $
# $OpenBSD: Makefile,v 1.4 2004/02/24 19:48:16 naddy Exp $
COMMENT= "file integrity checker"
@ -23,11 +23,6 @@ WRKDIST= ${WRKDIR}/${DISTNAME:R}
CONFIGURE_STYLE= gnu
# GCC sparc64 bug.
.if ${MACHINE_ARCH} == "sparc64"
PATCH_LIST= patch-* gcc-*
.endif
ALL_TARGET= integrit utils
NO_REGRESS= Yes

View File

@ -1,8 +0,0 @@
--- dep.mak.orig Sat Nov 16 17:10:03 2002
+++ dep.mak Sat Nov 16 17:10:17 2002
@@ -40,4 +40,4 @@ xstrdup.o : ${srcdir}/xstrdup.c ${srcdi
md5.o : ${srcdir}/gnupg/md5.c ${srcdir}/cdb.h ${srcdir}/cdb_hash.h Makefile
${CC} ${CPPFLAGS} ${CFLAGS} ${DEFS} -o $@ -c ${srcdir}/gnupg/md5.c
sha1.o : ${srcdir}/gnupg/sha1.c ${srcdir}/cdb.h ${srcdir}/cdb_hash.h Makefile
- ${CC} ${CPPFLAGS} ${CFLAGS} ${DEFS} -o $@ -c ${srcdir}/gnupg/sha1.c
+ ${CC} ${CPPFLAGS} ${CFLAGS} ${DEFS} -O0 -o $@ -c ${srcdir}/gnupg/sha1.c

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2003/10/22 05:25:21 jolan Exp $
# $OpenBSD: Makefile,v 1.4 2004/02/24 19:48:16 naddy Exp $
COMMENT= "crypto library based on code used in GnuPG"
@ -28,11 +28,6 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-asm
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
# XXX: workaround sparc64 gcc optimization bug
.if ${MACHINE_ARCH:Msparc64}
PATCH_LIST= gcc-* patch-*
.endif
pre-configure:
@rm -f ${WRKSRC}/doc/gcrypt.info

View File

@ -1,33 +0,0 @@
$OpenBSD: gcc-cipher_Makefile_in,v 1.1.1.1 2003/05/01 17:12:41 sturm Exp $
--- cipher/Makefile.in.orig Mon Jan 20 02:34:35 2003
+++ cipher/Makefile.in Thu May 1 08:53:25 2003
@@ -401,6 +401,29 @@ distclean-compile:
distclean-depend:
-rm -rf ./$(DEPDIR)
+# XXX: Workaround gcc bugs on sparc64
+sha1.o:
+@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -O0 -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+sha1.lo:
+@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -O0 -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2003/04/10 18:08:57 jsyn Exp $
# $OpenBSD: Makefile,v 1.12 2004/02/24 19:48:16 naddy Exp $
COMMENT= "strong hash library"
@ -19,11 +19,6 @@ PERMIT_DISTFILES_FTP= Yes
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
patch-*
# XXX workaround sparc64 gcc optimization bug
.if ${MACHINE_ARCH:Msparc64}
PATCH_LIST+= gcc-*
.endif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static

View File

@ -1,53 +0,0 @@
$OpenBSD: gcc-lib_Makefile_in,v 1.4 2003/02/09 20:57:31 lebel Exp $
--- lib/Makefile.in.orig Fri Oct 4 04:35:07 2002
+++ lib/Makefile.in Sun Feb 9 13:27:44 2003
@@ -225,6 +225,24 @@ distclean-compile:
distclean-depend:
-rm -rf ./$(DEPDIR)
+haval.o:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -O0 -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+sha1.o:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -O0 -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+sha256.o:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -O0 -c `test -f '$<' || echo '$(srcdir)/'`$<
+
.c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@@ -236,6 +254,24 @@ distclean-depend:
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `cygpath -w $<`
+
+haval.lo:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LTCOMPILE) -O0 -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+sha1.lo:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LTCOMPILE) -O0 -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+sha256.lo:
+@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LTCOMPILE) -O0 -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.c.lo:
@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@