From f61a113fe0f703c19af20f54d65acfbb203b726a Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 31 Jul 2014 14:00:33 -0700
Subject: Add __safe_fatal and use it in __pthread_unwind forwarder fallback.

---
 nptl/forward.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'nptl')

diff --git a/nptl/forward.c b/nptl/forward.c
index 6355c2396f..eb3c41f0a2 100644
--- a/nptl/forward.c
+++ b/nptl/forward.c
@@ -23,7 +23,7 @@
 
 #include <shlib-compat.h>
 #include <atomic.h>
-#include <sysdep.h>
+#include <safe-fatal.h>
 
 
 /* Pointers to the libc functions.  */
@@ -202,11 +202,8 @@ FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
 
 FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
 
-FORWARD_NORETURN(__pthread_unwind,
-	 void attribute_hidden __attribute ((noreturn)) __cleanup_fct_attribute
-	 attribute_compat_text_section,
-	 (__pthread_unwind_buf_t *buf), (buf), {
-		       /* We cannot call abort() here.  */
-		       INTERNAL_SYSCALL_DECL (err);
-		       INTERNAL_SYSCALL (kill, err, 1, SIGKILL);
-		     })
+FORWARD_NORETURN (__pthread_unwind,
+                  void attribute_hidden __attribute ((noreturn))
+                  __cleanup_fct_attribute attribute_compat_text_section,
+                  (__pthread_unwind_buf_t *buf), (buf),
+                  __safe_fatal ())
-- 
cgit 1.4.1