Get a lot closer to supporting FreeBSD/Alpha.

(we only have two arch's, why can't we keep them better in sync with each
other ABI-wise?)

2 files changed, 163 insertions, 8 deletions

diff --git a/devel/boehm-gc/files/patch-aa b/devel/boehm-gc/files/patch-aa
index dcf913d3dfa8..cfa2c2209321 100644
--- a/devel/boehm-gc/files/patch-aa
+++ b/devel/boehm-gc/files/patch-aa
@@ -1,14 +1,15 @@
---- Makefile.orig	Sat Sep 11 01:49:18 1999
-+++ Makefile	Tue Oct 12 17:27:25 1999
+--- Makefile.orig	Fri Oct 29 15:18:48 1999
++++ Makefile	Tue Jul 18 21:10:50 2000
 @@ -8,15 +8,42 @@
  #	 c++ interface to gc.a
  # cord/de - builds dumb editor based on cords.
  ABI_FLAG= 
 -CC=cc $(ABI_FLAG)
 -CXX=g++ $(ABI_FLAG)
+-AS=as $(ABI_FLAG)
 +CC+= $(ABI_FLAG)
 +CXX+= $(ABI_FLAG)
- AS=as $(ABI_FLAG)
++AS=cc -c -x assembler-with-cpp $(ABI_FLAG)
  #  The above doesn't work with gas, which doesn't run cpp.
  #  Define AS as `gcc -c -x assembler-with-cpp' instead.
  #  Under Irix 6, you will have to specify the ABI (-o32, -n32, or -64)
@@ -46,7 +47,7 @@
  
  # For dynamic library builds, it may be necessary to add flags to generate
  # PIC code, e.g. -fPIC on Linux.
-@@ -138,7 +165,7 @@
+@@ -140,7 +167,7 @@
      -DDONT_ADD_BYTE_AT_END -DALL_INTERIOR_POINTERS
  #   Flags for building libgc.a -- the last two are required.
  
@@ -55,7 +56,7 @@
  AR= ar
  RANLIB= ranlib
  
-@@ -202,8 +229,6 @@
+@@ -204,8 +231,6 @@
  # not time-critical anyway.
  # Set SPECIALCFLAGS to -q nodirect_code on Encore.
  
@@ -64,8 +65,8 @@
  pcr: PCR-Makefile gc_private.h gc_hdrs.h gc.h gcconfig.h mach_dep.o $(SRCS)
  	make -f PCR-Makefile depend
  	make -f PCR-Makefile
-@@ -245,6 +270,12 @@
- 	./if_mach HP_PA "" $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -ldld
+@@ -247,6 +272,12 @@
+ 	./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -ldld `./threadlibs`
  	./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a `./threadlibs`
  
 +c++-t: c++
@@ -77,7 +78,7 @@
  c++: gc_cpp.o $(srcdir)/gc_cpp.h test_cpp
  	rm -f dont_ar_4
  	./if_mach SPARC SUNOS5 touch dont_ar_4
-@@ -253,7 +284,6 @@
+@@ -255,7 +286,6 @@
  	./if_mach M68K AMIGA $(AR) -vrus gc.a gc_cpp.o
  	./if_not_there dont_ar_4 $(AR) ru gc.a gc_cpp.o
  	./if_not_there dont_ar_4 $(RANLIB) gc.a || cat /dev/null
diff --git a/devel/boehm-gc/files/patch-ae b/devel/boehm-gc/files/patch-ae
new file mode 100644
index 000000000000..f6122a7d47d3
--- /dev/null
+++ b/devel/boehm-gc/files/patch-ae
@@ -0,0 +1,154 @@
+--- gcconfig.h.orig	Tue Oct 26 15:40:54 1999
++++ gcconfig.h	Tue Jul 18 21:08:17 2000
+@@ -22,10 +22,23 @@
+ 
+ /* Machine specific parts contributed by various people.  See README file. */
+ 
+-/* First a unified test for Linux: */
++/* First a unified test for the Multi-platform OS's: */
+ # if defined(linux) || defined(__linux__)
+ #    define LINUX
+ # endif
++# if defined(__FreeBSD__)
++#    define FREEBSD
++# endif
++# if defined(__NetBSD__)
++#    define NETBSD
++# endif
++# if defined(__OpenBSD__)
++#    define OPENBSD
++# endif
++# if defined(bsdi)
++#    define BSDI
++# endif
++
+ 
+ /* Determine the machine type: */
+ # if defined(sun) && defined(mc68000)
+@@ -38,24 +51,16 @@
+ #    define HP
+ #    define mach_type_known
+ # endif
+-# if defined(__OpenBSD__) && defined(m68k)
++# if (defined(__NetBSD__) || defined(__OpenBSD__)) && defined(m68k)
+ #    define M68K
+-#    define OPENBSD
+ #    define mach_type_known
+ # endif
+-# if defined(__OpenBSD__) && defined(__sparc__)
++# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__sparc__)
+ #    define SPARC
+-#    define OPENBSD
+ #    define mach_type_known
+ # endif
+-# if defined(__NetBSD__) && defined(m68k)
+-#    define M68K
+-#    define NETBSD
+-#    define mach_type_known
+-# endif
+-# if defined(__NetBSD__) && defined(arm32)
++# if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(arm32)
+ #    define ARM32
+-#    define NETBSD
+ #    define mach_type_known
+ # endif
+ # if defined(vax)
+@@ -111,7 +116,7 @@
+ #   define mach_type_known
+ # endif
+ # if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \
+-     && !defined(__OpenBSD__)
++     && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #   define SPARC
+ #   define DRSNX
+ #   define mach_type_known
+@@ -147,7 +152,7 @@
+ #    define I386
+ #    define mach_type_known
+ # endif
+-# if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
++# if (defined(__FreeBSD__) || defined(LINUX)) && (defined(__ia64__) || defined(__ia64))
+ #    define IA64
+ #    define mach_type_known
+ # endif
+@@ -165,7 +170,7 @@
+ # endif
+ # if defined(__alpha) || defined(__alpha__)
+ #   define ALPHA
+-#   if !defined(LINUX)
++#   if !defined(LINUX) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ #     define OSF1	/* a.k.a Digital Unix */
+ #   endif
+ #   define mach_type_known
+@@ -192,6 +197,9 @@
+ #    define POWERPC
+ #    define mach_type_known
+ # endif
++# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(bsdi)) && (defined(__powerpc) || defined(__ppc__) || defined(__ppc))
++#    define POWERPC
++# endif
+ # if defined(NeXT) && defined(mc68000)
+ #   define M68K
+ #   define NEXT
+@@ -202,26 +210,10 @@
+ #   define NEXT
+ #   define mach_type_known
+ # endif
+-# if defined(__OpenBSD__) && defined(i386)
++# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi))        && (defined(i386) || defined(__i386__))
+ #   define I386
+-#   define OPENBSD
+ #   define mach_type_known
+ # endif
+-# if defined(__FreeBSD__) && defined(i386)
+-#   define I386
+-#   define FREEBSD
+-#   define mach_type_known
+-# endif
+-# if defined(__NetBSD__) && defined(i386)
+-#   define I386
+-#   define NETBSD
+-#   define mach_type_known
+-# endif
+-# if defined(bsdi) && defined(i386)
+-#    define I386
+-#    define BSDI
+-#    define mach_type_known
+-# endif
+ # if !defined(mach_type_known) && defined(__386BSD__)
+ #   define I386
+ #   define THREE86BSD
+@@ -318,7 +310,7 @@
+ 		    /*			(SUNOS4, SUNOS5,		*/
+ 		    /*			 DRSNX variants)		*/
+ 		    /* 		   ALPHA      ==> DEC Alpha 		*/
+-		    /*			(OSF1 and LINUX variants)	*/
++		    /*			(OSF1, BSD and LINUX variants)	*/
+ 		    /* 		   M88K       ==> Motorola 88XX0        */
+ 		    /* 		        (CX_UX and DGUX)		*/
+ 		    /* 		   S370	      ==> 370-like machine	*/
+@@ -965,6 +957,24 @@
+ #   	define CPP_WORDSZ 64
+ #   	define MPROTECT_VDB
+ #   	define DYNAMIC_LOADING
++#   endif
++#   ifdef FREEBSD
++#       define OS_TYPE "FREEBSD"
++#       define CPP_WORDSZ 64
++#	define HEURISTIC2
++#	define DATASTART ((ptr_t)(&etext))
++#   endif
++#   if defined(NETBSD)
++#       define OS_TYPE "NETBSD"
++#       define CPP_WORDSZ 64
++#	define HEURISTIC2
++#	define DATASTART ((ptr_t)(&etext))
++#   endif
++#   if defined(OPENBSD)
++#       define OS_TYPE "OPENBSD"
++#       define CPP_WORDSZ 64
++#	define HEURISTIC2
++#	define DATASTART ((ptr_t)(&etext))
+ #   endif
+ #   ifdef LINUX
+ #       define OS_TYPE "LINUX"