Update to 990428... remove patches that are now in the official version.

This commit is contained in:
espie 1999-04-29 16:54:19 +00:00
parent b52042de2c
commit dbb6f244c5
8 changed files with 20 additions and 164 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 1999/04/28 15:40:26 espie Exp $
# $OpenBSD: Makefile,v 1.42 1999/04/29 16:54:19 espie Exp $
# This is a configuration file for egcs, snapshot flavor
# PLEASE use the regular egcs-stable for serious work, resort to this one
@ -46,7 +46,7 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/devel/dejagnu
ONE_ARCHIVE=yes
LATEST_DATE=1999-04-18
LATEST_DATE=1999-04-28
#### fetch section
# configuration is built so that you can test the next snapshot easily,
@ -54,7 +54,7 @@ LATEST_DATE=1999-04-18
# You also may have to remove/add some patches, as these things ARE
# usually passed along to the egcs ml.
#NEXT_DATE=1999-04-18
#NEXT_DATE=1999-04-28
#PATCH_DEBUG=yes
LATEST != echo ${LATEST_DATE} | sed -e s/-//g;
@ -105,17 +105,19 @@ DISTFILES+=egcs-chill-${LATEST}${EXTRACT_SUFX}
.endif
.if ! (defined(JUST_BUMP) && defined(NEXT_DATE))
SUPDISTFILES=egcs-${LATEST}${EXTRACT_SUFX}
.for sub in core tests g++ g77 java objc chill
SUPDISTFILES+=egcs-${sub}-${LATEST}${EXTRACT_SUFX}
.endfor
.endif
MASTER_SITES=
#MASTER_SITES+= ftp://egcs.cygnus.com/pub/${DIRECTORY}
MASTER_SITES+= ftp://egcs.cygnus.com/pub/${DIRECTORY}
MASTER_SITES+= ftp://ftp.lip6.fr/pub/${DIRECTORY}
MASTER_SITES+= ftp://go.cygnus.com/pub/ftp.cygnus.com/${DIRECTORY}
MASTER_SITES+= ftp://ftp.goof.com/pub/pcg/${DIRECTORY}
MASTER_SITES+= ftp://go.cygnus.com/pub/ftp.cygnus.com/${DIRECTORY}
#MASTER_SITES+= ftp://cambridge.cygnus.com/pub/${DIRECTORY}
MASTER_SITES+= ftp://sunsite.doc.ic.ac.uk/Mirrors/egcs.cygnus.com/pub/${DIRECTORY}
MASTER_SITES+= ftp://gd.tuwien.ac.at/gnu/${DIRECTORY}

View File

@ -1,62 +0,0 @@
Thu Apr 22 20:58:32 CEST 1999 Marc Espie <espie@cvs.openbsd.org>
* configure.in (openbsd): Factorize xmake_file.
(ix86 openbsd): trim obsolete comment.
(vax openbsd): typo.
--- gcc/configure.in.orig Thu Apr 22 20:54:36 1999
+++ gcc/configure.in Thu Apr 22 20:57:00 1999
@@ -518,6 +518,8 @@
tmake_file="t-libc-ok t-openbsd"
# avoid surprises, always provide an xm-openbsd file
xm_file=${cpu_type}/xm-openbsd.h
+ # don't depend on processor x-fragments as well
+ xmake_file=none
if test x$enable_threads = xyes; then
thread_file='posix'
tmake_file="${tmake_file} t-openbsd-thread"
@@ -624,7 +626,6 @@
alpha*-*-openbsd*)
# default x-alpha is only appropriate for dec-osf.
target_cpu_default="MASK_GAS"
- xmake_file=none
;;
alpha*-dec-osf*)
@@ -1147,7 +1148,6 @@
changequote(,)dnl
i[34567]86-*-openbsd*)
changequote([,])dnl
- # Remove when the math emulator is fixed
# we need collect2 until our bug is fixed...
use_collect2=yes
;;
@@ -2349,12 +2349,10 @@
mips*el-*-openbsd*) # mips little endian
target_cpu_default="MASK_GAS|MASK_ABICALLS"
tm_file=mips/openbsd.h
- xmake_file=none
;;
mips*-*-openbsd*) # mips big endian
target_cpu_default="MASK_GAS|MASK_ABICALLS"
tm_file=mips/openbsd-be.h
- xmake_file=none
;;
mips-sony-bsd* | mips-sony-newsos*) # Sony NEWS 3600 or risc/news.
tm_file="mips/news4.h ${tm_file}"
@@ -2723,7 +2721,6 @@
;;
powerpc-*-openbsd*)
tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd"
- xmake_file=none
;;
powerpc-*-beos*)
cpu_type=rs6000
@@ -3239,7 +3236,7 @@
float_format=vax
;;
vax-*-openbsd*)
- tmake_file="${tm_file} vax/t-openbsd"
+ tmake_file="${tmake_file} vax/t-openbsd"
;;
vax-*-ultrix*) # vaxen running ultrix
tm_file="${tm_file} vax/ultrix.h"

View File

@ -1,11 +0,0 @@
--- gcc/cp/Make-lang.in.orig Fri Apr 23 23:23:34 1999
+++ gcc/cp/Make-lang.in Fri Apr 23 23:23:50 1999
@@ -185,7 +185,7 @@
# Don't try to do write if `.' is not writable;
# in that case, we're installing from someone else's directory.
# But go ahead and fail if that directory hasn't been properly built.
-cplib2.ready: $(GCC_PASSES) $(LANGUAGES) $(LIBGCC2_DEPS) stmp-int-hdrs
+cplib2.ready: $(GCC_PASSES) $(LIBGCC2_DEPS) stmp-int-hdrs
@if [ -r cplib2.txt -a -w . ]; then \
case " $(LANGUAGES) " in \
*" "[cC]"++ "*) \

View File

@ -1,12 +1,11 @@
--- libstdc++/config/openbsd.ml.orig Sun Feb 28 23:12:57 1999
+++ libstdc++/config/openbsd.ml Mon Mar 1 00:47:07 1999
--- libstdc++/config/openbsd.ml.orig Thu Apr 29 02:45:22 1999
+++ libstdc++/config/openbsd.ml Thu Apr 29 02:46:21 1999
@@ -1,5 +1,6 @@
-# Base shared lib for OpenBSD i386
-
-LIBS = $(ARLIB) $(SHLIB) $(SHLINK) mshlink
+# Base shared lib for OpenBSD
+MAJOR_OFFSET=27
+MSHLINK = libstdc++.so.`expr $(INTERFACE) + $(MAJOR_OFFSET)`.0
+LIBS = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) mshlink
LIBS = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) mshlink
SHFLAGS = -nostdlib -Wl,-Bshareable,-Bforcearchive
SHDEPS = -lm

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 1999/04/28 15:40:26 espie Exp $
# $OpenBSD: Makefile,v 1.42 1999/04/29 16:54:19 espie Exp $
# This is a configuration file for egcs, snapshot flavor
# PLEASE use the regular egcs-stable for serious work, resort to this one
@ -46,7 +46,7 @@ BUILD_DEPENDS+= runtest:${PORTSDIR}/devel/dejagnu
ONE_ARCHIVE=yes
LATEST_DATE=1999-04-18
LATEST_DATE=1999-04-28
#### fetch section
# configuration is built so that you can test the next snapshot easily,
@ -54,7 +54,7 @@ LATEST_DATE=1999-04-18
# You also may have to remove/add some patches, as these things ARE
# usually passed along to the egcs ml.
#NEXT_DATE=1999-04-18
#NEXT_DATE=1999-04-28
#PATCH_DEBUG=yes
LATEST != echo ${LATEST_DATE} | sed -e s/-//g;
@ -105,17 +105,19 @@ DISTFILES+=egcs-chill-${LATEST}${EXTRACT_SUFX}
.endif
.if ! (defined(JUST_BUMP) && defined(NEXT_DATE))
SUPDISTFILES=egcs-${LATEST}${EXTRACT_SUFX}
.for sub in core tests g++ g77 java objc chill
SUPDISTFILES+=egcs-${sub}-${LATEST}${EXTRACT_SUFX}
.endfor
.endif
MASTER_SITES=
#MASTER_SITES+= ftp://egcs.cygnus.com/pub/${DIRECTORY}
MASTER_SITES+= ftp://egcs.cygnus.com/pub/${DIRECTORY}
MASTER_SITES+= ftp://ftp.lip6.fr/pub/${DIRECTORY}
MASTER_SITES+= ftp://go.cygnus.com/pub/ftp.cygnus.com/${DIRECTORY}
MASTER_SITES+= ftp://ftp.goof.com/pub/pcg/${DIRECTORY}
MASTER_SITES+= ftp://go.cygnus.com/pub/ftp.cygnus.com/${DIRECTORY}
#MASTER_SITES+= ftp://cambridge.cygnus.com/pub/${DIRECTORY}
MASTER_SITES+= ftp://sunsite.doc.ic.ac.uk/Mirrors/egcs.cygnus.com/pub/${DIRECTORY}
MASTER_SITES+= ftp://gd.tuwien.ac.at/gnu/${DIRECTORY}

View File

@ -1,62 +0,0 @@
Thu Apr 22 20:58:32 CEST 1999 Marc Espie <espie@cvs.openbsd.org>
* configure.in (openbsd): Factorize xmake_file.
(ix86 openbsd): trim obsolete comment.
(vax openbsd): typo.
--- gcc/configure.in.orig Thu Apr 22 20:54:36 1999
+++ gcc/configure.in Thu Apr 22 20:57:00 1999
@@ -518,6 +518,8 @@
tmake_file="t-libc-ok t-openbsd"
# avoid surprises, always provide an xm-openbsd file
xm_file=${cpu_type}/xm-openbsd.h
+ # don't depend on processor x-fragments as well
+ xmake_file=none
if test x$enable_threads = xyes; then
thread_file='posix'
tmake_file="${tmake_file} t-openbsd-thread"
@@ -624,7 +626,6 @@
alpha*-*-openbsd*)
# default x-alpha is only appropriate for dec-osf.
target_cpu_default="MASK_GAS"
- xmake_file=none
;;
alpha*-dec-osf*)
@@ -1147,7 +1148,6 @@
changequote(,)dnl
i[34567]86-*-openbsd*)
changequote([,])dnl
- # Remove when the math emulator is fixed
# we need collect2 until our bug is fixed...
use_collect2=yes
;;
@@ -2349,12 +2349,10 @@
mips*el-*-openbsd*) # mips little endian
target_cpu_default="MASK_GAS|MASK_ABICALLS"
tm_file=mips/openbsd.h
- xmake_file=none
;;
mips*-*-openbsd*) # mips big endian
target_cpu_default="MASK_GAS|MASK_ABICALLS"
tm_file=mips/openbsd-be.h
- xmake_file=none
;;
mips-sony-bsd* | mips-sony-newsos*) # Sony NEWS 3600 or risc/news.
tm_file="mips/news4.h ${tm_file}"
@@ -2723,7 +2721,6 @@
;;
powerpc-*-openbsd*)
tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd"
- xmake_file=none
;;
powerpc-*-beos*)
cpu_type=rs6000
@@ -3239,7 +3236,7 @@
float_format=vax
;;
vax-*-openbsd*)
- tmake_file="${tm_file} vax/t-openbsd"
+ tmake_file="${tmake_file} vax/t-openbsd"
;;
vax-*-ultrix*) # vaxen running ultrix
tm_file="${tm_file} vax/ultrix.h"

View File

@ -1,11 +0,0 @@
--- gcc/cp/Make-lang.in.orig Fri Apr 23 23:23:34 1999
+++ gcc/cp/Make-lang.in Fri Apr 23 23:23:50 1999
@@ -185,7 +185,7 @@
# Don't try to do write if `.' is not writable;
# in that case, we're installing from someone else's directory.
# But go ahead and fail if that directory hasn't been properly built.
-cplib2.ready: $(GCC_PASSES) $(LANGUAGES) $(LIBGCC2_DEPS) stmp-int-hdrs
+cplib2.ready: $(GCC_PASSES) $(LIBGCC2_DEPS) stmp-int-hdrs
@if [ -r cplib2.txt -a -w . ]; then \
case " $(LANGUAGES) " in \
*" "[cC]"++ "*) \

View File

@ -1,12 +1,11 @@
--- libstdc++/config/openbsd.ml.orig Sun Feb 28 23:12:57 1999
+++ libstdc++/config/openbsd.ml Mon Mar 1 00:47:07 1999
--- libstdc++/config/openbsd.ml.orig Thu Apr 29 02:45:22 1999
+++ libstdc++/config/openbsd.ml Thu Apr 29 02:46:21 1999
@@ -1,5 +1,6 @@
-# Base shared lib for OpenBSD i386
-
-LIBS = $(ARLIB) $(SHLIB) $(SHLINK) mshlink
+# Base shared lib for OpenBSD
+MAJOR_OFFSET=27
+MSHLINK = libstdc++.so.`expr $(INTERFACE) + $(MAJOR_OFFSET)`.0
+LIBS = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) mshlink
LIBS = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) mshlink
SHFLAGS = -nostdlib -Wl,-Bshareable,-Bforcearchive
SHDEPS = -lm