Imported Upstream version 5.12.0.220

Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476

libgc/include/gc_config_macros.h

@@ -57,7 +57,7 @@
 	defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \
 	defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
 	defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \
-	defined(GC_OPENBSD_THREADS) || \
+	defined(GC_OPENBSD_THREADS) || defined(GC_HAIKU_THREADS) ||\
         (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__))
 #   define GC_PTHREADS
 # endif

libgc/include/private/gc_priv.h

@@ -1979,6 +1979,8 @@ void GC_err_puts GC_PROTO((GC_CONST char *s));
        /* Linuxthreads itself uses SIGUSR1 and SIGUSR2.			*/
 #      define SIG_SUSPEND SIGPWR
 #    endif
+#   elif defined(GC_OPENBSD_THREADS)
+#     define SIG_SUSPEND SIGXFSZ
 #   else  /* !GC_LINUX_THREADS */
 #     if defined(_SIGRTMIN)
 #       define SIG_SUSPEND _SIGRTMIN + 6

libgc/include/private/gcconfig.h

@@ -238,6 +238,16 @@
 #    define BEOS
 #    define mach_type_known
 # endif
+# if defined(__HAIKU__) && defined(_X86_)
+#    define I386
+#    define HAIKU
+#    define mach_type_known
+# endif
+# if defined(__HAIKU__) && defined(__amd64__)
+#    define X86_64
+#    define HAIKU
+#    define mach_type_known
+# endif
 # if defined(LINUX) && (defined(i386) || defined(__i386__))
 #    define I386
 #    define mach_type_known
@@ -1164,6 +1174,15 @@
       extern int etext[];
 #     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
 #   endif
+#   ifdef HAIKU
+#     define OS_TYPE "HAIKU"
+#     include <OS.h>
+#     define GETPAGESIZE() B_PAGE_SIZE
+      extern int etext[];
+#     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
+#     define DYNAMIC_LOADING
+#     define MPROTECT_VDB
+#   endif
 #   ifdef SUNOS5
 #	define OS_TYPE "SUNOS5"
         extern int _etext[], _end[];
@@ -2134,6 +2153,15 @@
       /* There seems to be some issues with trylock hanging on darwin. This
          should be looked into some more */
 #   endif
+#   ifdef HAIKU
+#     define OS_TYPE "HAIKU"
+#     include <OS.h>
+#     define GETPAGESIZE() B_PAGE_SIZE
+      extern int etext[];
+#     define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
+#     define DYNAMIC_LOADING
+#     define MPROTECT_VDB
+#   endif
 #   ifdef FREEBSD
 #	define OS_TYPE "FREEBSD"
 #	ifndef GC_FREEBSD_THREADS
@@ -2251,7 +2279,7 @@
 # if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
 	    || defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
 	    || defined(DGUX) || defined(BSD) || defined(SUNOS4) \
-	    || defined(_AIX) || defined(DARWIN) || defined(OSF1)
+	    || defined(_AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU)
 #   define UNIX_LIKE   /* Basic Unix-like system calls work.	*/
 # endif
 
@@ -2507,6 +2535,9 @@
 #           if defined(SN_TARGET_PS3)
 	           extern void *ps3_get_mem (size_t size);
 #              define GET_MEM(bytes) (struct hblk*) ps3_get_mem (bytes)
+#           elif defined(HAIKU)
+              ptr_t GC_haiku_get_mem(GC_word bytes);
+#             define GET_MEM(bytes) (struct  hblk*)GC_haiku_get_mem(bytes)
 #           else
 		extern ptr_t GC_unix_get_mem(word size);
 #               define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)

libgc/include/private/openbsd_stop_world.h

@@ -1,12 +0,0 @@
-#ifndef GC_OPENBSD_STOP_WORLD_H
-#define GC_OPENBSD_STOP_WORLD_H
-
-#if !defined(GC_OPENBSD_THREADS)
-#error openbsd_stop_world.h included without GC_OPENBSD_THREADS defined
-#endif
-
-struct thread_stop_info {
-    ptr_t stack_ptr;  		/* Valid only when stopped.      	*/
-};
-    
-#endif

libgc/include/private/pthread_support.h

@@ -8,8 +8,6 @@
      
 #if defined(GC_DARWIN_THREADS)
 # include "private/darwin_stop_world.h"
-#elif defined(GC_OPENBSD_THREADS)
-# include "private/openbsd_stop_world.h"
 #else
 # include "private/pthread_stop_world.h"
 #endif