Integrated GCC-2.6.1 -> GCC-2.6.2 changes.

Notice that the libgcc DOESN'T change number, because there are no
changes.

Also now the gnu2bmake stuff is synchronized again.

I commit this so that others can test too.

You might want to postpone any "make worlds" until tomorrow, to
avoid any problems I didn't see in the first pass.

Thanks to Bruce for rounding up our changes to gcc.

3 files changed, 452 insertions, 209 deletions

diff --git a/gnu/gnu2bmake/gcc-2.6.1.patch b/gnu/gnu2bmake/gcc-2.6.1.patch
index 2260b41..fb17501 100644
--- a/gnu/gnu2bmake/gcc-2.6.1.patch
+++ b/gnu/gnu2bmake/gcc-2.6.1.patch
@@ -1,178 +1,407 @@
-diff -u -r /freebsd/gcc-2.6.1/cccp.c ./cccp.c
---- /freebsd/gcc-2.6.1/cccp.c	Tue Oct 25 15:37:44 1994
-+++ ./cccp.c	Wed Nov  2 17:36:25 1994
-@@ -188,7 +188,7 @@
- #ifndef VMS
- #ifndef HAVE_STRERROR
- extern int sys_nerr;
--#if defined(bsd4_4) || defined(__NetBSD__)
-+#if defined(bsd4_4) || defined(__NetBSD__) || defined(__FreeBSD__)
- extern const char *const sys_errlist[];
- #else
- extern char *sys_errlist[];
+# this patch is good for 2.6.1 and 2.6.2
+
+diff -r -c ../../scratch/gcc-2.6.1/cccp.1 ./cccp.1
+*** ../../scratch/gcc-2.6.1/cccp.1	Tue May 31 16:29:50 1994
+--- ./cccp.1	Mon Nov 14 19:42:44 1994
+***************
+*** 1,13 ****
+  .\" Copyright (c) 1991, 1992, 1993 Free Software Foundation       \-*-Text-*-
+  .\" See section COPYING for conditions for redistribution
+! .TH cpp 1 "30apr1993" "GNU Tools" "GNU Tools"
+  .SH NAME
+! cccp, cpp \- The GNU C-Compatible Compiler Preprocessor.
+  .SH SYNOPSIS
+  .hy 0
+  .na
+  .TP
+! .B cccp
+  .RB "[\|" \-$ "\|]"
+  .RB "[\|" \-A \c
+  .I predicate\c
+--- 1,13 ----
+  .\" Copyright (c) 1991, 1992, 1993 Free Software Foundation       \-*-Text-*-
+  .\" See section COPYING for conditions for redistribution
+! .TH cpp 1 "30, April 1993" "FreeBSD" "GNU Tools"
+  .SH NAME
+! cpp \- Compiler Preprocessor.
+  .SH SYNOPSIS
+  .hy 0
+  .na
+  .TP
+! .B cpp
+  .RB "[\|" \-$ "\|]"
+  .RB "[\|" \-A \c
+  .I predicate\c
+***************
+*** 142,154 ****
+  Most often when you use the C preprocessor you will not have to invoke it
+  explicitly: the C compiler will do so automatically.  However, the
+  preprocessor is sometimes useful individually.
+- 
+- When you call the preprocessor individually, either name
+- (\c
+- .B cpp\c
+- \& or \c
+- .B cccp\c
+- \&) will do\(em\&they are completely synonymous.
+  
+  The C preprocessor expects two file names as arguments, \c
+  .I infile\c
+--- 142,147 ----
+Only in .: cccp.1.orig
+diff -r -c ../../scratch/gcc-2.6.1/cccp.c ./cccp.c
+*** ../../scratch/gcc-2.6.1/cccp.c	Tue Oct 25 15:37:44 1994
+--- ./cccp.c	Mon Nov 14 19:40:30 1994
+***************
+*** 188,194 ****
+  #ifndef VMS
+  #ifndef HAVE_STRERROR
+  extern int sys_nerr;
+! #if defined(bsd4_4) || defined(__NetBSD__)
+  extern const char *const sys_errlist[];
+  #else
+  extern char *sys_errlist[];
+--- 188,194 ----
+  #ifndef VMS
+  #ifndef HAVE_STRERROR
+  extern int sys_nerr;
+! #if defined(bsd4_4) || defined(__NetBSD__) || defined(__FreeBSD__)
+  extern const char *const sys_errlist[];
+  #else
+  extern char *sys_errlist[];
 Only in .: cccp.c.orig
-Only in .: cccp.o
-Only in .: cexp.o
-diff -u -r /freebsd/gcc-2.6.1/collect2.c ./collect2.c
---- /freebsd/gcc-2.6.1/collect2.c	Thu Oct 20 15:05:46 1994
-+++ ./collect2.c	Wed Nov  2 17:36:25 1994
-@@ -41,7 +41,7 @@
- extern int errno;
- #endif
- 
--#if defined(bsd4_4) || defined(__NetBSD__)
-+#if defined(bsd4_4) || defined(__NetBSD__) || defined(__FreeBSD__)
- extern const char *const sys_errlist[];
- #else
- extern char *sys_errlist[];
-Only in .: collect2.c.orig
-diff -u -r /freebsd/gcc-2.6.1/config/i386/freebsd.h ./config/i386/freebsd.h
---- /freebsd/gcc-2.6.1/config/i386/freebsd.h	Tue Oct 18 17:59:52 1994
-+++ ./config/i386/freebsd.h	Wed Nov  2 17:36:37 1994
-@@ -33,11 +33,13 @@
- #undef CPP_PREDEFINES
- #define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
- 
-+#if 0
- #define INCLUDE_DEFAULTS { \
- 	{ "/usr/include", 0 }, \
- 	{ "/usr/include/g++", 1 }, \
- 	{ 0, 0} \
- 	}
-+#endif
- 
- /* Like the default, except no -lg.  */
- #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
+Only in .: cccp.c.rej
+diff -r -c ../../scratch/gcc-2.6.1/config/i386/freebsd.h ./config/i386/freebsd.h
+*** ../../scratch/gcc-2.6.1/config/i386/freebsd.h	Tue Oct 18 17:59:52 1994
+--- ./config/i386/freebsd.h	Mon Nov 14 19:41:07 1994
+***************
+*** 19,27 ****
+  along with GNU CC; see the file COPYING.  If not, write to
+  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  
+- /* This goes away when the math-emulator is fixed */
+- #define TARGET_CPU_DEFAULT 0400		/* TARGET_NO_FANCY_MATH_387 */
+- 
+  /* This is tested by i386gas.h.  */
+  #define YES_UNDERSCORES
+  
+--- 19,24 ----
+***************
+*** 31,37 ****
+  #include "i386/perform.h"
+  
+  #undef CPP_PREDEFINES
+! #define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+  
+  #define INCLUDE_DEFAULTS { \
+  	{ "/usr/include", 0 }, \
+--- 28,34 ----
+  #include "i386/perform.h"
+  
+  #undef CPP_PREDEFINES
+! #define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=2 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+  
+  #define INCLUDE_DEFAULTS { \
+  	{ "/usr/include", 0 }, \
+***************
+*** 39,47 ****
+--- 36,54 ----
+  	{ 0, 0} \
+  	}
+  
++ #define ASM_SPEC   " %| %{fpic:-k} %{fPIC:-k}"
++ 
+  /* Like the default, except no -lg.  */
+  #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
+  
++ #define LINK_SPEC \
++   "%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} %{assert*} \
++    %{p:-Bstatic} %{pg:-Bstatic} %{Z}"
++ 
++ /* This goes away when the math emulator is fixed.  */
++ #undef TARGET_DEFAULT
++ #define TARGET_DEFAULT	(MASK_NO_FANCY_MATH_387 | 0301)
++ 
+  #undef SIZE_TYPE
+  #define SIZE_TYPE "unsigned int"
+  
+***************
+*** 49,80 ****
+  #define PTRDIFF_TYPE "int"
+  
+  #undef WCHAR_TYPE
+! #define WCHAR_TYPE "short unsigned int"
+  
+! #define WCHAR_UNSIGNED 1
+  
+  #undef WCHAR_TYPE_SIZE
+! #define WCHAR_TYPE_SIZE 16
+  
+  #define HAVE_ATEXIT
+  
+! /* Redefine this to use %eax instead of %edx.  */
+  #undef FUNCTION_PROFILER
+  #define FUNCTION_PROFILER(FILE, LABELNO)  \
+  {									\
+    if (flag_pic)								\
+!     {									\
+!       fprintf (FILE, "\tleal %sP%d@GOTOFF(%%ebx),%%eax\n",		\
+! 	       LPREFIX, (LABELNO));					\
+!       fprintf (FILE, "\tcall *mcount@GOT(%%ebx)\n");			\
+!     }									\
+    else									\
+!     {									\
+!       fprintf (FILE, "\tmovl $%sP%d,%%eax\n", LPREFIX, (LABELNO));	\
+!       fprintf (FILE, "\tcall mcount\n");				\
+!     }									\
+  }
+  
+  /* There are conflicting reports about whether this system uses
+     a different assembler syntax.  wilson@cygnus.com says # is right.  */
+  #undef COMMENT_BEGIN
+--- 56,95 ----
+  #define PTRDIFF_TYPE "int"
+  
+  #undef WCHAR_TYPE
+! #define WCHAR_TYPE "int"
+  
+! #define WCHAR_UNSIGNED 0
+  
+  #undef WCHAR_TYPE_SIZE
+! #define WCHAR_TYPE_SIZE BITS_PER_WORD
+  
+  #define HAVE_ATEXIT
+  
+! /* Tell final.c that we don't need a label passed to mcount.  */
+! 
+! #define NO_PROFILE_DATA
+! 
+! /* Redefine this to not pass an unused label in %edx.  */
+! 
+  #undef FUNCTION_PROFILER
+  #define FUNCTION_PROFILER(FILE, LABELNO)  \
+  {									\
+    if (flag_pic)								\
+!     fprintf (FILE, "\tcall *mcount@GOT(%%ebx)\n");			\
+    else									\
+!     fprintf (FILE, "\tcall mcount\n");					\
+  }
+  
++ #if 0 /* not ready for this; it should be decided at compile time */
++ #define FUNCTION_PROFILER_EPILOGUE(FILE)  \
++ {									\
++   if (flag_pic)								\
++     fprintf (FILE, "\tcall *mexitcount@GOT(%%ebx)\n");			\
++   else									\
++     fprintf (FILE, "\tcall mexitcount\n");				\
++ }
++ #endif
++ 
+  /* There are conflicting reports about whether this system uses
+     a different assembler syntax.  wilson@cygnus.com says # is right.  */
+  #undef COMMENT_BEGIN
+***************
+*** 218,227 ****
+  	putc ('\n', FILE);						\
+        }									\
+    } while (0)
+- 
+- #define ASM_SPEC   " %| %{fpic:-k} %{fPIC:-k}"
+- #define LINK_SPEC \
+-   "%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} %{assert*}"
+  
+  /* This is defined when gcc is compiled in the BSD-directory-tree, and must
+   * make up for the gap to all the stuff done in the GNU-makefiles.
+--- 233,238 ----
 Only in ./config/i386: freebsd.h.orig
-diff -u -r /freebsd/gcc-2.6.1/config/i386/x-freebsd ./config/i386/x-freebsd
---- /freebsd/gcc-2.6.1/config/i386/x-freebsd	Mon Oct 31 04:52:41 1994
-+++ ./config/i386/x-freebsd	Wed Nov  2 18:45:36 1994
-@@ -1,3 +1,6 @@
- # Don't run fixproto
- STMP_FIXPROTO =
--CLIB=-lgnumalloc
-+CLIB = -lgnumalloc
-+
-+# Find FreeBSD's includes before resorting to GCC's
-+LIBGCC2_INCLUDES -I/usr/include
-Only in .: config.h
-Only in .: config.status
-Only in ./cp: Makefile
-diff -u -r /freebsd/gcc-2.6.1/cp/g++.c ./cp/g++.c
---- /freebsd/gcc-2.6.1/cp/g++.c	Sat Oct 29 04:17:44 1994
-+++ ./cp/g++.c	Wed Nov  2 17:36:42 1994
-@@ -84,7 +84,7 @@
- #endif
- 
- extern int sys_nerr;
--#if defined(bsd4_4) || defined(__NetBSD__)
-+#if defined(bsd4_4) || defined(__NetBSD__) || defined(__FreeBSD__)
- extern const char *const sys_errlist[];
- #else
- extern char *sys_errlist[];
+diff -r -c ../../scratch/gcc-2.6.1/config/i386/i386.c ./config/i386/i386.c
+*** ../../scratch/gcc-2.6.1/config/i386/i386.c	Fri Oct  7 12:45:14 1994
+--- ./config/i386/i386.c	Mon Nov 14 19:41:27 1994
+***************
+*** 1097,1103 ****
+    int limit;
+    rtx xops[4];
+    int pic_reg_used = flag_pic && (current_function_uses_pic_offset_table
+! 				  || current_function_uses_const_pool);
+  
+    xops[0] = stack_pointer_rtx;
+    xops[1] = frame_pointer_rtx;
+--- 1097,1104 ----
+    int limit;
+    rtx xops[4];
+    int pic_reg_used = flag_pic && (current_function_uses_pic_offset_table
+! 				  || current_function_uses_const_pool
+! 				  || profile_flag || profile_block_flag);
+  
+    xops[0] = stack_pointer_rtx;
+    xops[1] = frame_pointer_rtx;
+***************
+*** 1158,1165 ****
+    int nregs = 0;
+    int reglimit = (frame_pointer_needed
+  		  ? FRAME_POINTER_REGNUM : STACK_POINTER_REGNUM);
+!   int pic_reg_used = flag_pic && (current_function_uses_pic_offset_table
+! 				  || current_function_uses_const_pool);
+  
+  #ifdef NON_SAVING_SETJMP
+    if (NON_SAVING_SETJMP && current_function_calls_setjmp)
+--- 1159,1174 ----
+    int nregs = 0;
+    int reglimit = (frame_pointer_needed
+  		  ? FRAME_POINTER_REGNUM : STACK_POINTER_REGNUM);
+! 
+! #ifdef FUNCTION_PROFILER_EPILOGUE
+!   if (profile_flag)
+!     return 0;
+! #endif
+! 
+!   if (flag_pic && (current_function_uses_pic_offset_table
+! 		   || current_function_uses_const_pool
+! 		   || profile_flag || profile_block_flag))
+!     return 0;
+  
+  #ifdef NON_SAVING_SETJMP
+    if (NON_SAVING_SETJMP && current_function_calls_setjmp)
+***************
+*** 1170,1177 ****
+      return 0;
+  
+    for (regno = reglimit - 1; regno >= 0; regno--)
+!     if ((regs_ever_live[regno] && ! call_used_regs[regno])
+! 	|| (regno == PIC_OFFSET_TABLE_REGNUM && pic_reg_used))
+        nregs++;
+  
+    return nregs == 0 || ! frame_pointer_needed;
+--- 1179,1185 ----
+      return 0;
+  
+    for (regno = reglimit - 1; regno >= 0; regno--)
+!     if (regs_ever_live[regno] && ! call_used_regs[regno])
+        nregs++;
+  
+    return nregs == 0 || ! frame_pointer_needed;
+***************
+*** 1193,1198 ****
+--- 1201,1211 ----
+    rtx xops[3];
+    int pic_reg_used = flag_pic && (current_function_uses_pic_offset_table
+  				  || current_function_uses_const_pool);
++ 
++ #ifdef FUNCTION_PROFILER_EPILOGUE
++   if (profile_flag)
++     FUNCTION_PROFILER_EPILOGUE (file);
++ #endif
+  
+    /* Compute the number of registers to pop */
+  
+Only in ./config/i386: i386.c.orig
+diff -r -c ../../scratch/gcc-2.6.1/cp/g++.c ./cp/g++.c
+*** ../../scratch/gcc-2.6.1/cp/g++.c	Sat Oct 29 04:17:44 1994
+--- ./cp/g++.c	Mon Nov 14 19:41:16 1994
+***************
+*** 84,90 ****
+  #endif
+  
+  extern int sys_nerr;
+! #if defined(bsd4_4) || defined(__NetBSD__)
+  extern const char *const sys_errlist[];
+  #else
+  extern char *sys_errlist[];
+--- 84,90 ----
+  #endif
+  
+  extern int sys_nerr;
+! #if defined(bsd4_4) || defined(__NetBSD__) || defined(__FreeBSD__)
+  extern const char *const sys_errlist[];
+  #else
+  extern char *sys_errlist[];
 Only in ./cp: g++.c.orig
-Only in ./cp: include
-Only in ./cp: stage1
-Only in ./cp: stage2
-Only in ./cp: stage3
-Only in ./cp: stage4
-Only in .: cpp
-Only in .: float.h-nat
-diff -u -r /freebsd/gcc-2.6.1/gcc.c ./gcc.c
---- /freebsd/gcc-2.6.1/gcc.c	Thu Oct 27 15:49:58 1994
-+++ ./gcc.c	Wed Nov  2 17:36:43 1994
-@@ -166,7 +166,7 @@
- #endif
- 
- extern int sys_nerr;
--#if defined(bsd4_4) || defined(__NetBSD__)
-+#if defined(bsd4_4) || defined(__NetBSD__) || defined (__FreeBSD__)
- extern const char *const sys_errlist[];
- #else
- extern char *sys_errlist[];
+Only in ../../scratch/gcc-2.6.1: cpp.1
+Only in .: cpp.1.orig
+Only in .: cpp.1.rej
+Only in .: cpp.1.rej.orig
+diff -r -c ../../scratch/gcc-2.6.1/final.c ./final.c
+*** ../../scratch/gcc-2.6.1/final.c	Tue Sep 20 17:05:03 1994
+--- ./final.c	Mon Nov 14 19:40:32 1994
+***************
+*** 957,970 ****
+--- 957,974 ----
+  profile_function (file)
+       FILE *file;
+  {
++ #ifndef NO_PROFILE_DATA
+    int align = MIN (BIGGEST_ALIGNMENT, POINTER_SIZE);
++ #endif /* not NO_PROFILE_DATA */
+    int sval = current_function_returns_struct;
+    int cxt = current_function_needs_context;
+  
++ #ifndef NO_PROFILE_DATA
+    data_section ();
+    ASM_OUTPUT_ALIGN (file, floor_log2 (align / BITS_PER_UNIT));
+    ASM_OUTPUT_INTERNAL_LABEL (file, "LP", profile_label_no);
+    assemble_integer (const0_rtx, POINTER_SIZE / BITS_PER_UNIT, 1);
++ #endif /* not NO_PROFILE_DATA */
+  
+    text_section ();
+  
+Only in .: final.c.orig
+Only in .: final.c.rej
+diff -r -c ../../scratch/gcc-2.6.1/gcc.c ./gcc.c
+*** ../../scratch/gcc-2.6.1/gcc.c	Thu Oct 27 15:49:58 1994
+--- ./gcc.c	Mon Nov 14 19:41:18 1994
+***************
+*** 166,172 ****
+  #endif
+  
+  extern int sys_nerr;
+! #if defined(bsd4_4) || defined(__NetBSD__)
+  extern const char *const sys_errlist[];
+  #else
+  extern char *sys_errlist[];
+--- 166,172 ----
+  #endif
+  
+  extern int sys_nerr;
+! #if defined(bsd4_4) || defined(__NetBSD__) || defined (__FreeBSD__)
+  extern const char *const sys_errlist[];
+  #else
+  extern char *sys_errlist[];
+***************
+*** 711,716 ****
+--- 711,745 ----
+  		    %{!S:%{!gnatc:%{!gnats:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
+  					      %{c:%W{o*}%{!o*:-o %w%b.o}}\
+  					      %{!c:-o %d%w%u.o} %{!pipe:%g.s} %A\n}}}}}} "},
++ /***** ljo's Fortran rule *****/
++   {".f", "@f2c"},
++   {"@f2c",
++    "f2c %{checksubscripts:-C} %{I2} %{onetrip} %{honorcase:-U} %{u} %{w}\
++         %{ANSIC:-A} %{a} %{C++}\
++         %{c} %{E} %{ec} %{ext} %{f} %{72} %{g} %{h} %{i2} %{kr}\
++         %{P} %{p} %{r} %{r8} %{s} %{w8} %{z} %{N*}\
++         %i %{!pipe: -o %g.c} %{pipe:-o -}|\n",
++    "cpp -lang-c %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
++ 	%{C:%{!E:%eGNU C does not support -C without using -E}}\
++ 	%{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
++         -undef -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
++ 	%{ansi:-trigraphs -$ -D__STRICT_ANSI__}\
++ 	%{!undef:%{!ansi:%p} %P} %{trigraphs} \
++         %c %{O*:%{!O0:-D__OPTIMIZE__}} %{traditional} %{ftraditional:-traditional}\
++         %{traditional-cpp:-traditional}\
++ 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*}\
++         %{pipe:-} %{!pipe:%g.c} %{!M:%{!MM:%{!E:%{!pipe:%g.i}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
++    "%{!M:%{!MM:%{!E:cc1 %{!pipe:%g.i} %1 \
++ 		   %{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a}\
++ 		   %{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi} \
++ 		   %{traditional} %{v:-version} %{pg:-p} %{p} %{f*}\
++ 		   %{aux-info*}\
++ 		   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
++ 		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
++               %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
++ 		      %{c:%W{o*}%{!o*:-o %w%b.o}}%{!c:-o %d%w%u.o}\
++                       %{!pipe:%g.s} %A\n }}}}"},
++ /***** End of ljo's Fortran rule *****/
+    /* Mark end of table */
+    {0, 0}
+  };
 Only in .: gcc.c.orig
-Only in .: gfloat.h
-diff -u -r /freebsd/gcc-2.6.1/ginclude/stdarg.h ./ginclude/stdarg.h
---- /freebsd/gcc-2.6.1/ginclude/stdarg.h	Fri Jul  8 19:04:27 1994
-+++ ./ginclude/stdarg.h	Wed Nov  2 17:36:49 1994
-@@ -136,13 +136,13 @@
-    But on BSD NET2 we must not test or define or undef it.
-    (Note that the comments in NET 2's ansi.h
-    are incorrect for _VA_LIST_--see stdio.h!)  */
--#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__FreeBSD__)
-+#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) 
- /* The macro _VA_LIST is used in SCO Unix 3.2.  */
- #ifndef _VA_LIST
- /* The macro _VA_LIST_T_H is used in the Bull dpx2  */
- #ifndef _VA_LIST_T_H
- #define _VA_LIST_T_H
--#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__FreeBSD__))
-+#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__)
- #define _VA_LIST_
- #endif
- #define _VA_LIST
-Only in ./ginclude: stdarg.h.orig
-diff -u -r /freebsd/gcc-2.6.1/ginclude/stddef.h ./ginclude/stddef.h
---- /freebsd/gcc-2.6.1/ginclude/stddef.h	Fri Oct  7 16:22:35 1994
-+++ ./ginclude/stddef.h	Wed Nov  2 17:36:54 1994
-@@ -22,7 +22,7 @@
- 
- /* On 4.3bsd-net2, make sure ansi.h is included, so we have
-    one less case to deal with in the following.  */
--#if defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__FreeBSD__)
-+#if defined (__BSD_NET2__) || defined (____FreeBSD____)
- #include <machine/ansi.h>
- #endif
- 
-Only in ./ginclude: stddef.h.orig
-diff -u -r /freebsd/gcc-2.6.1/ginclude/varargs.h ./ginclude/varargs.h
---- /freebsd/gcc-2.6.1/ginclude/varargs.h	Fri Jul  8 19:04:32 1994
-+++ ./ginclude/varargs.h	Wed Nov  2 17:36:59 1994
-@@ -151,13 +151,13 @@
- /* Michael Eriksson <mer@sics.se> at Thu Sep 30 11:00:57 1993:
-    Sequent defines _VA_LIST_ in <machine/machtypes.h> to be the type to
-    use for va_list (``typedef _VA_LIST_ va_list'') */
--#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__)
-+#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__)
- /* The macro _VA_LIST is used in SCO Unix 3.2.  */
- #ifndef _VA_LIST
- /* The macro _VA_LIST_T_H is used in the Bull dpx2  */
- #ifndef _VA_LIST_T_H
- #define _VA_LIST_T_H
--#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__))
-+#if !(defined (__BSD_NET2__) || defined (____FreeBSD____) || defined (__bsdi__) || defined (__sequent__)
- #define _VA_LIST_
- #endif
- #define _VA_LIST
-Only in ./ginclude: varargs.h.orig
-Only in .: hconfig.h
-Only in .: include
-Only in .: libgcc.a
-Only in .: libgcc1.a
-Only in .: libgcc2.a
-Only in .: libgcc2.ready
-Only in .: md
-Only in .: multilib.h
-Only in .: objc-headers
-Only in .: obstack.o
-diff -u -r /freebsd/gcc-2.6.1/protoize.c ./protoize.c
---- /freebsd/gcc-2.6.1/protoize.c	Tue Oct  4 20:17:40 1994
-+++ ./protoize.c	Wed Nov  2 17:37:00 1994
-@@ -79,7 +79,7 @@
- #undef getopt
- 
- extern int errno;
--#if defined(bsd4_4) || defined(__NetBSD__)
-+#if defined(bsd4_4) || defined(__NetBSD__) || defined (__FreeBSD__)
- extern const char *const sys_errlist[];
- #else
- extern char *sys_errlist[];
-Only in .: protoize.c.orig
-Only in .: stage1
-Only in .: stmp-fixinc
-Only in .: stmp-headers
-Only in .: stmp-int-hdrs
-Only in .: tconfig.h
-Only in .: tm.h
-Only in .: version.o
-Only in .: xlimits.h
diff --git a/gnu/gnu2bmake/gcc-2.6.1.tcl b/gnu/gnu2bmake/gcc-2.6.1.tcl
index 8b1ef7a..a56c804 100755
--- a/gnu/gnu2bmake/gcc-2.6.1.tcl
+++ b/gnu/gnu2bmake/gcc-2.6.1.tcl
@@ -7,16 +7,17 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $Id$
 #
+# Good for 2.6.1 and 2.6.2
 
 source gnu2bmake.tcl
 
 #######################################################################
 # Parameters to tweak
 ########
-set sdir /freebsd/A/gcc-2.6.1
-set ddir /freebsd/A/cc261
+set sdir /freebsd/gcc-2.6.2
+set ddir /freebsd/cc262
 
 #######################################################################
 # Do the stunt
@@ -94,21 +95,37 @@ set target [makefile_macro target $sdir]
 sh "rm -rf $ddir"
 sh "mkdir $ddir"
 set f [open $ddir/Makefile.inc w]
-puts $f "#\n# \$FreeBSD\$\n#\n"
+puts $f "#\n# \$Id\$\n#\n"
 puts $f "CFLAGS+=\t-I\${.CURDIR} -I\${.CURDIR}/../include"
 puts $f "CFLAGS+=\t-Dbsd4_4"
 puts $f "CFLAGS+=\t-DGCC_INCLUDE_DIR=\\\"FOO\\\""
-puts $f "CFLAGS+=\t-DGPLUSPLUS_INCLUDE_DIR=\\\"FOO\\\""
 puts $f "CFLAGS+=\t-DTOOL_INCLUDE_DIR=\\\"FOO\\\""
+puts $f "CFLAGS+=\t-DGPLUSPLUS_INCLUDE_DIR=\\\"FOO\\\""
 puts $f "CFLAGS+=\t-DDEFAULT_TARGET_VERSION=\\\"$version\\\""
 puts $f "CFLAGS+=\t-DDEFAULT_TARGET_MACHINE=\\\"$target\\\""
 puts $f "CFLAGS+=\t-DMD_EXEC_PREFIX=\\\"/usr/libexec/\\\""
 puts $f "CFLAGS+=\t-DSTANDARD_STARTFILE_PREFIX=\\\"/usr/lib\\\""
+puts $f "CFLAGS+=\t-DGCC_NAME=\\\"cc\\\""
+puts $f ""
+puts $f ".if exists(\${.CURDIR}/../cc_int/obj)"
+puts $f "LIBDESTDIR=\t\${.CURDIR}/../cc_int/obj"
+puts $f ".else"
+puts $f "LIBDESTDIR=\t\${.CURDIR}/../cc_int"
+puts $f ".endif"
+puts $f ""
+
+puts $f "# XXX LDDESTDIR isn't a directory and there is no standard name for the dir"
+puts $f "LDDESTDIR=\t-L\${LIBDESTDIR}"
+puts $f ".if defined(SHARED_LIBCC_INT)"
+puts $f "LIBCC_INT=\t\${LIBDESTDIR}/libcc_int.so.262.0"
+puts $f ".else"
+puts $f "LIBCC_INT=\t\${LIBDESTDIR}/libcc_int.a"
+puts $f ".endif"
 close $f
 
 set f [open $ddir/Makefile w]
-puts $f "#\n# \$FreeBSD\$\n#\n"
-puts $f "PGMDIR=\tcc_int cpp cc1 cc cc1plus c++ libgcc"
+puts $f "#\n# \$Id\$\n#\n"
+puts $f "PGMDIR=\tcc_int cpp cc1 cc cc1plus c++ f77 libgcc"
 puts $f "SUBDIR=\t\$(PGMDIR)"
 puts $f "\n.include <bsd.subdir.mk>"
 close $f
@@ -118,7 +135,7 @@ sh "mkdir $ddir/legal"
 sh "cp $sdir/gen-*.c $sdir/md $ddir/legal"
 set f [open $ddir/README w]
 puts $f {
-$FreeBSD$
+$Id$
 
 This directory contains gcc in a form that uses "bmake" makefiles.
 This is not the place you want to start, if you want to hack gcc.
@@ -137,11 +154,11 @@ Thankyou.
 # do ~/libgcc
 sh "mkdir $ddir/libgcc"
 set f [open $ddir/libgcc/Makefile w]
-puts $f "#\n# \$FreeBSD\$\n#\n"
+puts $f "#\n# \$Id\$\n#\n"
 puts $f "LIB=\tgcc"
 puts $f "INSTALL_PIC_ARCHIVE=\tyes"
-puts $f "SHLIB_MAJOR=\t26"
-puts $f "SHLIB_MINOR=\t1"
+puts $f "SHLIB_MAJOR=\t261"
+puts $f "SHLIB_MINOR=\t0"
 puts $f ""
 puts $f "LIB1OBJS=\t[add_suffix $l_libgcc1 .o]"
 puts $f "LIB2OBJS=\t[add_suffix $l_libgcc2 .o]"
@@ -195,28 +212,31 @@ copy_l $sdir/config/i386 $ddir/include/i386 [add_suffix $l_include_i386 .h]
 
 # do ~/cc_int
 mk_lib $ddir cc_int [add_suffix $l_common .c] {
-	"NOPROFILE=\t1"
+	"NOPROFILE=\tyes"
+	".if defined(SHARED_LIBCC_INT)"
+	"INTERNALLIB="
+	"SHLIB_MAJOR=262"
+	"SHLIB_MINOR=0"
+	".else"
 	"\ninstall:\n\t@true"
+	".endif"
 }
 copy_c $sdir $ddir/cc_int $l_common
 
 # do ~/cpp
 mk_prog $ddir cpp [add_suffix $l_cpp .c] { 
 	"BINDIR=\t/usr/libexec" 
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int/obj"
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int"
-	"LDADD+=\t-lcc_int"
+	".PATH:\t\${.CURDIR}/../cc_int"
+	"SRCS+=\tobstack.c version.c"
 }
 copy_c $sdir $ddir/cpp $l_cpp
-cp $sdir/cpp.1 $ddir/cpp/cpp.1
+cp $sdir/cccp.1 $ddir/cpp/cpp.1
 
 # do ~/c++
 mk_prog $ddir c++ [add_suffix "$l_cplus $l_cplus_cp" .c] {
 	"BINDIR=\t/usr/bin"
+	"LINKS=\t\${BINDIR}/c++ \${BINDIR}/g++"
 	"NOMAN=\t1"
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int/obj"
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int"
-	"LDADD+=\t-lcc_int"
 }
 copy_c $sdir $ddir/c++ $l_cplus
 copy_c $sdir/cp $ddir/c++ $l_cplus_cp
@@ -224,13 +244,9 @@ copy_c $sdir/cp $ddir/c++ $l_cplus_cp
 # do ~/cc
 mk_prog $ddir cc [add_suffix $l_cc .c] {
 	"BINDIR=\t/usr/bin"
-	"MLINKS+=cc.1 gcc.1"
-	"MLINKS+=cc.1 c++.1"
-	"MLINKS+=cc.1 g++.1"
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int/obj"
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int"
-	"LDADD+=\t-lcc_int"
-	"\nafterinstall:\n\tcd \$(DESTDIR)\$(BINDIR) ; rm gcc ; ln -s cc gcc"
+	".PATH: \${.CURDIR}/../cc_int"
+	"SRCS+=\tobstack.c version.c"
+	"LINKS=\t\${BINDIR}/cc \${BINDIR}/gcc"
 }
 copy_c $sdir $ddir/cc $l_cc
 cp $sdir/gcc.1 $ddir/cc/cc.1
@@ -239,9 +255,8 @@ cp $sdir/gcc.1 $ddir/cc/cc.1
 mk_prog $ddir cc1 [add_suffix $l_cc1 .c] {
 	"BINDIR=\t/usr/libexec"
 	"NOMAN=\t1"
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int/obj"
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int"
-	"LDADD+=\t-lcc_int"
+	"DPADD+=\t\${LIBCC_INT} \${LIBGNUMALLOC}"
+	"LDADD+=\t-lcc_int -lgnumalloc"
 }
 copy_c $sdir $ddir/cc1 $l_cc1
 
@@ -249,9 +264,8 @@ copy_c $sdir $ddir/cc1 $l_cc1
 mk_prog $ddir cc1plus [add_suffix "$l_cc1plus_cp $l_cc1plus" .c] {
 	"BINDIR=\t/usr/libexec"
 	"NOMAN=\t1"
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int/obj"
-	"LDDESTDIR+=\t-L\${.CURDIR}/../cc_int"
-	"LDADD+=\t-lcc_int"
+	"DPADD+=\t\${LIBCC_INT} \${LIBGNUMALLOC}"
+	"LDADD+=\t-lcc_int -lgnumalloc"
 }
 copy_l $sdir/cp $ddir/cc1plus $l_cc1plus_x
 copy_c $sdir $ddir/cc1plus $l_cc1plus
diff --git a/gnu/gnu2bmake/gnu2bmake.tcl b/gnu/gnu2bmake/gnu2bmake.tcl
index 7422173..a99b1b3 100644
--- a/gnu/gnu2bmake/gnu2bmake.tcl
+++ b/gnu/gnu2bmake/gnu2bmake.tcl
@@ -7,7 +7,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $FreeBSD$
+# $Id$
 #
 #######################################################################
 # Generic procedures usable in the process of gnu-to-bmake jobs.
@@ -166,7 +166,7 @@ proc makefile_macro {macro dir {makefile Makefile}} {
 proc mk_prog {ddir name list {make ""}} {
     sh "mkdir $ddir/$name"
     set f [open $ddir/$name/Makefile w]
-    puts $f "#\n# \$FreeBSD\$\n#\n"
+    puts $f "#\n# \$Id\$\n#\n"
     puts $f "PROG =\t$name"
     puts $f "SRCS =\t[lsort $list]"
     foreach i $make {puts $f $i}
@@ -184,7 +184,7 @@ proc mk_prog {ddir name list {make ""}} {
 proc mk_lib {ddir name list {make ""}} {
     sh "mkdir $ddir/$name"
     set f [open $ddir/$name/Makefile w]
-    puts $f "#\n# \$FreeBSD\$\n#\n"
+    puts $f "#\n# \$Id\$\n#\n"
     puts $f "SRCS =\t[lsort $list]"
     puts $f "LIB =\t$name"
     foreach i $make {puts $f $i}