v1.2 patch

Signed-off-by: Rian Quinn <“[email protected]”>
Bareflank · Apr 28, 2017 · 86cccb4 · 86cccb4
1 parent af3664f
commit 86cccb4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
@@ -43,9 +43,15 @@ if (LIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG)
   endif ()
 endif ()
 
-if(NOT WIN32 OR MINGW)
-  include(CheckLibcxxAtomic)
-endif()
+# ------------------------------------------------------------------------------
+# bareflank: start
+# ------------------------------------------------------------------------------
+# if(NOT WIN32 OR MINGW)
+#   include(CheckLibcxxAtomic)
+# endif()
+# ------------------------------------------------------------------------------
+# bareflank: end
+# ------------------------------------------------------------------------------
 
 # Check compiler flags
 

diff --git a/include/__bsd_locale_fallbacks.h b/include/__bsd_locale_fallbacks.h
@@ -14,6 +14,7 @@
 #ifndef _LIBCPP_BSD_LOCALE_FALLBACKS_DEFAULTS_H
 #define _LIBCPP_BSD_LOCALE_FALLBACKS_DEFAULTS_H
 
+#include <cstdio>
 #include <stdlib.h>
 #include <memory>
 

diff --git a/include/__locale b/include/__locale
@@ -394,7 +394,13 @@ public:
     // Same type as Newlib's _ctype_ array in newlib/libc/include/ctype.h.
     typedef char mask;
     static const mask space  = _S;
-    static const mask print  = _P | _U | _L | _N | _B;
+// -----------------------------------------------------------------------------
+// bareflank: start
+// -----------------------------------------------------------------------------
+    static const mask print  = static_cast<char>(_P | _U | _L | _N | _B);
+// -----------------------------------------------------------------------------
+// bareflank: end
+// -----------------------------------------------------------------------------
     static const mask cntrl  = _C;
     static const mask upper  = _U;
     static const mask lower  = _L;

diff --git a/include/support/newlib/xlocale.h b/include/support/newlib/xlocale.h
@@ -16,7 +16,13 @@
 #include <clocale>
 #include <cwctype>
 #include <ctype.h>
-#include <support/xlocale/__nop_locale_mgmt.h>
+// -----------------------------------------------------------------------------
+// bareflank: start
+// -----------------------------------------------------------------------------
+// #include <support/xlocale/__nop_locale_mgmt.h>
+// -----------------------------------------------------------------------------
+// bareflank: end
+// -----------------------------------------------------------------------------
 #include <support/xlocale/__posix_l_fallback.h>
 #include <support/xlocale/__strtonum_fallback.h>
 

diff --git a/src/thread.cpp b/src/thread.cpp
@@ -99,11 +99,17 @@ thread::hardware_concurrency() _NOEXCEPT
 #else  // defined(CTL_HW) && defined(HW_NCPU)
     // TODO: grovel through /proc or check cpuid on x86 and similar
     // instructions on other architectures.
-#   if defined(_MSC_VER) && ! defined(__clang__)
-        _LIBCPP_WARNING("hardware_concurrency not yet implemented")
-#   else
-#       warning hardware_concurrency not yet implemented
-#   endif
+// -----------------------------------------------------------------------------
+// bareflank: start
+// -----------------------------------------------------------------------------
+// #   if defined(_LIBCPP_MSVC)
+//         _LIBCPP_WARNING("hardware_concurrency not yet implemented")
+// #   else
+// #       warning hardware_concurrency not yet implemented
+// #   endif
+// -----------------------------------------------------------------------------
+// bareflank: end
+// -----------------------------------------------------------------------------
     return 0;  // Means not computable [thread.thread.static]
 #endif  // defined(CTL_HW) && defined(HW_NCPU)
 }