Ticket #318: gc-7.2alpha4.patch

configure.ac

@@ -120 +120 @@
         AC_DEFINE(GC_LINUX_THREADS)
         AC_DEFINE(_REENTRANT)
         ;;
+     *-*-haiku*)
+    THREADDLLIBS= -lroot
+    ;;
      *-*-aix*)
         AC_DEFINE(GC_AIX_THREADS)
         AC_DEFINE(_REENTRANT)

include/private/gcconfig.h

@@ -231 +231 @@
 #    define BEOS
 #    define mach_type_known
 # endif
+# if defined(__HAIKU__) && defined(_X86_)
+#    define I386
+#    define HAIKU
+#    define mach_type_known
+# endif
 # if defined(OPENBSD) && defined(__amd64__)
 #    define X86_64
 #    define mach_type_known
@@ -1074 +1079 @@
       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))
+#   endif
 #   ifdef SOLARIS
 #       define OS_TYPE "SOLARIS"
         extern int _etext[], _end[];

os_dep.c

@@ -808 +808 @@
 
 # endif /* MS Windows */
 
-# ifdef BEOS
+# if defined (BEOS) || defined (HAIKU)
 #   include <kernel/OS.h>
     ptr_t GC_get_main_stack_base(void)
     {
@@ -816 +816 @@
       get_thread_info(find_thread(NULL),&th);
       return th.stack_end;
     }
-# endif /* BEOS */
+# endif /* BEOS and HAIKU */
 
 
 # ifdef OS2
@@ -1138 +1138 @@
 
 #endif /* FREEBSD_STACKBOTTOM */
 
-#if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \
+#if !defined(BEOS) && !defined(HAIKU) && !defined(AMIGA) && !defined(MSWIN32) \
     && !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) \
     && !defined(CYGWIN32) && !defined(GC_OPENBSD_THREADS)
 
@@ -1195 +1195 @@
 #   endif /* STACKBOTTOM */
 }
 
-# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */
+# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !HAIKU, !NOSYS, !ECOS */
 
 #if defined(GC_LINUX_THREADS) && !defined(HAVE_GET_STACK_BASE)
 
@@ -1934 +1934 @@
 
 ptr_t GC_unix_get_mem(word bytes)
 {
+  #ifdef HAIKU
+        void *memptr;
+        int rt = posix_memalign(&memprt, GC_page_size, bytes);
+        return memptr;
+  #else
     return GC_unix_mmap_get_mem(bytes);
+  #endif
 }
 
 #else /* Not USE_MMAP */