2 files changed, 10 insertions, 90 deletions

diff --git a/lang/gcc42/files/patch-ad b/lang/gcc42/files/patch-ad
index c59833513fa0..a5a58354932e 100644
--- a/lang/gcc42/files/patch-ad
+++ b/lang/gcc42/files/patch-ad
@@ -1,44 +1,16 @@
---- gcc/config/i386/freebsd-aout.h.orig	Tue Jan 22 16:56:28 2002
-+++ gcc/config/i386/freebsd-aout.h	Sat Feb  2 13:30:32 2002
-@@ -76,14 +76,6 @@
- /* FreeBSD using a.out does not support DWARF2 unwinding mechanisms.  */
- #define DWARF2_UNWIND_INFO 0
- 
--/* Don't default to pcc-struct-return, because in FreeBSD we prefer the
--   superior nature of the older gcc way.  */
--#define DEFAULT_PCC_STRUCT_RETURN 0
--
--/* Ensure we the configuration knows our system correctly so we can link with
--   libraries compiled with the native cc.  */
--#undef NO_DOLLAR_IN_LABEL
--
- /* i386 freebsd still uses old binutils that don't insert nops by default
-    when the .align directive demands to insert extra space in the text
-    segment.  */
-@@ -93,19 +85,18 @@
+--- gcc/config/i386/freebsd-aout.h.orig	Fri Nov 15 06:57:11 2002
++++ gcc/config/i386/freebsd-aout.h	Sat Apr 19 21:16:26 2003
+@@ -94,6 +94,9 @@
  
  /* Profiling routines, partially copied from i386/osfrose.h.  */
  
--/* Redefine this to use %eax instead of %edx.  */
 +/* Tell final.c that we don't need a label passed to mcount.  */
-+#define NO_PROFILE_DATA
++#define NO_PROFILE_COUNTERS 1
 +
- #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");				\
-     }									\
- }
-@@ -123,6 +114,7 @@
+ #undef MCOUNT_NAME
+ #define MCOUNT_NAME "mcount"
+ #undef PROFILE_COUNT_REGISTER
+@@ -112,6 +115,7 @@
  
  #define TYPE_ASM_OP	"\t.type\t"
  #define SIZE_ASM_OP	"\t.size\t"
@@ -46,7 +18,7 @@
  
  /* The following macro defines the format used to output the second
     operand of the .type assembler directive.  Different svr4 assemblers
-@@ -132,6 +124,12 @@
+@@ -121,6 +125,12 @@
  
  #define TYPE_OPERAND_FMT	"@%s"
  
@@ -59,7 +31,7 @@
  /* Write the extra assembler code needed to declare a function's result.
     Most svr4 assemblers don't require any special declaration of the
     result value, but there are exceptions.  */
-@@ -233,6 +231,8 @@
+@@ -209,6 +219,8 @@
  #define STARTFILE_SPEC  \
    "%{shared:c++rt0.o%s} \
     %{!shared:%{pg:gcrt0.o%s}%{!pg:%{static:scrt0.o%s}%{!static:crt0.o%s}}}"
diff --git a/lang/gcc42/files/patch-ar b/lang/gcc42/files/patch-ar
deleted file mode 100644
index 8b3f5f6b267c..000000000000
--- a/lang/gcc42/files/patch-ar
+++ /dev/null
@@ -1,52 +0,0 @@
---- gcc/config/freebsd-spec.h.orig	Tue Nov 20 18:06:45 2001
-+++ gcc/config/freebsd-spec.h	Sat Feb  2 13:37:38 2002
-@@ -48,29 +48,32 @@
-    || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") 		\
-    || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker"))
- 
-+/* Place spaces around this string.  We depend on string splicing to produce
-+   the final CPP_PREDEFINES value.  */
-+
- #if FBSD_MAJOR == 6
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__=6 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__=6 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- #if FBSD_MAJOR == 5
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__=5 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__=5 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- #if FBSD_MAJOR == 4
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__=4 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__=4 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- #if FBSD_MAJOR == 3
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__=3 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__=3 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- #ifndef FBSD_CPP_PREDEFINES
- #define FBSD_CPP_PREDEFINES \
--  "-D__FreeBSD__   -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
-+  " -D__FreeBSD__   -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
- #endif
- 
- /* Provide a CPP_SPEC appropriate for FreeBSD.  We just deal with the GCC 
-@@ -79,7 +82,10 @@
- #define FBSD_CPP_SPEC "							\
-   %(cpp_cpu)								\
-   %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__}		\
--  %{posix:-D_POSIX_SOURCE}"
-+  %{posix:-D_POSIX_SOURCE}						\
-+  %{!maout: -D__ELF__}							\
-+  %{munderscores: -D__UNDERSCORES__}					\
-+  %{maout: %{!mno-underscores: -D__UNDERSCORES__}}"
- 
- /* Provide a STARTFILE_SPEC appropriate for FreeBSD.  Here we add
-    the magical crtbegin.o file (see crtstuff.c) which provides part