diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-11-30 14:53:29 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-11-30 14:54:41 +0100 |
| commit | 488fb43a499982e99915c78bb70f04357ac37463 (patch) | |
| tree | e356d0f1d327ed3de4a9d5abec1edf346070aa32 /sysdeps/generic | |
| parent | eab709096f23a4511adfc547450a83008eae5fb2 (diff) | |
| parent | 20af204581e1ba42738c1bfb69cc2f5350f4ffa4 (diff) | |
| download | glibc-488fb43a499982e99915c78bb70f04357ac37463.tar.gz glibc-488fb43a499982e99915c78bb70f04357ac37463.tar.xz glibc-488fb43a499982e99915c78bb70f04357ac37463.zip | |
Merge branch 'release/2.11/master' into fedora/2.11/master
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/framestate.c | 3 | ||||
| -rw-r--r-- | sysdeps/generic/libgcc_s.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sysdeps/generic/framestate.c b/sysdeps/generic/framestate.c index a912a8c375..80375bba98 100644 --- a/sysdeps/generic/framestate.c +++ b/sysdeps/generic/framestate.c @@ -24,6 +24,7 @@ #define __frame_state_for fallback_frame_state_for #include <unwind-dw2.c> #undef __frame_state_for +#include <libgcc_s.h> typedef struct frame_state * (*framesf)(void *pc, struct frame_state *); struct frame_state *__frame_state_for (void *pc, @@ -36,7 +37,7 @@ __frame_state_for (void *pc, struct frame_state *frame_state) if (frame_state_for == NULL) { - void *handle = __libc_dlopen ("libgcc_s.so.1"); + void *handle = __libc_dlopen (LIBGCC_S_SO); if (handle == NULL || (frame_state_for diff --git a/sysdeps/generic/libgcc_s.h b/sysdeps/generic/libgcc_s.h new file mode 100644 index 0000000000..e74a1034ca --- /dev/null +++ b/sysdeps/generic/libgcc_s.h @@ -0,0 +1,2 @@ +/* Name of libgcc_s library provided by gcc. */ +#define LIBGCC_S_SO "libgcc_s.so.1" |