cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Testsuite wanted installed libstdc++, because libstdc++.a link was not done

Browse Source 
properly.

Clean a few odds & ends of main configuration.

Fix a long-standing bug that let libgcc.a get rebuilt again and again,
e.g., once for make build, once for make install
This commit is contained in:
espie 1999-04-23 13:44:32 +00:00
parent 1282c73609
commit 712de16f65
6 changed files with 202 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lang/egcs-snapshot/patches/patch-core-config-cleanup Normal file
View File

@ -0,0 +1,62 @@
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"

27
lang/egcs-snapshot/patches/patch-core-libgcc-dep-bug Normal file
View File

@ -0,0 +1,27 @@
--- gcc/Makefile.in.orig Fri Apr 23 14:36:25 1999
+++ gcc/Makefile.in Fri Apr 23 15:15:13 1999
@@ -1053,8 +1053,9 @@
fi
LIB2ADD = $(srcdir)/frame.c $(LIB2FUNCS_EXTRA) $(LANG_LIB2FUNCS)
-libgcc2.a: libgcc2.c libgcc2.ready $(CONFIG_H) $(FPBIT) $(DPBIT) $(LIB2ADD) \
- machmode.h longlong.h frame.h gbl-ctors.h config.status
+libgcc2.a: $(srcdir)/libgcc2.c libgcc2.ready $(CONFIG_H) $(FPBIT) \
+ $(DPBIT) $(LIB2ADD) $(srcdir)/machmode.h $(srcdir)/longlong.h \
+ $(srcdir)/frame.h $(srcdir)/gbl-ctors.h config.status
# Actually build it in tmplibgcc2.a, then rename at end,
# so that libgcc2.a itself remains nonexistent if compilation is aborted.
-rm -f tmplibgcc2.a
@@ -1185,9 +1186,9 @@
touch s-mlib
# Build multiple copies of libgcc.a, one for each target switch.
-stmp-multilib: $(LIBGCC1) libgcc2.c libgcc2.ready $(CONFIG_H) \
- frame.h \
- $(LIB2ADD) machmode.h longlong.h gbl-ctors.h config.status
+stmp-multilib: $(LIBGCC1) $(srcdir)/libgcc2.c libgcc2.ready $(CONFIG_H) \
+ $(srcdir)/frame.h $(LIB2ADD) $(srcdir)/machmode.h $(srcdir)/longlong.h \
+ $(srcdir)/gbl-ctors.h config.status
for i in `$(GCC_FOR_TARGET) --print-multi-lib`; do \
dir=`echo $$i | sed -e 's/;.*$$//'`; \
flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \

12
lang/egcs-snapshot/patches/patch-g++-libversion Normal file
View File

@ -0,0 +1,12 @@
--- libstdc++/config/openbsd.ml.orig Sun Feb 28 23:12:57 1999
+++ libstdc++/config/openbsd.ml Mon Mar 1 00:47:07 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
SHFLAGS = -nostdlib -Wl,-Bshareable,-Bforcearchive
SHDEPS = -lm

62
lang/egcs/snapshot/patches/patch-core-config-cleanup Normal file
View File

@ -0,0 +1,62 @@
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"

27
lang/egcs/snapshot/patches/patch-core-libgcc-dep-bug Normal file
View File

@ -0,0 +1,27 @@
--- gcc/Makefile.in.orig Fri Apr 23 14:36:25 1999
+++ gcc/Makefile.in Fri Apr 23 15:15:13 1999
@@ -1053,8 +1053,9 @@
fi
LIB2ADD = $(srcdir)/frame.c $(LIB2FUNCS_EXTRA) $(LANG_LIB2FUNCS)
-libgcc2.a: libgcc2.c libgcc2.ready $(CONFIG_H) $(FPBIT) $(DPBIT) $(LIB2ADD) \
- machmode.h longlong.h frame.h gbl-ctors.h config.status
+libgcc2.a: $(srcdir)/libgcc2.c libgcc2.ready $(CONFIG_H) $(FPBIT) \
+ $(DPBIT) $(LIB2ADD) $(srcdir)/machmode.h $(srcdir)/longlong.h \
+ $(srcdir)/frame.h $(srcdir)/gbl-ctors.h config.status
# Actually build it in tmplibgcc2.a, then rename at end,
# so that libgcc2.a itself remains nonexistent if compilation is aborted.
-rm -f tmplibgcc2.a
@@ -1185,9 +1186,9 @@
touch s-mlib
# Build multiple copies of libgcc.a, one for each target switch.
-stmp-multilib: $(LIBGCC1) libgcc2.c libgcc2.ready $(CONFIG_H) \
- frame.h \
- $(LIB2ADD) machmode.h longlong.h gbl-ctors.h config.status
+stmp-multilib: $(LIBGCC1) $(srcdir)/libgcc2.c libgcc2.ready $(CONFIG_H) \
+ $(srcdir)/frame.h $(LIB2ADD) $(srcdir)/machmode.h $(srcdir)/longlong.h \
+ $(srcdir)/gbl-ctors.h config.status
for i in `$(GCC_FOR_TARGET) --print-multi-lib`; do \
dir=`echo $$i | sed -e 's/;.*$$//'`; \
flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \

12
lang/egcs/snapshot/patches/patch-g++-libversion Normal file
View File

@ -0,0 +1,12 @@
--- libstdc++/config/openbsd.ml.orig Sun Feb 28 23:12:57 1999
+++ libstdc++/config/openbsd.ml Mon Mar 1 00:47:07 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
SHFLAGS = -nostdlib -Wl,-Bshareable,-Bforcearchive
SHDEPS = -lm