libc/arm: use __builtin_trap() instead of abort() in aeabi_unwind stubsstable/15

This avoids a dependency on the abort symbol in libsys.

PR:		292539
Reviewed by:	mmel
Approved by:	markj (mentor)
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D55255

(cherry picked from commit 1782bc9a0a8da2d6aca31b7790981e1980c9e4b9)

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
index efcace2c0675..3667b7d7e673 100644
--- a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
+++ b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c
@@ -27,15 +27,15 @@
  *
  */
 
+#include <sys/param.h>
+
 /*
  * Provide an implementation of __aeabi_unwind_cpp_pr{0,1,2}. These are
  * required by libc but are implemented in libgcc_eh.a which we don't link
- * against. The libgcc_eh.a version will be called so we call abort to
+ * against. The libgcc_eh.a version will be called so we trap to
  * check this.
  */
 
-#include <stdlib.h>
-
 void __aeabi_unwind_cpp_pr0(void) __hidden;
 void __aeabi_unwind_cpp_pr1(void) __hidden;
 void __aeabi_unwind_cpp_pr2(void) __hidden;
@@ -43,18 +43,18 @@ void __aeabi_unwind_cpp_pr2(void) __hidden;
 void
 __aeabi_unwind_cpp_pr0(void)
 {
-	abort();
+	__builtin_trap();
 }
 
 void
 __aeabi_unwind_cpp_pr1(void)
 {
-	abort();
+	__builtin_trap();
 }
 
 void
 __aeabi_unwind_cpp_pr2(void)
 {
-	abort();
+	__builtin_trap();
 }