Ticket #375: boost-1.47.0.patch

boost/config/platform/haiku.hpp

@@ +1 @@
+//  (C) Copyright John Maddock 2001. 
+//  Use, modification and distribution are subject to the 
+//  Boost Software License, Version 1.0. (See accompanying file 
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for most recent version.
+
+//  Haiku specific config options:
+
+#define BOOST_PLATFORM "Haiku"
+
+#define BOOST_NO_INTRINSIC_WCHAR_T
+#define BOOST_HAS_UNISTD_H
+
+#define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
+
+#define BOOST_HAS_THREADS
+
+//
+// thread API's not auto detected:
+//
+#define BOOST_HAS_SCHED_YIELD
+#define BOOST_HAS_NANOSLEEP
+#define BOOST_HAS_GETTIMEOFDAY
+#define BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
+#define BOOST_HAS_SIGACTION
+
+// boilerplate code:
+#include <boost/config/posix_features.hpp>

boost/config/select_platform_config.hpp

@@ -41 +41 @@
 // win32:
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/win32.hpp"
 
+#elif defined(__HAIKU__)
+// Haiku
+#  define BOOST_PLATFORM_CONFIG "boost/config/platform/haiku.hpp"
+
 #elif defined(__BEOS__)
 // BeOS
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/beos.hpp"

boost/config/stdlib/libstdcpp3.hpp

@@ -33 +33 @@
 
 #ifdef __GLIBCXX__ // gcc 3.4 and greater:
 #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
-        || defined(_GLIBCXX__PTHREADS)
+        || defined(_GLIBCXX__PTHREADS) || defined(__HAIKU__)
       //
       // If the std lib has thread support turned on, then turn it on in Boost
       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT

boost/interprocess/detail/workaround.hpp

@@ -64 +64 @@
    #endif
 
    //Check for XSI shared memory objects. They are available in nearly all UNIX platforms
-   #if !defined(__QNXNTO__)
+   #if !defined(__QNXNTO__) || !defined(__HAIKU__)
    # define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
    #endif
 

boost/interprocess/mapped_region.hpp

@@ -31 +31 @@
 #    include <unistd.h>
 #    include <sys/stat.h>
 #    include <sys/types.h>
+#  if !defined(__HAIKU__)
 #    if defined(BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS)
 #      include <sys/shm.h>      //System V shared memory...
 #    endif
+#  endif
 #    include <boost/assert.hpp>
 #  else
 #    error Unknown platform
@@ -396 +398 @@
    mapping_handle_t map_hnd = mapping.get_mapping_handle();
 
    //Some systems dont' support XSI shared memory
+   # if !defined(__HAIKU__)
    #ifdef BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
    if(map_hnd.is_xsi){
       //Get the size
@@ -438 +441 @@
       return;
    }
    #endif   //ifdef BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
+   #endif   //Haiku
    if(size == 0){
       struct ::stat buf;
       if(0 != fstat(map_hnd.handle, &buf)){
@@ -547 +551 @@
 inline void mapped_region::priv_close()
 {
    if(m_base != MAP_FAILED){
+                # if !defined(__HAIKU__)
       #ifdef BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
       if(m_is_xsi){
          int ret = ::shmdt(m_base);
@@ -555 +560 @@
          return;
       }
       #endif //#ifdef BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
+        #endif //Haiku
       munmap(static_cast<char*>(m_base) - m_extra_offset, m_size + m_extra_offset);
       m_base = MAP_FAILED;
    }

boost/math/tools/config.hpp

@@ -24 +24 @@
 #include <boost/math/special_functions/detail/round_fwd.hpp>
 
 #if (defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \
-   || defined(__hppa) || defined(__NO_LONG_DOUBLE_MATH)) && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
+    || defined(__HAIKU__) || defined(__hppa) || defined(__NO_LONG_DOUBLE_MATH)) && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
 #  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 #endif
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))

boost/thread/detail/platform.hpp

@@ -31 +31 @@
 #  define BOOST_THREAD_CYGWIN
 #elif (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && !defined(BOOST_DISABLE_WIN32)
 #  define BOOST_THREAD_WIN32
+#elif defined(__HAIKU__)
+#  define BOOST_THREAD_HAIKU
 #elif defined(__BEOS__)
 #  define BOOST_THREAD_BEOS
 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)

tools/build/v2/engine/boehm_gc/include/private/gcconfig.h

@@ -210 +210 @@
 #   endif
 #   define mach_type_known
 # endif
+# if defined(__HAIKU__) && defined(_X86_)
+#    define I386
+#    define HAIKU
+#    define mach_type_known
+# endif
 # if defined(__BEOS__) && defined(_X86_)
 #    define I386
 #    define BEOS
@@ -1007 +1012 @@
 #       define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
 #       define STACKBOTTOM ((ptr_t) 0x3ffff000) 
 #   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 BEOS
 #     define OS_TYPE "BEOS"
 #     include <OS.h>

tools/build/v2/engine/fileunix.c

@@ -80 +80 @@
 # endif
 
 # if defined( OS_QNX ) || \
+         defined( OS_HAIKU ) || \
      defined( OS_BEOS ) || \
      defined( OS_MPEIX )
 # define NO_AR

tools/build/v2/engine/jam.h

@@ -228 +228 @@
     #define OSMINOR "OS=AMIGA"
     #define OS_AMIGA
 #endif
+#ifdef __HAIKU__
+   #define unix
+   #define OSMINOR "OS=HAIKU"
+   #define OS_HAIKU
+#endif
 #ifdef __BEOS__
     #define unix
     #define OSMINOR "OS=BEOS"

tools/build/v2/engine/Jambase

@@ -827 +827 @@
     SUFLIB      ?= .lib ;
     SUFOBJ      ?= .o ;
 }
+else if $(OS) = HAIKU
+{
+    BINDIR      ?= /boot/common/bin ;
+    CC          ?= gcc ;
+    C++         ?= $(CC) ;
+    FORTRAN     ?= "" ;
+    LIBDIR      ?= /boot/develop/lib/x86 ;
+    LINK        ?= gcc ;
+    LINKLIBS    ?= -lnetwork ;
+    NOARSCAN    ?= true ;
+    STDHDRS     ?= /boot/develop/headers/posix ;
+}
+
 else if $(OS) = BEOS && $(METROWERKS)
 {
     AR          ?= mwld -xml -o ;

tools/build/v2/engine/jambase.c

@@ -548 +548 @@
 "NOARSCAN    ?= true ;\n",
 "STDHDRS     ?= /boot/develop/headers/posix ;\n",
 "}\n",
+"else if $(OS) = HAIKU\n",
+"{\n",
+"BINDIR      ?= /boot/common/bin ;\n",
+"CC          ?= gcc ;\n",
+"C++         ?= $(CC) ;\n",
+"FORTRAN     ?= \"\" ;\n",
+"LIBDIR      ?= /boot/develop/lib/x86 ;\n",
+"LINK        ?= gcc ;\n",
+"LINKLIBS    ?= -lnetwork ;\n",
+"NOARSCAN    ?= true ;\n",
+"STDHDRS     ?= /boot/develop/headers/posix ;\n",
+"}\n",
+
 "else if $(OS) = BEOS\n",
 "{\n",
 "BINDIR      ?= /boot/apps ;\n",

tools/build/v2/tools/builtin.jam

@@ -40 +40 @@
 
 
 .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd
-    openbsd osf qnx qnxnto sgi solaris unix unixware windows 
+    openbsd osf qnx qnxnto sgi solaris unix unixware windows haiku
     elf # Not actually an OS -- used for targeting bare metal where
         # object format is ELF.  This catches both -elf and -eabi gcc
         # targets and well as other compilers targeting ELF. It is not
@@ -78 +78 @@
             case MACOSX       : host-os = darwin  ;
             case KFREEBSD     : host-os = freebsd ;
             case LINUX        : host-os = linux   ;
+            case HAIKU        : host-os = haiku   ;
             case SUNOS        : 
               ECHO "SunOS is not a supported operating system." ;
               ECHO "We believe last version of SunOS was released in 1992, " ;

tools/build/v2/tools/gcc.jam

@@ -951 +951 @@
 
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -nostart -Wl,-shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
 
 }
 
@@ -1043 +1043 @@
                 option = -pthreads ;
                 libs = rt ;
             }
+            case haiku :
+            {
+                # pthread
+            }
             case beos :
             {            
                 # BeOS has no threading options, so do not set anything here.