Make sure that sjlj exceptions are used everywhere and be consistent with

the defines.

While I'm here pull across a fix for LIB_SPEC that prevents libc from
being linked in when linking a shared library.

Fixes pkg/12620 from Takuya SHIOZAKI <tshiozak@netbsd.org>

8 files changed, 73 insertions, 25 deletions

diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index b5f103d3e61..763f089173b 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:50 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/27 10:45:22 skrll Exp $
 
 SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8
 Size (gcc-2.95.2.tar.gz) = 12885815 bytes
 SHA1 (patch-aa) = bae789b2acbcae4cf8876d116c80ec8e4b3da359
-SHA1 (patch-ab) = f440c18447df47cf5dbe964a84ed1e287c33baff
+SHA1 (patch-ab) = 8895083742d7a2acedee1d1405a9fe2d44fbb3c3
 SHA1 (patch-ac) = 3dddca70bd3860afdfb066d4b59a144dd7c2a520
 SHA1 (patch-ad) = e09ff41ba073b2fd1cbdd15a555ddc3b99938c92
-SHA1 (patch-ae) = 1373612dadfa905dc605fee0a8ffefda1854c472
-SHA1 (patch-af) = 24df44ef7b6ad7f1de79dda4420c7198112d6e8a
+SHA1 (patch-ae) = 7e675a8fea9c45169deac34eae5a9e23ec6c1d77
+SHA1 (patch-af) = 8a6b6b9cbd94001523102a788fdfe7f3638309eb
 SHA1 (patch-ag) = 7619a10501280a121da4813e021a33a948e7f7b4
 SHA1 (patch-ah) = fb50a9fe36b00096a2d98c27ad0a9d14dd58db70
 SHA1 (patch-ai) = 6b377f16fcefcf90d34192b10344c75f5a43d848
 SHA1 (patch-aj) = 20ea2627f79292c8127d1ddc317ce75e45506721
 SHA1 (patch-ak) = d92aa879ddb87c100b2168bd58307c32a08ed54b
-SHA1 (patch-al) = 5c431d252d5f303963095ae1db8f258999f9075f
+SHA1 (patch-al) = 5dc1df948449be6b076be783c44359663c95f0e0
 SHA1 (patch-am) = 575252905cdfa59f814c8b39e9733fa658061f9f
 SHA1 (patch-an) = 98e4a21e5ee1f1c7ce86387278b17bd12cea2c49
 SHA1 (patch-ao) = 8aa4b32592ab491309a0daecd2ea4c08498ce072
@@ -24,3 +24,6 @@ SHA1 (patch-as) = 7144acf5b568b4487f790ee61c1d510754aa9827
 SHA1 (patch-at) = 3a9aa67b107126ad247352aa5f34bb02fa9ae6a5
 SHA1 (patch-au) = b11c3982d0ee9bcdd42b5ac320033f5772c1933d
 SHA1 (patch-av) = fac14cc43a451671ee825961c24870426991f4c7
+SHA1 (patch-aw) = 6a793c8735e167dbcab1c33248438a6ac8057717
+SHA1 (patch-ax) = 242d5219ba8b0debe038e186deecc980f9bf9a3f
+SHA1 (patch-ay) = eaaf536efdee990fa6970b1281fed4c6f2621c26
diff --git a/lang/gcc/patches/patch-ab b/lang/gcc/patches/patch-ab
index ff2af309a8e..343df06e3c0 100644
--- a/lang/gcc/patches/patch-ab
+++ b/lang/gcc/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2000/09/15 23:58:48 tron Exp $
+$NetBSD: patch-ab,v 1.2 2001/04/27 10:45:22 skrll Exp $
 
---- ../gcc-2.95.2/gcc/config/i386/netbsd-elf.h.orig	Sat Sep 16 00:17:42 2000
-+++ ../gcc-2.95.2/gcc/config/i386/netbsd-elf.h	Sat Sep 16 00:17:42 2000
-@@ -0,0 +1,161 @@
+--- ../gcc-2.95.2/gcc/config/i386/netbsd-elf.h.orig	Thu Apr 26 11:53:41 2001
++++ ../gcc-2.95.2/gcc/config/i386/netbsd-elf.h
+@@ -0,0 +1,164 @@
 +/* Definitions of target machine for GNU compiler,
 +   for i386 NetBSD systems.
 +   Copyright (C) 1998 Free Software Foundation, Inc.
@@ -164,3 +164,6 @@ $NetBSD: patch-ab,v 1.1 2000/09/15 23:58:48 tron Exp $
 +  else									\
 +    readonly_data_section ();						\
 +}
++
++/* Use sjlj exceptions. */
++#define DWARF2_UNWIND_INFO 0
diff --git a/lang/gcc/patches/patch-ae b/lang/gcc/patches/patch-ae
index 10ded4d3f17..b20bda030f7 100644
--- a/lang/gcc/patches/patch-ae
+++ b/lang/gcc/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2000/09/15 23:58:48 tron Exp $
+$NetBSD: patch-ae,v 1.2 2001/04/27 10:45:23 skrll Exp $
 
---- ../gcc-2.95.2/gcc/config/sparc/netbsd-elf.h.orig	Sat Sep 16 00:17:42 2000
-+++ ../gcc-2.95.2/gcc/config/sparc/netbsd-elf.h	Sat Sep 16 00:17:42 2000
-@@ -0,0 +1,42 @@
+--- ../gcc-2.95.2/gcc/config/sparc/netbsd-elf.h.orig	Fri Apr 27 10:59:15 2001
++++ ../gcc-2.95.2/gcc/config/sparc/netbsd-elf.h
+@@ -0,0 +1,45 @@
 +/* NetBSD/sparc ELF configuration */
 +
 +/*
@@ -45,3 +45,6 @@ $NetBSD: patch-ae,v 1.1 2000/09/15 23:58:48 tron Exp $
 +/* Name the port. */
 +#undef TARGET_NAME
 +#define TARGET_NAME     "sparc-netbsdelf"
++
++/* Use sjlj exceptions. */
++#define DWARF2_UNWIND_INFO 0
diff --git a/lang/gcc/patches/patch-af b/lang/gcc/patches/patch-af
index e5af2414915..4a2c0df1c6a 100644
--- a/lang/gcc/patches/patch-af
+++ b/lang/gcc/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2000/09/15 23:58:48 tron Exp $
+$NetBSD: patch-af,v 1.2 2001/04/27 10:45:23 skrll Exp $
 
---- ../gcc-2.95.2/gcc/config/sparc/netbsd64.h.orig	Sat Sep 16 00:17:42 2000
-+++ ../gcc-2.95.2/gcc/config/sparc/netbsd64.h	Sat Sep 16 00:17:42 2000
-@@ -0,0 +1,169 @@
+--- ../gcc-2.95.2/gcc/config/sparc/netbsd64.h.orig	Fri Apr 27 10:59:15 2001
++++ ../gcc-2.95.2/gcc/config/sparc/netbsd64.h
+@@ -0,0 +1,172 @@
 +/* NetBSD/sparc64 ELF configuration */
 +
 +/*
@@ -172,3 +172,6 @@ $NetBSD: patch-af,v 1.1 2000/09/15 23:58:48 tron Exp $
 +/* Name the port. */
 +#undef TARGET_NAME
 +#define TARGET_NAME     "sparc64-netbsd"
++
++/* Use sjlj exceptions. */
++#define DWARF2_UNWIND_INFO 0
diff --git a/lang/gcc/patches/patch-al b/lang/gcc/patches/patch-al
index 1685b7fbac4..5515369792d 100644
--- a/lang/gcc/patches/patch-al
+++ b/lang/gcc/patches/patch-al
@@ -1,20 +1,21 @@
-$NetBSD: patch-al,v 1.3 2001/03/01 00:30:34 jlam Exp $
+$NetBSD: patch-al,v 1.4 2001/04/27 10:45:23 skrll Exp $
 
---- ../gcc-2.95.2/gcc/config/netbsd.h.orig	Wed Dec 16 15:59:58 1998
-+++ ../gcc-2.95.2/gcc/config/netbsd.h	Wed Feb 28 18:41:35 2001
-@@ -48,17 +48,37 @@
+--- ../gcc-2.95.2/gcc/config/netbsd.h.orig	Wed Dec 16 20:59:58 1998
++++ ../gcc-2.95.2/gcc/config/netbsd.h
+@@ -48,17 +48,38 @@
  #define ASM_SPEC " %| %{fpic:-k} %{fPIC:-k -K}"
  
  /* Provide a LIB_SPEC appropriate for NetBSD.  Just select the appropriate
 -   libc, depending on whether we're doing profiling.  */
 +   libc, depending on whether we're doing profiling; if `-posix' is specified,
-+   link against the appropriate libposix first.  */
++   link against the appropriate libposix first.  Don't include libc when
++   linking a shared library.  */
  
  #undef LIB_SPEC
 -#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
 +#define LIB_SPEC							\
 +  "%{posix:%{!p:%{!pg:-lposix}}%{p:-lposix_p}%{pg:-lposix_p}}		\
-+   %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++   %{!shared:%{!symbolic:%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}}}"
 +
 +/* Provide a LIBGCC_SPEC appropriate for NetBSD.  We also want to exclude
 +   libgcc when -symbolic.  */
@@ -43,7 +44,7 @@ $NetBSD: patch-al,v 1.3 2001/03/01 00:30:34 jlam Exp $
  
  /* This defines which switch letters take arguments. */
  #undef SWITCH_TAKES_ARG
-@@ -127,6 +147,9 @@
+@@ -127,6 +148,9 @@
     entries in an ELF object file under SVR4.  These macros also output
     the starting labels for the relevant functions/objects.  */
  
@@ -53,7 +54,7 @@ $NetBSD: patch-al,v 1.3 2001/03/01 00:30:34 jlam Exp $
  /* Write the extra assembler code needed to declare a function properly.
     Some svr4 assemblers need to also have something extra said about the
     function's return value.  We allow for that here.  */
-@@ -207,3 +230,56 @@
+@@ -207,3 +231,56 @@
  	putc ('\n', FILE);						\
        }									\
    } while (0)
diff --git a/lang/gcc/patches/patch-aw b/lang/gcc/patches/patch-aw
new file mode 100644
index 00000000000..0bbdc9ea550
--- /dev/null
+++ b/lang/gcc/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1 2001/04/27 10:45:23 skrll Exp $
+
+--- ../gcc-2.95.2/gcc/config/arm/netbsd.h.orig	Mon Jan 11 13:33:58 1999
++++ ../gcc-2.95.2/gcc/config/arm/netbsd.h
+@@ -48,7 +48,7 @@
+ 
+ /* Until they use ELF or something that handles dwarf2 unwinds
+    and initialization stuff better.  */
+-#undef DWARF2_UNWIND_INFO
++#define DWARF2_UNWIND_INFO 0
+ 
+ /* Some defines for CPP.
+    arm32 is the NetBSD port name, so we always define arm32 and __arm32__.  */
diff --git a/lang/gcc/patches/patch-ax b/lang/gcc/patches/patch-ax
new file mode 100644
index 00000000000..3351e9b35b6
--- /dev/null
+++ b/lang/gcc/patches/patch-ax
@@ -0,0 +1,11 @@
+$NetBSD: patch-ax,v 1.1 2001/04/27 10:45:23 skrll Exp $
+
+--- ../gcc-2.95.2/gcc/config/vax/netbsd.h.orig	Wed Dec 16 21:14:22 1998
++++ ../gcc-2.95.2/gcc/config/vax/netbsd.h
+@@ -20,5 +20,4 @@
+ 
+ /* Until they use ELF or something that handles dwarf2 unwinds
+    and initialization stuff better.  */
+-#undef DWARF2_UNWIND_INFO
+-
++#define DWARF2_UNWIND_INFO 0
diff --git a/lang/gcc/patches/patch-ay b/lang/gcc/patches/patch-ay
new file mode 100644
index 00000000000..3c4b0a8e5e8
--- /dev/null
+++ b/lang/gcc/patches/patch-ay
@@ -0,0 +1,11 @@
+$NetBSD: patch-ay,v 1.1 2001/04/27 10:45:23 skrll Exp $
+
+--- ../gcc-2.95.2/gcc/config/mips/netbsd.h.orig	Wed Dec 16 21:09:19 1998
++++ ../gcc-2.95.2/gcc/config/mips/netbsd.h
+@@ -225,3 +225,6 @@
+ /* Since gas and gld are standard on NetBSD, we don't need these */
+ #undef ASM_FINAL_SPEC
+ #undef STARTFILE_SPEC
++
++/* Use sjlj exceptions. */
++#define DWARF2_UNWIND_INFO 0