From 2d93c4810d95aae37dbf105475e824ef45d8e95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Wed, 6 Jan 2021 11:20:09 +0100 Subject: Haiku patches diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake index a128e13..c56a1b2 100644 --- a/cmake/compilers/Clang.cmake +++ b/cmake/compilers/Clang.cmake @@ -54,7 +54,9 @@ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -Wformat -Wformat-secur -fstack-protector-strong -fPIC) set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now) -set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS}) +if (NOT HAIKU) + set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS}) +endif() set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$>:-D_FORTIFY_SOURCE=2>) diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake index b60172c..1be47fe 100644 --- a/cmake/compilers/GNU.cmake +++ b/cmake/compilers/GNU.cmake @@ -40,7 +40,7 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)") set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$>,$>>:-mwaitpkg>) endif() -if (NOT MINGW) +if (NOT MINGW AND NOT HAIKU) set(TBB_COMMON_LINK_LIBS dl) endif() diff --git a/include/oneapi/tbb/detail/_config.h b/include/oneapi/tbb/detail/_config.h index ad9f0f3..49e3d67 100644 --- a/include/oneapi/tbb/detail/_config.h +++ b/include/oneapi/tbb/detail/_config.h @@ -274,7 +274,7 @@ #define __TBB_CPP20_COMPARISONS_PRESENT 0 #endif -#define __TBB_RESUMABLE_TASKS (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__QNXNTO__ && (!__linux__ || __GLIBC__)) +#define __TBB_RESUMABLE_TASKS (!__TBB_WIN8UI_SUPPORT && !__ANDROID__ && !__HAIKU__ && !__QNXNTO__ && (!__linux__ || __GLIBC__)) /* This macro marks incomplete code or comments describing ideas which are considered for the future. * See also for plain comment with TODO and FIXME marks for small improvement opportunities. @@ -490,6 +490,11 @@ #define TBB_ALLOCATOR_TRAITS_BROKEN 1 #endif +// HAIKU build fix +#if defined(__HAIKU__) + #define TBB_ALLOCATOR_TRAITS_BROKEN 1 +#endif + // GCC 4.8 C++ standard library implements std::this_thread::yield as no-op. #if __TBB_GLIBCXX_VERSION >= 40800 && __TBB_GLIBCXX_VERSION < 40900 #define __TBB_GLIBCXX_THIS_THREAD_YIELD_BROKEN 1 diff --git a/src/tbb/allocator.cpp b/src/tbb/allocator.cpp index 5453aea..99b567b 100644 --- a/src/tbb/allocator.cpp +++ b/src/tbb/allocator.cpp @@ -40,7 +40,7 @@ // memalign() and it offers nothing but overhead due to inconvenient interface. This is likely the case with other // standard libraries as well, and more libraries can be added to the preprocessor check below. Unfortunately, we // can't detect musl, so we simply enable memalign() on Linux and Android in general. -#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__ANDROID__) +#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__ANDROID__) || defined(__HAIKU__) #include // memalign #define __TBB_USE_MEMALIGN #else @@ -119,7 +119,7 @@ static const dynamic_link_descriptor MallocLinkTable[] = { #define MALLOCLIB_NAME "tbbmalloc" DEBUG_SUFFIX ".dll" #elif __APPLE__ #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".dylib" -#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__ +#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__ || __HAIKU__ #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so" #elif __unix__ // Note that order of these #elif's is important! #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so.2" diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp index 2d88f8b..1c6ba41 100644 --- a/src/tbb/dynamic_link.cpp +++ b/src/tbb/dynamic_link.cpp @@ -388,7 +388,11 @@ namespace r1 { #endif /* !__TBB_DYNAMIC_LOAD_ENABLED */ // RTLD_GLOBAL - to guarantee that old TBB will find the loaded library // RTLD_NOLOAD - not to load the library without the full path - library_handle = dlopen(library, RTLD_LAZY | RTLD_GLOBAL | RTLD_NOLOAD); + #ifndef __HAIKU__ + library_handle = dlopen(library, RTLD_LAZY | RTLD_GLOBAL | RTLD_NOLOAD); + #else + library_handle = dlopen(library, RTLD_LAZY | RTLD_GLOBAL); + #endif #endif /* _WIN32 */ if (library_handle) { if (!resolve_symbols(library_handle, descriptors, required)) { diff --git a/src/tbb/rml_tbb.cpp b/src/tbb/rml_tbb.cpp index 4c772ea..97f05f2 100644 --- a/src/tbb/rml_tbb.cpp +++ b/src/tbb/rml_tbb.cpp @@ -50,7 +50,7 @@ namespace rml { #define RML_SERVER_NAME "irml" DEBUG_SUFFIX ".dll" #elif __APPLE__ #define RML_SERVER_NAME "libirml" DEBUG_SUFFIX ".dylib" -#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX +#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __HAIKU__ #define RML_SERVER_NAME "libirml" DEBUG_SUFFIX ".so" #elif __unix__ #define RML_SERVER_NAME "libirml" DEBUG_SUFFIX ".so.1" diff --git a/src/tbbmalloc/frontend.cpp b/src/tbbmalloc/frontend.cpp index aa35831..c6ac548 100644 --- a/src/tbbmalloc/frontend.cpp +++ b/src/tbbmalloc/frontend.cpp @@ -774,7 +774,7 @@ static inline unsigned int highestBitPos(unsigned int n) unsigned int pos; #if __ARCH_x86_32||__ARCH_x86_64 -# if __unix__||__APPLE__||__MINGW32__ +# if __unix__||__APPLE__||__MINGW32__||__HAIKU__ __asm__ ("bsr %1,%0" : "=r"(pos) : "r"(n)); # elif (_WIN32 && (!_WIN64 || __INTEL_COMPILER)) __asm diff --git a/src/tbbmalloc/tbbmalloc.cpp b/src/tbbmalloc/tbbmalloc.cpp index 675726e..f161798 100644 --- a/src/tbbmalloc/tbbmalloc.cpp +++ b/src/tbbmalloc/tbbmalloc.cpp @@ -43,7 +43,7 @@ namespace internal { #define MALLOCLIB_NAME "tbbmalloc" DEBUG_SUFFIX ".dll" #elif __APPLE__ #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".dylib" -#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__ +#elif __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __sun || _AIX || __ANDROID__ || __HAIKU__ #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX ".so" #elif __unix__ #define MALLOCLIB_NAME "libtbbmalloc" DEBUG_SUFFIX __TBB_STRING(.so.2) diff --git a/test/common/memory_usage.h b/test/common/memory_usage.h index cf8b418..1153f81 100644 --- a/test/common/memory_usage.h +++ b/test/common/memory_usage.h @@ -122,6 +122,7 @@ namespace utils { ASSERT(status == KERN_SUCCESS, nullptr); return info.virtual_size - shared_size; #else + utils::suppress_unused_warning(stat); return 0; #endif } diff --git a/test/common/utils_dynamic_libs.h b/test/common/utils_dynamic_libs.h index c84beac..57f0e85 100644 --- a/test/common/utils_dynamic_libs.h +++ b/test/common/utils_dynamic_libs.h @@ -50,7 +50,7 @@ namespace utils { #if __APPLE__ #define EXT ".dylib" // Android SDK build system does not support .so file name versioning -#elif __FreeBSD__ || __NetBSD__ || __sun || _AIX || __ANDROID__ +#elif __FreeBSD__ || __NetBSD__ || __sun || _AIX || __ANDROID__ || __HAIKU__ #define EXT ".so" #elif __unix__ // Order of these elif's matters! #define EXT __TBB_STRING(.so.2) diff --git a/test/conformance/conformance_resumable_tasks.cpp b/test/conformance/conformance_resumable_tasks.cpp index 70fd878..4b8bfbe 100644 --- a/test/conformance/conformance_resumable_tasks.cpp +++ b/test/conformance/conformance_resumable_tasks.cpp @@ -16,7 +16,7 @@ #include "common/test.h" -#if (!__TBB_WIN8UI_SUPPORT && !defined(WINAPI_FAMILY) && !__ANDROID__) +#if (!__TBB_WIN8UI_SUPPORT && !defined(WINAPI_FAMILY) && !__ANDROID__ && !__HAIKU__) #include "oneapi/tbb/task.h" #include "oneapi/tbb/task_group.h" -- 2.45.1 From 9e820e4e741a599cde921cc78271547833e65292 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 25 Jun 2024 09:06:51 +0200 Subject: Disable warning turning into errors diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake index 1be47fe..9d42934 100644 --- a/cmake/compilers/GNU.cmake +++ b/cmake/compilers/GNU.cmake @@ -26,7 +26,7 @@ else() set(TBB_DEF_FILE_PREFIX lin${TBB_ARCH}) endif() -set(TBB_WARNING_LEVEL -Wall -Wextra $<$:-Werror> -Wfatal-errors) +set(TBB_WARNING_LEVEL -Wall -Wextra $<$:-Werror> -Wfatal-errors -Wno-error=uninitialized -Wno-error=array-bounds -Wno-error=use-after-free -Wno-error=address -Wno-error=sizeof-array-div) set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor) # Depfile options (e.g. -MD) are inserted automatically in some cases. -- 2.45.1 From 4695814ea37df44d34e25ac7ee22ddc5a721e9d2 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 25 Jun 2024 08:54:51 +0200 Subject: Build fix? diff --git a/include/oneapi/tbb/detail/_export.h b/include/oneapi/tbb/detail/_export.h index 4c01522..cc4c9f5 100644 --- a/include/oneapi/tbb/detail/_export.h +++ b/include/oneapi/tbb/detail/_export.h @@ -17,7 +17,7 @@ #ifndef __TBB_detail__export_H #define __TBB_detail__export_H -#if defined(__MINGW32__) +#if defined(__MINGW32__) || defined(__HAIKU__) #define _EXPORT __declspec(dllexport) #elif defined(_WIN32) || defined(__unix__) || defined(__APPLE__) // Use .def files for these #define _EXPORT -- 2.45.1