h8300: O_DIRECT and O_DIRECTIRY swapping.

[uclinux-h8/uclibc-ng.git] / libubacktrace / backtrace.c

diff --git a/libubacktrace/backtrace.c b/libubacktrace/backtrace.c
index e5f5130..08a7010 100644 (file)
--- a/libubacktrace/backtrace.c
+++ b/libubacktrace/backtrace.c
@@ -2,7 +2,7 @@
  * Perform stack unwinding by using the _Unwind_Backtrace.
  *
  * User application that wants to use backtrace needs to be
- * compiled with -funwind-tables option and -rdynamic to get full
+ * compiled with -fasynchronous-unwind-tables option and -rdynamic to get full
  * symbols printed.
  *
  * Copyright (C) 2009, 2010 STMicroelectronics Ltd.
@@ -20,6 +20,7 @@
  *
  */
 
+#include <libgcc_s.h>
 #include <execinfo.h>
 #include <dlfcn.h>
 #include <stdlib.h>
@@ -33,20 +34,25 @@ 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 *);
 
 static void backtrace_init (void)
 {
-       void *handle = dlopen ("libgcc_s.so.1", RTLD_LAZY);
+       void *handle = dlopen (LIBGCC_S_SO, RTLD_LAZY);
 
        if (handle == NULL
                || ((unwind_backtrace = dlsym (handle, "_Unwind_Backtrace")) == NULL)
                || ((unwind_getip = dlsym (handle, "_Unwind_GetIP")) == NULL)) {
-               printf("libgcc_s.so.1 must be installed for backtrace to work\n");
+               printf(LIBGCC_S_SO " must be installed for backtrace to work\n");
                abort();
        }
 }
+#else
+# define unwind_backtrace _Unwind_Backtrace
+# define unwind_getip _Unwind_GetIP
+#endif
 
 static _Unwind_Reason_Code
 backtrace_helper (struct _Unwind_Context *ctx, void *a)
@@ -66,16 +72,15 @@ backtrace_helper (struct _Unwind_Context *ctx, void *a)
 /*
  * Perform stack unwinding by using the _Unwind_Backtrace.
  *
- * User application that wants to use backtrace needs to be
- * compiled with -fexceptions option and -rdynamic to get full
- * symbols printed.
  */
 int backtrace (void **array, int size)
 {
        struct trace_arg arg = { .array = array, .size = size, .cnt = -1 };
 
+#ifdef SHARED
        if (unwind_backtrace == NULL)
                backtrace_init();
+#endif
 
        if (size >= 1)
                unwind_backtrace (backtrace_helper, &arg);