Allow '$' in labels as our offical compiler does.

Reviewed by:	jdp
Submitted by:	Keith Walker <kew@timesink.spk.wa.us>

2 files changed, 36 insertions, 10 deletions

diff --git a/lang/gcc46/files/patch-ad b/lang/gcc46/files/patch-ad
index fa80120..7b42a72 100644
--- a/lang/gcc46/files/patch-ad
+++ b/lang/gcc46/files/patch-ad
@@ -1,6 +1,17 @@
 --- gcc/config/i386/freebsd.h.orig	Tue Jun 30 15:52:18 1998
-+++ gcc/config/i386/freebsd.h	Wed Oct  7 17:06:41 1998
-@@ -99,19 +99,18 @@
++++ gcc/config/i386/freebsd.h	Fri Jan 22 04:08:44 1999
+@@ -89,6 +89,10 @@
+ /* Don't default to pcc-struct-return, because gcc is the only compiler, and
+    we want to retain compatibility with older gcc versions.  */
+ #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
+@@ -99,19 +103,18 @@
  
  /* Profiling routines, partially copied from i386/osfrose.h.  */
  
@@ -23,7 +34,7 @@
        fprintf (FILE, "\tcall mcount\n");				\
      }									\
  }
-@@ -129,6 +128,7 @@
+@@ -129,6 +132,7 @@
  
  #define TYPE_ASM_OP	".type"
  #define SIZE_ASM_OP	".size"
@@ -31,7 +42,7 @@
  
  /* The following macro defines the format used to output the second
     operand of the .type assembler directive.  Different svr4 assemblers
-@@ -138,6 +138,12 @@
+@@ -138,6 +142,12 @@
  
  #define TYPE_OPERAND_FMT	"@%s"
  
@@ -44,7 +55,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.  */
-@@ -239,6 +245,8 @@
+@@ -239,6 +249,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/gcc46/files/patch-af b/lang/gcc46/files/patch-af
index ccd4467..b342bb4 100644
--- a/lang/gcc46/files/patch-af
+++ b/lang/gcc46/files/patch-af
@@ -1,6 +1,21 @@
 --- gcc/config/i386/freebsd-elf.h.orig	Mon Jul 13 15:38:36 1998
-+++ gcc/config/i386/freebsd-elf.h	Wed Oct  7 22:18:02 1998
-@@ -108,22 +108,19 @@
++++ gcc/config/i386/freebsd-elf.h	Fri Jan 22 04:11:03 1999
+@@ -26,8 +26,13 @@
+ 
+ /* The svr4 ABI for the i386 says that records and unions are returned
+    in memory.  */
++/* On FreeBSD, we do not. */
+ #undef DEFAULT_PCC_STRUCT_RETURN
+-#define DEFAULT_PCC_STRUCT_RETURN 1
++#define DEFAULT_PCC_STRUCT_RETURN 0
++
++/* This gets defined in tm.h->linux.h->svr4.h, and keeps us from using
++   libraries compiled with the native cc, so undef it. */
++#undef NO_DOLLAR_IN_LABEL
+ 
+ /* This is how to output an element of a case-vector that is relative.
+    This is only used for PIC code.  See comments by the `casesi' insn in
+@@ -108,22 +113,19 @@
   : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \
   : (-1))
  
@@ -27,7 +42,7 @@
      }									\
  }
  
-@@ -146,20 +143,8 @@
+@@ -146,20 +148,8 @@
  #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
  
  #undef	LIB_SPEC
@@ -36,11 +51,11 @@
 - * want to profile or debug the C library, please add
 - * -lc_p or -ggdb to LDFLAGS at the link time, respectively.
 - */
- #define LIB_SPEC \
+-#define LIB_SPEC \
 -  "%{!shared: %{mieee-fp:-lieee} %{p:-lgmon} %{pg:-lgmon} \
 -     %{!ggdb:-lc} %{ggdb:-lg}}"
 -#else
--#define LIB_SPEC \
+ #define LIB_SPEC \
 -  "%{!shared: \
 -     %{mieee-fp:-lieee} %{p:-lgmon -lc_p} %{pg:-lgmon -lc_p} \
 -       %{!p:%{!pg:%{!g*:-lc} %{g*:-lg}}}}"