summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/libc_fatal.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux/libc_fatal.c')
-rw-r--r--sysdeps/unix/sysv/linux/libc_fatal.c32
1 files changed, 3 insertions, 29 deletions
diff --git a/sysdeps/unix/sysv/linux/libc_fatal.c b/sysdeps/unix/sysv/linux/libc_fatal.c
index c7fac6ab51..a79cfbabb9 100644
--- a/sysdeps/unix/sysv/linux/libc_fatal.c
+++ b/sysdeps/unix/sysv/linux/libc_fatal.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993-1995,1997,2000,2002-2005 Free Software Foundation, Inc.
+/* Copyright (C) 1993-1995,1997,2000,2002-2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -27,7 +27,6 @@
#include <sysdep.h>
#include <unistd.h>
#include <sys/syslog.h>
-#include <execinfo.h>
/* Abort with an error message. */
#include <not-cancel.h>
@@ -142,33 +141,8 @@ __libc_message (int do_abort, const char *fmt, ...)
va_end (ap_copy);
if (do_abort)
- {
- if (do_abort > 1 && written)
- {
- void *addrs[64];
-#define naddrs (sizeof (addrs) / sizeof (addrs[0]))
- int n = __backtrace (addrs, naddrs);
- if (n > 2)
- {
-#define strnsize(str) str, strlen (str)
-#define writestr(str) write_not_cancel (fd, str)
- writestr (strnsize ("======= Backtrace: =========\n"));
- __backtrace_symbols_fd (addrs + 1, n - 1, fd);
-
- writestr (strnsize ("======= Memory map: ========\n"));
- int fd2 = open_not_cancel_2 ("/proc/self/maps", O_RDONLY);
- char buf[1024];
- ssize_t n2;
- while ((n2 = read_not_cancel (fd2, buf, sizeof (buf))) > 0)
- if (write_not_cancel (fd, buf, n2) != n2)
- break;
- close_not_cancel_no_status (fd2);
- }
- }
-
- /* Terminate the process. */
- abort ();
- }
+ /* Terminate the process. */
+ abort ();
}