35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
diff --git a/include/__config b/include/__config
|
||
|
index 575147cead42..8f0bb7248113 100644
|
||
|
--- a/include/__config
|
||
|
+++ b/include/__config
|
||
|
@@ -921,7 +921,7 @@ typedef unsigned int char32_t;
|
||
|
|
||
|
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
|
||
|
// Most unix variants have catopen. These are the specific ones that don't.
|
||
|
-# if !defined(__BIONIC__) && !defined(_NEWLIB_VERSION)
|
||
|
+# if !defined(__BIONIC__) && !defined(_NEWLIB_VERSION) && !defined(__GENODE__)
|
||
|
# define _LIBCPP_HAS_CATOPEN 1
|
||
|
# endif
|
||
|
#endif
|
||
|
@@ -1130,6 +1130,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
|
||
|
defined(__APPLE__) || \
|
||
|
defined(__CloudABI__) || \
|
||
|
defined(__sun__) || \
|
||
|
+ defined(__GENODE__) || \
|
||
|
(defined(__MINGW32__) && __has_include(<pthread.h>))
|
||
|
# define _LIBCPP_HAS_THREAD_API_PTHREAD
|
||
|
# elif defined(__Fuchsia__)
|
||
|
diff --git a/utils/google-benchmark/src/internal_macros.h b/utils/google-benchmark/src/internal_macros.h
|
||
|
index 5dbf4fd27521..4699c5ed9139 100644
|
||
|
--- a/utils/google-benchmark/src/internal_macros.h
|
||
|
+++ b/utils/google-benchmark/src/internal_macros.h
|
||
|
@@ -70,6 +70,8 @@
|
||
|
#define BENCHMARK_OS_FUCHSIA 1
|
||
|
#elif defined (__SVR4) && defined (__sun)
|
||
|
#define BENCHMARK_OS_SOLARIS 1
|
||
|
+#elif defined(__GENODE__)
|
||
|
+ #define BENCHMARK_OS_GENODE 1
|
||
|
#endif
|
||
|
|
||
|
#if defined(__ANDROID__) && defined(__GLIBCXX__)
|