[Bug libstdc++/69581] [6 Regression] r232586 broke arm-cross-compiler bootstrap

[bernd.edlinger at hotmail dot de]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69581

--- Comment #4 from Bernd Edlinger <bernd.edlinger at hotmail dot de> ---
this fixes it for me:

Index: libstdc++-v3/include/c_compatibility/math.h
===================================================================
--- libstdc++-v3/include/c_compatibility/math.h (revision 233023)
+++ libstdc++-v3/include/c_compatibility/math.h (working copy)
@@ -27,12 +27,12 @@
  */


+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+# include_next <math.h>
+#else
 #ifndef _GLIBCXX_MATH_H
 #define _GLIBCXX_MATH_H 1

-#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-# include_next <math.h>
-#else
 # include <cmath>

 using std::abs;
Index: libstdc++-v3/include/c_compatibility/stdlib.h
===================================================================
--- libstdc++-v3/include/c_compatibility/stdlib.h       (revision 233023)
+++ libstdc++-v3/include/c_compatibility/stdlib.h       (working copy)
@@ -26,12 +26,12 @@
  *  This is a Standard C++ Library header.
  */

+#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+# include_next <stdlib.h>
+#else
 #ifndef _GLIBCXX_STDLIB_H
 #define _GLIBCXX_STDLIB_H 1

-#if !defined __cplusplus || defined _GLIBCXX_INCLUDE_NEXT_C_HEADERS
-# include_next <stdlib.h>
-#else
 # include <cstdlib>

 using std::abort;