diff options
| author | Roland McGrath <roland@gnu.org> | 2004-06-11 20:12:55 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-06-11 20:12:55 +0000 |
| commit | a9e526e7d2fc77ee4b77de7e35a6d6a41c450fb2 (patch) | |
| tree | 6dc248ed8af0c5df7ce65e837a95c687717d123c /sysdeps/s390 | |
| parent | f1847a84656ed3f8432d1c6d7c804e07b7caa84b (diff) | |
* sysdeps/s390/s390-32/backtrace.c (init): Guard with #ifdef SHARED.
(unwind_backtrace, unwind_getip): Define #ifndef SHARED.
(__backtrace): Don't call init #ifndef SHARED.
* sysdeps/s390/s390-64/backtrace.c (init): Guard with #ifdef SHARED.
(unwind_backtrace, unwind_getip): Define #ifndef SHARED.
(__backtrace): Don't call init #ifndef SHARED.
* sysdeps/ia64/backtrace.c (init): Guard with #ifdef SHARED.
(unwind_backtrace, unwind_getip): Define #ifndef SHARED.
(__backtrace): Don't call init #ifndef SHARED.
Diffstat (limited to 'sysdeps/s390')
| -rw-r--r-- | sysdeps/s390/s390-32/backtrace.c | 9 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/backtrace.c | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/sysdeps/s390/s390-32/backtrace.c b/sysdeps/s390/s390-32/backtrace.c index c52750cecf..7a632572b5 100644 --- a/sysdeps/s390/s390-32/backtrace.c +++ b/sysdeps/s390/s390-32/backtrace.c @@ -1,5 +1,5 @@ /* Return backtrace of current program state. - Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -61,6 +61,7 @@ struct trace_arg int cnt, size; }; +#ifdef SHARED static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *); @@ -77,6 +78,10 @@ init (void) if (unwind_getip == NULL) unwind_backtrace = NULL; } +#else +# define unwind_backtrace _Unwind_Backtrace +# define unwind_getip _Unwind_GetIP +#endif static int __backchain_backtrace (void **array, int size) @@ -122,9 +127,11 @@ int __backtrace (void **array, int size) { struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; +#ifdef SHARED __libc_once_define (static, once); __libc_once (once, init); +#endif if (unwind_backtrace == NULL) return __backchain_backtrace (array, size); diff --git a/sysdeps/s390/s390-64/backtrace.c b/sysdeps/s390/s390-64/backtrace.c index 8efdc6c0ac..05321349ca 100644 --- a/sysdeps/s390/s390-64/backtrace.c +++ b/sysdeps/s390/s390-64/backtrace.c @@ -1,5 +1,5 @@ /* Return backtrace of current program state. 64 bit S/390 version. - Copyright (C) 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -60,6 +60,7 @@ struct trace_arg int cnt, size; }; +#ifdef SHARED static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *); @@ -76,6 +77,10 @@ init (void) if (unwind_getip == NULL) unwind_backtrace = NULL; } +#else +# define unwind_backtrace _Unwind_Backtrace +# define unwind_getip _Unwind_GetIP +#endif int __backchain_backtrace (void **array, int size) @@ -121,9 +126,11 @@ int __backtrace (void **array, int size) { struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; +#ifdef SHARED __libc_once_define (static, once); __libc_once (once, init); +#endif if (unwind_backtrace == NULL) return __backchain_backtrace (array, size); |