From: juho Date: Thu, 11 Apr 2013 09:35:48 +0000 (+0900) Subject: remove bfd library X-Git-Tag: submit/tizen_2.1/20130424.233307~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e69fda9309353c278faf04e9d73e3c86bdeda95b;p=platform%2Fcore%2Fsystem%2Fsys-assert.git remove bfd library bfd have license problem. so removed. Change-Id: I2a9ae8ae4ddd823bb102c951aab3307d515b3859 --- diff --git a/packaging/sys-assert.spec b/packaging/sys-assert.spec index 450eeda..e4b8794 100644 --- a/packaging/sys-assert.spec +++ b/packaging/sys-assert.spec @@ -8,7 +8,6 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: pkgconfig(glib-2.0) BuildRequires: cmake -BuildRequires: binutils-devel Requires(post): coreutils %description diff --git a/sys-assert/CMakeLists.txt b/sys-assert/CMakeLists.txt index 6a894a7..bbd2c90 100644 --- a/sys-assert/CMakeLists.txt +++ b/sys-assert/CMakeLists.txt @@ -35,7 +35,7 @@ ADD_DEFINITIONS("-DEAPI") ADD_DEFINITIONS("-DDEBUG_ON") ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -ldl -lbfd) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -ldl) INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/.coredump DESTINATION /opt/etc) diff --git a/sys-assert/src/sys-assert.c b/sys-assert/src/sys-assert.c index d209fc8..7a92d58 100755 --- a/sys-assert/src/sys-assert.c +++ b/sys-assert/src/sys-assert.c @@ -39,16 +39,6 @@ /* for PR_SET_DUMPABLE */ #include #include "sys-assert.h" -/* for demangle */ -/* Fix for the issue: http://sourceware.org/bugzilla/show_bug.cgi?id=14243 - */ -#define PACKAGE_VERSION "0.3.3" -#define PACKAGE "sys-assert" -#include -#include -#define DMGL_PARAMS (1 << 0) -#define DMGL_ANSI (1 << 1) -#define DMGL_VERBOSE (1 << 3) #define CMDLINE_PATH "/proc/self/cmdline" #define EXE_PATH "/proc/self/exe" @@ -176,7 +166,6 @@ static long *get_start_addr(long *value, struct addr_node *start) return NULL; } } -extern char *bfd_demangle (bfd *, const char *, int); /* get function symbol from elf */ static int trace_symbols(void *const *array, int size, struct addr_node *start, int fd_cs) @@ -195,7 +184,6 @@ trace_symbols(void *const *array, int size, struct addr_node *start, int fd_cs) int num_st = 0; int fd; int ret; - char *demangled_sname = NULL; char filename[NAME_MAX]; for (cnt = 0; cnt < size; cnt++) { @@ -345,28 +333,21 @@ trace_symbols(void *const *array, int size, struct addr_node *start, int fd_cs) close(fd); } if (info_funcs.dli_sname != NULL) { - demangled_sname = bfd_demangle(NULL, - info_funcs.dli_sname, - DMGL_PARAMS | DMGL_ANSI | DMGL_VERBOSE); if (array[cnt] >= info_funcs.dli_saddr) { fprintf_fd(fd_cs, "%2d: %s + 0x%x (%p) [%s] + %p\n", - cnt, - demangled_sname ? demangled_sname : info_funcs.dli_sname, + cnt, info_funcs.dli_sname, (array[cnt] - info_funcs.dli_saddr), array[cnt], info_funcs.dli_fname, offset_addr); } else { fprintf_fd(fd_cs, "%2d: %s - 0x%x (%p) [%s] + %p\n", - cnt, - demangled_sname ? demangled_sname : info_funcs.dli_sname, + cnt, info_funcs.dli_sname, (info_funcs.dli_saddr - array[cnt]), array[cnt], info_funcs.dli_fname, offset_addr); } - if (demangled_sname) - free(demangled_sname); } else { fprintf_fd(fd_cs, "%2d: (%p) [%s] + %p\n",