From 367f3c3889e529185dacffc3c52c1e4d0bfc15bc Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 13 Oct 1998 14:52:34 +0000 Subject: [PATCH] Clean-up. --- lang/egcs-stable/Makefile | 4 ++-- lang/egcs-stable/files/PLIST.template | 8 ++++++-- lang/egcs-stable/files/tests/i386.results | 10 +++++++++- lang/egcs-stable/patches/patch-ab | 15 ++++++++++++--- lang/egcs-stable/patches/patch-ae | 13 ++++++++++--- lang/egcs/stable/Makefile | 4 ++-- lang/egcs/stable/files/PLIST.template | 8 ++++++-- lang/egcs/stable/files/tests/i386.results | 10 +++++++++- lang/egcs/stable/patches/patch-ab | 15 ++++++++++++--- lang/egcs/stable/patches/patch-ae | 13 ++++++++++--- 10 files changed, 78 insertions(+), 22 deletions(-) diff --git a/lang/egcs-stable/Makefile b/lang/egcs-stable/Makefile index 722dd44764d..a944d5fadfc 100644 --- a/lang/egcs-stable/Makefile +++ b/lang/egcs-stable/Makefile @@ -3,7 +3,7 @@ # Date created: 25 sep 98 # Whom: Marc Espie # -# $OpenBSD: Makefile,v 1.3 1998/10/11 14:08:23 espie Exp $ +# $OpenBSD: Makefile,v 1.4 1998/10/13 14:52:34 espie Exp $ # # This is a configuration file for egcs, stable release @@ -80,7 +80,7 @@ CONFIGURE_SCRIPT=../source/configure CONFIGURE_ENV=CFLAGS=-O2 CONFIGURE_ARGS= --prefix=${PREFIX} \ ---verbose --with-gnu-ld ---with-gnu-as \ +--verbose --with-gnu-ld --with-gnu-as \ --program-transform-name=s,^,e, .if (${MACHINE_ARCH} != "alpha") CONFIGURE_ARGS+=--enable-shared diff --git a/lang/egcs-stable/files/PLIST.template b/lang/egcs-stable/files/PLIST.template index a9278acf0d3..8329c0660e1 100644 --- a/lang/egcs-stable/files/PLIST.template +++ b/lang/egcs-stable/files/PLIST.template @@ -2,6 +2,8 @@ @name egcs-1.1b @pkgdep autoconf-2.12 @pkgdep m4-1.4 +@unexec install-info --delete %D/info/egcc.info %D/info/dir +@unexec install-info --delete %D/info/ecpp.info %D/info/dir ARCH/include/_G_config.h ARCH/lib/libiberty.a bin/ARCH-gcc @@ -202,11 +204,13 @@ lib/libstdc++.a lib/libstdc++.so lib/libstdc++.so.2.9 lib/libstdc++.so.2.9.0 -man/man1/cccp.1 +man/man1/ecccp.1 man/man1/eg++.1 man/man1/egcc.1 @dirrm include/g++/std @dirrm include/g++ -@dirrm lib/gcc/lib/ARCH/egcs-2.91.57/include +@dirrm lib/gcc-lib/ARCH/egcs-2.91.57/include @dirrm lib/gcc-lib/ARCH/egcs-2.91.57 @exec [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -m /usr/local/lib +@exec install-info %D/info/egcc.info %D/info/dir +@exec install-info %D/info/ecpp.info %D/info/dir diff --git a/lang/egcs-stable/files/tests/i386.results b/lang/egcs-stable/files/tests/i386.results index b41e3bb0c74..03e195f1db4 100644 --- a/lang/egcs-stable/files/tests/i386.results +++ b/lang/egcs-stable/files/tests/i386.results @@ -56,6 +56,14 @@ gcc does not support -Os) # of expected failures 221 # of untested testcases 7 -Looking at it more closely, prog +There is one bug in gcc 2.8.1 that also shows up in egcs under standard +OpenBSD configuration: if using -finline-functions, gcc emits stabs lines +for CTORS at an incorrect position. Hence, the linker no longer finds the +CTORS, hence everything breaks down. This has been reported to egcs-bugs. + +The way we get around this problem is by relying on collect2: egcs is +built with use_collect2=yes, so it does no longer relies on stabs for +propert CTOR collection, and the bug is no longer visible. + Marc Espie diff --git a/lang/egcs-stable/patches/patch-ab b/lang/egcs-stable/patches/patch-ab index 1a78a1a73da..107ec8e3af4 100644 --- a/lang/egcs-stable/patches/patch-ab +++ b/lang/egcs-stable/patches/patch-ab @@ -1,10 +1,19 @@ ---- gcc/gcc.texi.orig Tue Sep 29 02:36:59 1998 -+++ gcc/gcc.texi Tue Sep 29 02:37:18 1998 +--- gcc/gcc.texi.orig Sat Aug 29 11:16:20 1998 ++++ gcc/gcc.texi Tue Oct 13 14:28:22 1998 @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c %**start of header -@setfilename gcc.info -+@setfilename egcs.info ++@setfilename egcc.info @c @setfilename usegcc.info @c @setfilename portgcc.info @c To produce the full manual, use the "gcc.info" setfilename, and +@@ -82,7 +82,7 @@ + @ifinfo + @dircategory Programming + @direntry +-* gcc: (gcc). The GNU C compiler. ++* egcc: (egcc). The experimental GNU C compiler. + @end direntry + @ifset INTERNALS + @ifset USING diff --git a/lang/egcs-stable/patches/patch-ae b/lang/egcs-stable/patches/patch-ae index 0470020ee17..9cf242ea012 100644 --- a/lang/egcs-stable/patches/patch-ae +++ b/lang/egcs-stable/patches/patch-ae @@ -1,9 +1,16 @@ ---- gcc/cpp.texi.orig Thu Oct 8 21:23:50 1998 -+++ gcc/cpp.texi Thu Oct 8 21:23:58 1998 -@@ -1,5 +1,5 @@ +--- gcc/cpp.texi.orig Tue Jun 23 10:35:51 1998 ++++ gcc/cpp.texi Tue Oct 13 14:28:51 1998 +@@ -1,11 +1,11 @@ \input texinfo -@setfilename cpp.info +@setfilename ecpp.info @settitle The C Preprocessor @ifinfo + @dircategory Programming + @direntry +-* Cpp: (cpp). The GNU C preprocessor. ++* ECpp: (ecpp). The experimental GNU C preprocessor. + @end direntry + @end ifinfo + diff --git a/lang/egcs/stable/Makefile b/lang/egcs/stable/Makefile index 722dd44764d..a944d5fadfc 100644 --- a/lang/egcs/stable/Makefile +++ b/lang/egcs/stable/Makefile @@ -3,7 +3,7 @@ # Date created: 25 sep 98 # Whom: Marc Espie # -# $OpenBSD: Makefile,v 1.3 1998/10/11 14:08:23 espie Exp $ +# $OpenBSD: Makefile,v 1.4 1998/10/13 14:52:34 espie Exp $ # # This is a configuration file for egcs, stable release @@ -80,7 +80,7 @@ CONFIGURE_SCRIPT=../source/configure CONFIGURE_ENV=CFLAGS=-O2 CONFIGURE_ARGS= --prefix=${PREFIX} \ ---verbose --with-gnu-ld ---with-gnu-as \ +--verbose --with-gnu-ld --with-gnu-as \ --program-transform-name=s,^,e, .if (${MACHINE_ARCH} != "alpha") CONFIGURE_ARGS+=--enable-shared diff --git a/lang/egcs/stable/files/PLIST.template b/lang/egcs/stable/files/PLIST.template index a9278acf0d3..8329c0660e1 100644 --- a/lang/egcs/stable/files/PLIST.template +++ b/lang/egcs/stable/files/PLIST.template @@ -2,6 +2,8 @@ @name egcs-1.1b @pkgdep autoconf-2.12 @pkgdep m4-1.4 +@unexec install-info --delete %D/info/egcc.info %D/info/dir +@unexec install-info --delete %D/info/ecpp.info %D/info/dir ARCH/include/_G_config.h ARCH/lib/libiberty.a bin/ARCH-gcc @@ -202,11 +204,13 @@ lib/libstdc++.a lib/libstdc++.so lib/libstdc++.so.2.9 lib/libstdc++.so.2.9.0 -man/man1/cccp.1 +man/man1/ecccp.1 man/man1/eg++.1 man/man1/egcc.1 @dirrm include/g++/std @dirrm include/g++ -@dirrm lib/gcc/lib/ARCH/egcs-2.91.57/include +@dirrm lib/gcc-lib/ARCH/egcs-2.91.57/include @dirrm lib/gcc-lib/ARCH/egcs-2.91.57 @exec [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -m /usr/local/lib +@exec install-info %D/info/egcc.info %D/info/dir +@exec install-info %D/info/ecpp.info %D/info/dir diff --git a/lang/egcs/stable/files/tests/i386.results b/lang/egcs/stable/files/tests/i386.results index b41e3bb0c74..03e195f1db4 100644 --- a/lang/egcs/stable/files/tests/i386.results +++ b/lang/egcs/stable/files/tests/i386.results @@ -56,6 +56,14 @@ gcc does not support -Os) # of expected failures 221 # of untested testcases 7 -Looking at it more closely, prog +There is one bug in gcc 2.8.1 that also shows up in egcs under standard +OpenBSD configuration: if using -finline-functions, gcc emits stabs lines +for CTORS at an incorrect position. Hence, the linker no longer finds the +CTORS, hence everything breaks down. This has been reported to egcs-bugs. + +The way we get around this problem is by relying on collect2: egcs is +built with use_collect2=yes, so it does no longer relies on stabs for +propert CTOR collection, and the bug is no longer visible. + Marc Espie diff --git a/lang/egcs/stable/patches/patch-ab b/lang/egcs/stable/patches/patch-ab index 1a78a1a73da..107ec8e3af4 100644 --- a/lang/egcs/stable/patches/patch-ab +++ b/lang/egcs/stable/patches/patch-ab @@ -1,10 +1,19 @@ ---- gcc/gcc.texi.orig Tue Sep 29 02:36:59 1998 -+++ gcc/gcc.texi Tue Sep 29 02:37:18 1998 +--- gcc/gcc.texi.orig Sat Aug 29 11:16:20 1998 ++++ gcc/gcc.texi Tue Oct 13 14:28:22 1998 @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c %**start of header -@setfilename gcc.info -+@setfilename egcs.info ++@setfilename egcc.info @c @setfilename usegcc.info @c @setfilename portgcc.info @c To produce the full manual, use the "gcc.info" setfilename, and +@@ -82,7 +82,7 @@ + @ifinfo + @dircategory Programming + @direntry +-* gcc: (gcc). The GNU C compiler. ++* egcc: (egcc). The experimental GNU C compiler. + @end direntry + @ifset INTERNALS + @ifset USING diff --git a/lang/egcs/stable/patches/patch-ae b/lang/egcs/stable/patches/patch-ae index 0470020ee17..9cf242ea012 100644 --- a/lang/egcs/stable/patches/patch-ae +++ b/lang/egcs/stable/patches/patch-ae @@ -1,9 +1,16 @@ ---- gcc/cpp.texi.orig Thu Oct 8 21:23:50 1998 -+++ gcc/cpp.texi Thu Oct 8 21:23:58 1998 -@@ -1,5 +1,5 @@ +--- gcc/cpp.texi.orig Tue Jun 23 10:35:51 1998 ++++ gcc/cpp.texi Tue Oct 13 14:28:51 1998 +@@ -1,11 +1,11 @@ \input texinfo -@setfilename cpp.info +@setfilename ecpp.info @settitle The C Preprocessor @ifinfo + @dircategory Programming + @direntry +-* Cpp: (cpp). The GNU C preprocessor. ++* ECpp: (ecpp). The experimental GNU C preprocessor. + @end direntry + @end ifinfo +