diff mbox series

[committed] libstdc++: Fix <bit> to work freestanding [PR 100060]

Message ID YHXMyWnHeDgIV+VJ@redhat.com
State New
Headers show
Series [committed] libstdc++: Fix <bit> to work freestanding [PR 100060] | expand

Commit Message

Jonathan Wakely April 13, 2021, 4:54 p.m. UTC
libstdc++-v3/ChangeLog:

	PR libstdc++/100060
	* include/std/bit: Only include <ext/numeric_traits.h> for
	hosted build, use <limits> otherwise.

Tested powerpc64le-linux. Committed to trunk.

This needs to be backported to gcc-10 too.
commit 474cb5a0a404c5de7c1cd21aac8b1b7e7ce95d9b
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Apr 13 16:55:37 2021

    libstdc++: Fix <bit> to work freestanding [PR 100060]
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/100060
            * include/std/bit: Only include <ext/numeric_traits.h> for
            hosted build, use <limits> otherwise.
diff mbox series

Patch

diff --git a/libstdc++-v3/include/std/bit b/libstdc++-v3/include/std/bit
index fb78578448c..c5aae8bab03 100644
--- a/libstdc++-v3/include/std/bit
+++ b/libstdc++-v3/include/std/bit
@@ -34,7 +34,23 @@ 
 #if __cplusplus >= 201402L
 
 #include <type_traits>
-#include <ext/numeric_traits.h>
+
+#if _GLIBCXX_HOSTED
+# include <ext/numeric_traits.h>
+#else
+# include <limits>
+/// @cond undocumented
+namespace __gnu_cxx
+{
+  template<typename _Tp>
+    struct __int_traits
+    {
+      static constexpr int __digits = std::numeric_limits<_Tp>::digits;
+      static constexpr _Tp __max = std::numeric_limits<_Tp>::max();
+    };
+}
+/// @endcond
+#endif
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {