Make all gcc3-* packages use a single distinfo file from gcc3/distinfo and

a single patch directory from gcc3/patches/.
Also Move gcc3-c/{Makefile.common,language.mk} into gcc3/.

11 files changed, 221 insertions, 0 deletions

diff --git a/lang/gcc3/patches/patch-aa b/lang/gcc3/patches/patch-aa
new file mode 100644
index 00000000000..ea5d0200a7d
--- /dev/null
+++ b/lang/gcc3/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.6 2004/04/10 15:47:08 seb Exp $
+
+--- Makefile.in.orig	2003-07-05 02:37:08.000000000 +0000
++++ Makefile.in
+@@ -1644,9 +1644,9 @@ install-dosrel: installdirs info
+ 
+ install-dosrel-fake:
+ 
+-ALL_GCC = all-gcc
+-ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
+-ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3
++#ALL_GCC = all-gcc
++#ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
++#ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3
+ 
+ # This is a list of inter-dependencies among modules.
+ all-ash:
+@@ -1696,8 +1696,8 @@ all-libiberty:
+ all-build-libiberty: configure-build-libiberty
+ 
+ configure-target-libffi: $(ALL_GCC_C) 
+-configure-target-libjava: $(ALL_GCC_C) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
+-all-target-libjava: all-fastjar all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
++configure-target-libjava: $(ALL_GCC_C) configure-target-boehm-gc configure-target-qthreads configure-target-libffi
++all-target-libjava: all-fastjar all-target-boehm-gc all-target-qthreads all-target-libffi
+ configure-target-libstdc++-v3: $(ALL_GCC_C)
+ all-target-libstdc++-v3: all-target-libiberty
+ all-libtool:
diff --git a/lang/gcc3/patches/patch-ab b/lang/gcc3/patches/patch-ab
new file mode 100644
index 00000000000..e6b7c3f8deb
--- /dev/null
+++ b/lang/gcc3/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.5 2004/04/10 15:47:08 seb Exp $
+
+--- gcc/Makefile.in.orig	Tue Jan 28 16:54:07 2003
++++ gcc/Makefile.in	Sat May 24 13:01:38 2003
+@@ -1236,6 +1236,7 @@
+ # Language-independent files.
+ 
+ DRIVER_DEFINES = \
++  -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(prefix)/lib\"" \
+   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
+   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
+   -DDEFAULT_TARGET_VERSION=\"$(version)\" \
diff --git a/lang/gcc3/patches/patch-ae b/lang/gcc3/patches/patch-ae
new file mode 100644
index 00000000000..bcea5030614
--- /dev/null
+++ b/lang/gcc3/patches/patch-ae
@@ -0,0 +1,9 @@
+$NetBSD: patch-ae,v 1.3 2004/04/10 15:47:08 seb Exp $
+
+--- gcc/config/t-netbsd.orig	2003-06-11 19:38:33.000000000 +0200
++++ gcc/config/t-netbsd	2003-06-11 19:38:59.000000000 +0200
+@@ -3,3 +3,4 @@
+ 
+ # Always build crtstuff with PIC.
+ CRTSTUFF_T_CFLAGS = -fPIC
++TARGET_LIBGCC2_CFLAGS += -fPIC
diff --git a/lang/gcc3/patches/patch-af b/lang/gcc3/patches/patch-af
new file mode 100644
index 00000000000..e98783c4a8a
--- /dev/null
+++ b/lang/gcc3/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.3 2004/04/10 15:47:08 seb Exp $
+
+--- gcc/cppspec.c	Wed Jul 23 02:40:54 2003
++++ gcc/cppspec.c	Fri Jul 25 17:57:41 2003
+@@ -85,6 +85,13 @@
+ 
+   is_cpp_driver = 1;
+ 
++  /* NetBSD uses __GNUC__ and friends in header files processed with cpp
++     regularly.  Default to old behaviour here. XXX - move me to
++     config/netbsd.h "DEFAULT_CPP_NEED_NO_GCC".  */
++#ifdef DEFAULT_CPP_NEED_NO_GCC
++  need_no_gcc = DEFAULT_CPP_NEED_NO_GCC;
++#endif
++
+   /* First pass.  If we see an -S or -c, barf.  If we see an input file,
+      turn off read_stdin.  If we see a second input file, it is actually
+      the output file.  If we see a third input file, barf.  */
diff --git a/lang/gcc3/patches/patch-ag b/lang/gcc3/patches/patch-ag
new file mode 100644
index 00000000000..6bdbad6ff64
--- /dev/null
+++ b/lang/gcc3/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2004/04/10 15:47:08 seb Exp $
+
+Index: gcc/config/netbsd.h
+--- gcc/config/netbsd.h	Wed Jul 23 02:41:37 2003
++++ gcc/config/netbsd.h	Fri Jul 25 17:57:43 2003
+@@ -234,3 +234,7 @@
+   /* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */				\
+   (void) mprotect (page, end - page, 7);				\
+ }
++
++/* NetBSD depends on "cpp" having GNUC semantics, and must default as if
++   "cpp -gcc" was called. */
++#define DEFAULT_CPP_NEED_NO_GCC 0
diff --git a/lang/gcc3/patches/patch-ai b/lang/gcc3/patches/patch-ai
new file mode 100644
index 00000000000..5bc9763d00e
--- /dev/null
+++ b/lang/gcc3/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2004/04/10 15:47:08 seb Exp $
+
+--- gcc/configure.orig	2003-07-04 12:51:47.000000000 +0200
++++ gcc/configure	2003-07-04 12:52:44.000000000 +0200
+@@ -8559,7 +8559,7 @@
+ lang_specs_files=
+ lang_options_files=
+ lang_tree_files=
+-for subdir in . $subdirs
++for subdir in . cp f java objc ada
+ do
+ 	if test -f $srcdir/$subdir/lang-specs.h; then
+ 	    lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"
diff --git a/lang/gcc3/patches/patch-aj b/lang/gcc3/patches/patch-aj
new file mode 100644
index 00000000000..a186a5488e9
--- /dev/null
+++ b/lang/gcc3/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/04/10 15:47:08 seb Exp $
+
+--- gcc/ada/Make-lang.in.orig	2003-07-06 11:48:22.000000000 +0200
++++ gcc/ada/Make-lang.in	2003-07-06 11:48:44.000000000 +0200
+@@ -210,7 +210,7 @@
+ 	     $(LIBIBERTY) $(LIBS) $(SYSLIBS)
+ 
+ # use target-gcc target-gnatmake target-gnatbind target-gnatlink 
+-gnattools: $(GCC_PARTS) $(CONFIG_H) prefix.o force
++gnattools: $(CONFIG_H) prefix.o force
+ 	$(MAKE) -C ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \
+ 	   ADA_INCLUDES="-I- -I../rts"\
+ 	   CC="../../xgcc -B../../" STAGE_PREFIX=../../  gnattools1
diff --git a/lang/gcc3/patches/patch-ak b/lang/gcc3/patches/patch-ak
new file mode 100644
index 00000000000..0242f0ad2f1
--- /dev/null
+++ b/lang/gcc3/patches/patch-ak
@@ -0,0 +1,44 @@
+$NetBSD: patch-ak,v 1.1 2004/04/10 15:47:08 seb Exp $
+
+--- gcc/ada/Makefile.in.orig	2003-07-04 13:53:53.000000000 -0600
++++ gcc/ada/Makefile.in
+@@ -1028,6 +1028,30 @@ ifeq ($(strip $(filter-out cygwin32% min
+   EXTRA_GNATRTL_NONTASKING_OBJS = g-regist.o
+ endif
+ 
++ifeq ($(strip $(filter-out %86 netbsdelf%,$(arch) $(osys))),)
++  LIBGNAT_TARGET_PAIRS = \
++    a-numaux.adb<86numaux.adb \
++    a-numaux.ads<86numaux.ads \
++    a-intnam.ads<4netbsdintnam.ads \
++    s-inmaop.adb<7sinmaop.adb \
++    s-intman.adb<5netbsdintman.adb \
++    s-mastop.adb<5omastop.adb \
++    s-osinte.adb<5netbsdosinte.adb \
++    s-osinte.ads<5netbsdosinte.ads \
++    s-osprim.adb<5posprim.adb \
++    s-parame.adb<5netbsdparame.adb \
++    s-taprop.adb<5netbsdtaprop.adb \
++    s-tasinf.ads<5ftasinf.ads \
++    s-taspri.ads<7staspri.ads \
++    s-tpopse.adb<5netbsdtpopse.adb \
++    s-tpopsp.adb<7netbsdtpopsp.adb \
++    system.ads<5netbsdsystem.ads
++
++  THREADSLIB=-pthread
++  EXTRA_GNATRTL_TASKING_OBJS=adasignal.o ada_lwp_self.o
++
++endif
++
+ # The runtime library for gnat comprises two directories.  One contains the
+ # Ada source files that the compiler (gnat1) needs -- these files are listed
+ # by ADA_INCLUDE_SRCS -- and the other contains the object files and their
+@@ -1609,7 +1633,7 @@ gnattools2: ../stamp-tools
+ 	  TOOLSCASE=native \
+ 	  ../../gnatchop$(exeext) ../../gnat$(exeext) ../../gnatkr$(exeext) \
+ 	  ../../gnatls$(exeext) ../../gnatprep$(exeext) \
+-	  ../../gnatpsta$(exeext) ../../gnatxref$(exeext) \
++	  ../../gnatxref$(exeext) \
+           ../../gnatfind$(exeext) ../../gnatname$(exeext)
+ 
+ # These tools are only built for the native version.
diff --git a/lang/gcc3/patches/patch-al b/lang/gcc3/patches/patch-al
new file mode 100644
index 00000000000..f4e90c12bd3
--- /dev/null
+++ b/lang/gcc3/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2004/04/10 15:47:08 seb Exp $
+
+--- gcc/ada/cstreams.c.orig	2003-12-01 15:24:51.000000000 -0700
++++ gcc/ada/cstreams.c
+@@ -180,7 +180,7 @@ __gnat_full_name (nam, buffer)
+ #elif defined (MSDOS)
+   _fixpath (nam, buffer);
+ 
+-#elif defined (sgi)
++#elif defined (sgi) || defined (__NetBSD__)
+ 
+   /* Use realpath function which resolves links and references to .. and ..
+      on those Unix systems that support it. Note that GNU/Linux provides it but
diff --git a/lang/gcc3/patches/patch-am b/lang/gcc3/patches/patch-am
new file mode 100644
index 00000000000..585492e86cd
--- /dev/null
+++ b/lang/gcc3/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.1 2004/04/10 15:47:08 seb Exp $
+
+--- gcc/ada/adaint.c.orig	2002-11-18 07:39:46.000000000 -0700
++++ gcc/ada/adaint.c
+@@ -636,6 +636,8 @@ __gnat_open_new_temp (path, fmode)
+   return mkstemp (path);
+ #elif defined (__Lynx__)
+   mktemp (path);
++#elif defined(__NetBSD__)
++  return mkstemp (path);
+ #else
+   if (mktemp (path) == NULL)
+     return -1;
+@@ -703,7 +705,7 @@ __gnat_tmp_name (tmp_filename)
+     free (pname);
+   }
+ 
+-#elif defined (linux)
++#elif defined (linux) || defined (__NetBSD__)
+   char *tmpdir = getenv ("TMPDIR");
+ 
+   if (tmpdir == NULL)
diff --git a/lang/gcc3/patches/patch-an b/lang/gcc3/patches/patch-an
new file mode 100644
index 00000000000..bc0162011ac
--- /dev/null
+++ b/lang/gcc3/patches/patch-an
@@ -0,0 +1,36 @@
+$NetBSD: patch-an,v 1.1 2004/04/10 15:47:08 seb Exp $
+
+--- gcc/ada/i-cstrea.ads.orig	2002-10-23 01:33:26.000000000 -0600
++++ gcc/ada/i-cstrea.ads
+@@ -179,9 +179,6 @@ package Interfaces.C_Streams is
+ 
+    function isatty (handle : int) return int;
+ 
+-   procedure mktemp (template : chars);
+-   --  The return value (which is just a pointer to template) is discarded
+-
+    procedure rewind (stream : FILEs);
+ 
+    function setvbuf
+@@ -191,11 +188,6 @@ package Interfaces.C_Streams is
+       size   : size_t)
+       return   int;
+ 
+-   procedure tmpnam (string : chars);
+-   --  The parameter must be a pointer to a string buffer of at least L_tmpnam
+-   --  bytes (the call with a null parameter is not supported). The returned
+-   --  value, which is just a copy of the input argument, is discarded.
+-
+    function tmpfile return FILEs;
+ 
+    function ungetc (c : int; stream : FILEs) return int;
+@@ -270,9 +262,7 @@ private
+    pragma Import (C, fseek);
+    pragma Import (C, ftell);
+    pragma Import (C, isatty);
+-   pragma Import (C, mktemp);
+    pragma Import (C, rewind);
+-   pragma Import (C, tmpnam);
+    pragma Import (C, tmpfile);
+    pragma Import (C, ungetc);
+    pragma Import (C, unlink);