[patch] add GNU/kFreeBSD support into boehm-gc also for amd64/x86-64 cpu

[patch] add GNU/kFreeBSD support into boehm-gc also for amd64/x86-64 cpu

[Petr Salinger]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 544 bytes --]

Hi,

would be possible to merge GNU/kFreeBSD support in boehm-gc
into gcc also for amd64/x86-64 cpu.

Those changes to boehm-gc have been just accepted by upstream, see thread started by 
http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2007-January/001535.html

Please, could you add this tiny patch into both trunk and gcc-4.2 branch.

  2007-01-07 Petr Salinger <Petr.Salinger@seznam.cz>

         * include/private/gcconfig.h: handle amd64/x86-64 cpu under GNU/kFreeBSD
         * os_dep.c: Likewise.


Thanks in advance,

          Petr

[-- Attachment #2: Type: TEXT/PLAIN, Size: 1524 bytes --]

diff -ur boehm-gc.orig/include/private/gcconfig.h boehm-gc/include/private/gcconfig.h
--- boehm-gc.orig/include/private/gcconfig.h	2006-12-09 00:54:21.000000000 +0100
+++ boehm-gc/include/private/gcconfig.h	2007-01-07 19:40:37.000000000 +0100
@@ -326,6 +326,10 @@
 #   define I386
 #   define mach_type_known
 # endif
+# if defined(FREEBSD) && defined(__x86_64__)
+#   define X86_64
+#   define mach_type_known
+# endif
 # if defined(__NetBSD__) && (defined(i386) || defined(__i386__))
 #   define I386
 #   define mach_type_known
diff -ur boehm-gc.orig/os_dep.c boehm-gc/os_dep.c
--- boehm-gc.orig/os_dep.c	2006-09-22 01:47:30.000000000 +0200
+++ boehm-gc/os_dep.c	2007-01-07 19:40:37.000000000 +0100
@@ -84,7 +84,7 @@
 #   define NEED_FIND_LIMIT
 # endif
 
-#if defined(FREEBSD) && (defined(I386) || defined(powerpc) || defined(__powerpc__))
+#if defined(FREEBSD) && (defined(I386) || defined(X86_64) || defined(powerpc) || defined(__powerpc__))
 #  include <machine/trap.h>
 #  if !defined(PCR)
 #    define NEED_FIND_LIMIT
@@ -1392,7 +1392,7 @@
 }
 # endif
 
-# if defined(FREEBSD) && (defined(I386) || defined(powerpc) || defined(__powerpc__)) && !defined(PCR)
+# if defined(FREEBSD) && (defined(I386) || defined(X86_64) || defined(powerpc) || defined(__powerpc__)) && !defined(PCR)
 /* Its unclear whether this should be identical to the above, or 	*/
 /* whether it should apply to non-X86 architectures.			*/
 /* For now we don't assume that there is always an empty page after	*/

Re: [patch] add GNU/kFreeBSD support into boehm-gc also for amd64/x86-64 cpu

[Tom Tromey]

>>>>> "Petr" == Petr Salinger <Petr.Salinger@seznam.cz> writes:

Petr> Those changes to boehm-gc have been just accepted by upstream,
Petr> see thread started by
Petr> http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2007-January/001535.html

Petr> Please, could you add this tiny patch into both trunk and
Petr> gcc-4.2 branch.

Sorry for the delay on this.  I will check this in today.

Tom