aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/backtrace.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d96be03d8..42f871e4fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-16 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/x86_64/backtrace.c: Include <gnu/lib-names.h>.
+ (init): Use LIBGCC_S_SO not hardcoded "libgcc_s.so.1".
+
2018-01-16 Florian Weimer <fweimer@redhat.com>
* nptl/Makefile [$(have-cxx-thread_local)] (tests-unsupported):
diff --git a/sysdeps/x86_64/backtrace.c b/sysdeps/x86_64/backtrace.c
index 2706b50a05..d423cc053a 100644
--- a/sysdeps/x86_64/backtrace.c
+++ b/sysdeps/x86_64/backtrace.c
@@ -20,6 +20,7 @@
#include <libc-lock.h>
#include <dlfcn.h>
#include <execinfo.h>
+#include <gnu/lib-names.h>
#include <stdlib.h>
#include <unwind.h>
@@ -49,7 +50,7 @@ dummy_getcfa (struct _Unwind_Context *ctx __attribute__ ((unused)))
static void
init (void)
{
- libgcc_handle = __libc_dlopen ("libgcc_s.so.1");
+ libgcc_handle = __libc_dlopen (LIBGCC_S_SO);
if (libgcc_handle == NULL)
return;