diff mbox series

[committed] libstdc++: Define <bits/functexcept.h> functions for freestanding [PR107135]

Message ID 20221004141138.530214-1-jwakely@redhat.com
State New, archived
Headers
Series [committed] libstdc++: Define <bits/functexcept.h> functions for freestanding [PR107135] |

Commit Message

Jonathan Wakely Oct. 4, 2022, 2:11 p.m. UTC 
  Tested powerpc64le-linux, and x86_64-linux with -ffreestanding.
Pushed to trunk.

-- >8 --

We don't compile src/c++11/functexcept.cc for freestanding, so just
define the functions used by freestanding entities as inline calls to
std::terminate.

libstdc++-v3/ChangeLog:

	PR libstdc++/107135
	* include/bits/functexcept.h [!_GLIBCXX_HOSTED]
	(__throw_invalid_argument, __throw_out_of_range)
	(__throw_out_of_range_fmt, __throw_runtime_error)
	(__throw_overflow_error): Define inline.
	* include/std/bitset (_M_copy_from_ptr) [!_GLIBCXX_HOSTED]:
	Replace __builtin_abort with __throw_invalid_argument.
---
 libstdc++-v3/include/bits/functexcept.h | 25 +++++++++++++++++++++++++
 libstdc++-v3/include/std/bitset         |  8 +-------
 2 files changed, 26 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/libstdc++-v3/include/bits/functexcept.h b/libstdc++-v3/include/bits/functexcept.h
index a78a17b2e04..7fad4b13316 100644
--- a/libstdc++-v3/include/bits/functexcept.h
+++ b/libstdc++-v3/include/bits/functexcept.h
@@ -43,6 +43,7 @@  namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
+#if _GLIBCXX_HOSTED
   // Helper for exception objects in <except>
   void
   __throw_bad_exception(void) __attribute__((__noreturn__));
@@ -112,6 +113,30 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
   void
   __throw_bad_function_call() __attribute__((__noreturn__));
 
+#else // ! HOSTED
+
+  __attribute__((__noreturn__)) inline void
+  __throw_invalid_argument(const char*)
+  { std::__terminate(); }
+
+  __attribute__((__noreturn__)) inline void
+  __throw_out_of_range(const char*)
+  { std::__terminate(); }
+
+  __attribute__((__noreturn__)) inline void
+  __throw_out_of_range_fmt(const char*, ...)
+  { std::__terminate(); }
+
+  __attribute__((__noreturn__)) inline void
+  __throw_runtime_error(const char*)
+  { std::__terminate(); }
+
+  __attribute__((__noreturn__)) inline void
+  __throw_overflow_error(const char*)
+  { std::__terminate(); }
+
+#endif // HOSTED
+
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace
 
diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset
index afabeb4ba01..1f3f68fefce 100644
--- a/libstdc++-v3/include/std/bitset
+++ b/libstdc++-v3/include/std/bitset
@@ -1514,13 +1514,7 @@  _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 	    else if (_Traits::eq(__c, __one))
 	      _Unchecked_set(__i - 1);
 	    else
-	      {
-#if _GLIBCXX_HOSTED
-		__throw_invalid_argument(__N("bitset::_M_copy_from_ptr"));
-#else
-		__builtin_abort();
-#endif
-	      }
+	      __throw_invalid_argument(__N("bitset::_M_copy_from_ptr"));
 	  }
       }