Some fixes:

- patch libstdc++-v3/libmath to unconfuse libtool. - sparc needs the same fix as i386 to not emit bogus frame info.
2001-07-13 14:06:53 +00:00 · 2001-07-13 14:06:53 +00:00 · 5e1c3c14ed
commit 5e1c3c14ed
parent ea489ac5a2
9 changed files with 74 additions and 25 deletions
--- a/lang/egcs/stable/Makefile
+++ b/lang/egcs/stable/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2001/07/13 11:24:22 naddy Exp $
+# $OpenBSD: Makefile,v 1.44 2001/07/13 14:06:53 espie Exp $

 # This is a configuration file for egcs

@ -244,7 +244,7 @@ SEPARATE_BUILD=concurrent
 # build section
 # should work without gmake. If it turns out to be needed, this must be 
 # reported to MAINTAINER.
-USE_GMAKE= yes
+#USE_GMAKE= yes

 # you shouldn't skip bootstrap unless you know what you're doing
 # use bootstrap-lean if you're pressed for space
--- a/lang/egcs/stable/patches/patch-gcc_config_i386_openbsd_h
+++ b/lang/egcs/stable/patches/patch-gcc_config_i386_openbsd_h
@ -1,7 +1,16 @@
-$OpenBSD: patch-gcc_config_i386_openbsd_h,v 1.1 2001/07/09 10:26:20 espie Exp $
+$OpenBSD: patch-gcc_config_i386_openbsd_h,v 1.2 2001/07/13 14:06:56 espie Exp $
 --- gcc/config/i386/openbsd.h.orig	Sun May 20 21:49:17 2001
-+++ gcc/config/i386/openbsd.h	Mon Jul  9 08:39:47 2001
-@@ -133,3 +133,8 @@ Boston, MA 02111-1307, USA.  */
+++ gcc/config/i386/openbsd.h	Fri Jul 13 16:03:53 2001
+@@ -114,6 +114,8 @@ Boston, MA 02111-1307, USA.  */
+    configuration files...  */
+ #define DWARF2_UNWIND_INFO 0
+ 
+#undef ASM_PREFERRED_EH_DATA_FORMAT
+
+ /* Assembler format: alignment output.  */
+ 
+ /* A C statement to output to the stdio stream FILE an assembler
+@@ -133,3 +135,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 /* Note that we pick up ASM_OUTPUT_MI_THUNK from unix.h.  */
@ -9,4 +18,3 @@ $OpenBSD: patch-gcc_config_i386_openbsd_h,v 1.1 2001/07/09 10:26:20 espie Exp $
 +#undef ASM_COMMENT_START
 +#define ASM_COMMENT_START ";#"
 +
-+#undef ASM_PREFERRED_EH_DATA_FORMAT
--- a/lang/egcs/stable/patches/patch-gcc_config_openbsd_h
+++ b/lang/egcs/stable/patches/patch-gcc_config_openbsd_h
@ -1,6 +1,6 @@
-$OpenBSD: patch-gcc_config_openbsd_h,v 1.1 2001/07/09 10:26:20 espie Exp $
+$OpenBSD: patch-gcc_config_openbsd_h,v 1.2 2001/07/13 14:06:57 espie Exp $
 --- gcc/config/openbsd.h.orig	Mon Sep 25 13:45:51 2000
-+++ gcc/config/openbsd.h	Fri Jul  6 16:46:31 2001
+++ gcc/config/openbsd.h	Tue Jul 10 12:39:40 2001
@@ -78,12 +78,16 @@ Boston, MA 02111-1307, USA.  */
    since all code must be compiled with -pthread to work. 
    This two-stage defines makes it easy to pick that for targets that
@ -19,23 +19,15 @@ $OpenBSD: patch-gcc_config_openbsd_h,v 1.1 2001/07/09 10:26:20 espie Exp $
 
 #ifndef OBSD_HAS_CORRECT_SPECS
 
-@@ -103,6 +107,15 @@ Boston, MA 02111-1307, USA.  */
+@@ -103,6 +107,7 @@ Boston, MA 02111-1307, USA.  */
    pic code.  */
 #undef ASM_SPEC
 #define ASM_SPEC "%{fpic:-k} %{fPIC:-k -K} %|"
-+
-+/* Exception region output.  */
-+
-+#undef ASM_PREFERRED_EH_DATA_FORMAT
-+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL)                      \
-+  (flag_pic ? (GLOBAL ? DW_EH_PE_indirect : 0) | DW_EH_PE_datarel      \
-+     : DW_EH_PE_absptr)
-+
 +
 #else
 /* Since we use gas, stdin -> - is a good idea, but we don't want to
    override native specs just for that.  */
-@@ -116,10 +129,10 @@ Boston, MA 02111-1307, USA.  */
+@@ -116,10 +121,10 @@ Boston, MA 02111-1307, USA.  */
 #undef LINK_SPEC
 #ifdef OBSD_NO_DYNAMIC_LIBRARIES
 #define LINK_SPEC \
--- a/lang/egcs/stable/patches/patch-gcc_config_sparc_openbsd_h
+++ b/lang/egcs/stable/patches/patch-gcc_config_sparc_openbsd_h
@ -0,0 +1,11 @@
+$OpenBSD: patch-gcc_config_sparc_openbsd_h,v 1.1 2001/07/13 14:06:58 espie Exp $
+--- gcc/config/sparc/openbsd.h.orig	Fri Jul 13 16:03:16 2001
+++ gcc/config/sparc/openbsd.h	Fri Jul 13 16:03:46 2001
+@@ -64,5 +64,6 @@ Boston, MA 02111-1307, USA.  */
+    configuration files...  */
+ #define DWARF2_UNWIND_INFO 0
+ 
+-/* Default sparc.h does already define ASM_OUTPUT_MI_THUNK */
+#undef ASM_PREFERRED_EH_DATA_FORMAT
+ 
+/* Default sparc.h does already define ASM_OUTPUT_MI_THUNK */
--- a/lang/egcs/stable/patches/patch-libstdc++-v3-configure_in
+++ b/lang/egcs/stable/patches/patch-libstdc++-v3-configure_in
@ -10,7 +10,7 @@ first.
 	machine/endian.h if available.

 --- libstdc++-v3/configure.in.orig	Thu Jun 14 10:47:35 2001
-+++ libstdc++-v3/configure.in	Mon Jul  9 08:43:44 2001
+++ libstdc++-v3/configure.in	Fri Jul 13 15:13:06 2001
@@ -204,7 +204,7 @@ else
 
   # Check for available headers.
--- a/lang/egcs/stable/patches/patch-libstdc++-v3_libmath_Makefile_in
+++ b/lang/egcs/stable/patches/patch-libstdc++-v3_libmath_Makefile_in
@ -0,0 +1,38 @@
+$OpenBSD: patch-libstdc++-v3_libmath_Makefile_in,v 1.1 2001/07/13 14:06:59 espie Exp $
+--- libstdc++-v3/libmath/Makefile.in.orig	Mon May 14 21:49:10 2001
+++ libstdc++-v3/libmath/Makefile.in	Fri Jul 13 15:13:06 2001
+@@ -131,7 +131,7 @@ libmath_la_DEPENDENCIES = $(libmath_la_L
+ libmath_la_SOURCES =  	signbit.c signbitf.c
+ 
+ 
+-LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link --tag=CC "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ 
+ # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
+ GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@
+@@ -157,7 +157,7 @@ libmath_la_LDFLAGS = 
+ libmath_la_OBJECTS =  signbit.lo signbitf.lo
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag CC $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ DIST_COMMON =  Makefile.am Makefile.in
+ 
+@@ -215,13 +215,13 @@ distclean-compile:
+ maintainer-clean-compile:
+ 
+ .c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+	$(LIBTOOL) --mode=compile --tag CC $(COMPILE) -c $<
+ 
+ .s.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+	$(LIBTOOL) --mode=compile --tag CC $(COMPILE) -c $<
+ 
+ .S.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+	$(LIBTOOL) --mode=compile --tag CC $(COMPILE) -c $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
--- a/lang/egcs/stable/patches/patch-libstdc++-v3_libmath_mathconf_h
+++ b/lang/egcs/stable/patches/patch-libstdc++-v3_libmath_mathconf_h
@ -1,6 +1,6 @@
-$OpenBSD: patch-libstdc++-v3_libmath_mathconf_h,v 1.2 2001/07/09 10:26:21 espie Exp $
+$OpenBSD: patch-libstdc++-v3_libmath_mathconf_h,v 1.3 2001/07/13 14:06:59 espie Exp $
 --- libstdc++-v3/libmath/mathconf.h.orig	Sun Feb 25 10:25:42 2001
-+++ libstdc++-v3/libmath/mathconf.h	Mon Jul  9 08:43:44 2001
+++ libstdc++-v3/libmath/mathconf.h	Fri Jul 13 15:13:06 2001
@@ -34,6 +34,9 @@
 # include <endian.h>
 #else
--- a/lang/egcs/stable/patches/patch-libstdc++-v3_libsupc++_Makefile_in
+++ b/lang/egcs/stable/patches/patch-libstdc++-v3_libsupc++_Makefile_in
@ -1,6 +1,6 @@
-$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.2 2001/07/09 10:26:21 espie Exp $
+$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.3 2001/07/13 14:07:00 espie Exp $
 --- libstdc++-v3/libsupc++/Makefile.in.orig	Mon Jun  4 04:29:37 2001
-+++ libstdc++-v3/libsupc++/Makefile.in	Mon Jul  9 08:43:44 2001
+++ libstdc++-v3/libsupc++/Makefile.in	Fri Jul 13 15:13:06 2001
@@ -32,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
--- a/lang/egcs/stable/patches/patch-libstdc++-v3_src_Makefile_in
+++ b/lang/egcs/stable/patches/patch-libstdc++-v3_src_Makefile_in
@ -1,6 +1,6 @@
-$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.2 2001/07/09 10:26:21 espie Exp $
+$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.3 2001/07/13 14:07:01 espie Exp $
 --- libstdc++-v3/src/Makefile.in.orig	Fri Jun  8 22:09:30 2001
-+++ libstdc++-v3/src/Makefile.in	Mon Jul  9 08:43:44 2001
+++ libstdc++-v3/src/Makefile.in	Fri Jul 13 15:13:06 2001
@@ -33,7 +33,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include