From 9cd6514517f8b385fda74dcdca2b9266c6f7eb14 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Dec 2015 08:10:51 +0100 Subject: remove __UCLIBC_HAVE_ASM_GLOBAL_DOT_NAME__ It's even no longer required for non-ported ppc64 architecture. Sync with GNU C library. This simplify the macros in include/libc-symbols.h. --- libpthread/linuxthreads.old_db/td_symbol_list.c | 12 +++--------- libpthread/linuxthreads_db/td_symbol_list.c | 12 +++--------- .../unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h | 6 +----- libpthread/nptl_db/td_symbol_list.c | 18 +----------------- 4 files changed, 8 insertions(+), 40 deletions(-) (limited to 'libpthread') diff --git a/libpthread/linuxthreads.old_db/td_symbol_list.c b/libpthread/linuxthreads.old_db/td_symbol_list.c index f62cd692c..fd29333d5 100644 --- a/libpthread/linuxthreads.old_db/td_symbol_list.c +++ b/libpthread/linuxthreads.old_db/td_symbol_list.c @@ -20,12 +20,6 @@ #include #include "thread_dbP.h" -#ifdef HAVE_ASM_GLOBAL_DOT_NAME -# define DOT "." /* PPC64 requires . prefix on code symbols. */ -#else -# define DOT /* No prefix. */ -#endif - static const char *symbol_list_arr[] = { [PTHREAD_THREADS_EVENTS] = "__pthread_threads_events", @@ -36,9 +30,9 @@ static const char *symbol_list_arr[] = [LINUXTHREADS_PTHREAD_THREADS_MAX] = "__linuxthreads_pthread_threads_max", [LINUXTHREADS_PTHREAD_KEYS_MAX] = "__linuxthreads_pthread_keys_max", [LINUXTHREADS_PTHREAD_SIZEOF_DESCR] = "__linuxthreads_pthread_sizeof_descr", - [LINUXTHREADS_CREATE_EVENT] = DOT "__linuxthreads_create_event", - [LINUXTHREADS_DEATH_EVENT] = DOT "__linuxthreads_death_event", - [LINUXTHREADS_REAP_EVENT] = DOT "__linuxthreads_reap_event", + [LINUXTHREADS_CREATE_EVENT] = "__linuxthreads_create_event", + [LINUXTHREADS_DEATH_EVENT] = "__linuxthreads_death_event", + [LINUXTHREADS_REAP_EVENT] = "__linuxthreads_reap_event", [LINUXTHREADS_INITIAL_REPORT_EVENTS] = "__linuxthreads_initial_report_events", [LINUXTHREADS_VERSION] = "__linuxthreads_version", [NUM_MESSAGES] = NULL diff --git a/libpthread/linuxthreads_db/td_symbol_list.c b/libpthread/linuxthreads_db/td_symbol_list.c index f62cd692c..fd29333d5 100644 --- a/libpthread/linuxthreads_db/td_symbol_list.c +++ b/libpthread/linuxthreads_db/td_symbol_list.c @@ -20,12 +20,6 @@ #include #include "thread_dbP.h" -#ifdef HAVE_ASM_GLOBAL_DOT_NAME -# define DOT "." /* PPC64 requires . prefix on code symbols. */ -#else -# define DOT /* No prefix. */ -#endif - static const char *symbol_list_arr[] = { [PTHREAD_THREADS_EVENTS] = "__pthread_threads_events", @@ -36,9 +30,9 @@ static const char *symbol_list_arr[] = [LINUXTHREADS_PTHREAD_THREADS_MAX] = "__linuxthreads_pthread_threads_max", [LINUXTHREADS_PTHREAD_KEYS_MAX] = "__linuxthreads_pthread_keys_max", [LINUXTHREADS_PTHREAD_SIZEOF_DESCR] = "__linuxthreads_pthread_sizeof_descr", - [LINUXTHREADS_CREATE_EVENT] = DOT "__linuxthreads_create_event", - [LINUXTHREADS_DEATH_EVENT] = DOT "__linuxthreads_death_event", - [LINUXTHREADS_REAP_EVENT] = DOT "__linuxthreads_reap_event", + [LINUXTHREADS_CREATE_EVENT] = "__linuxthreads_create_event", + [LINUXTHREADS_DEATH_EVENT] = "__linuxthreads_death_event", + [LINUXTHREADS_REAP_EVENT] = "__linuxthreads_reap_event", [LINUXTHREADS_INITIAL_REPORT_EVENTS] = "__linuxthreads_initial_report_events", [LINUXTHREADS_VERSION] = "__linuxthreads_version", [NUM_MESSAGES] = NULL diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h index e2b1539fd..534281acc 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h @@ -25,11 +25,7 @@ #if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt -# ifdef HAVE_ASM_GLOBAL_DOT_NAME -# define DASHDASHPFX(str) .__##str -# else -# define DASHDASHPFX(str) __##str -# endif +# define DASHDASHPFX(str) __##str # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ diff --git a/libpthread/nptl_db/td_symbol_list.c b/libpthread/nptl_db/td_symbol_list.c index dcf7e5c73..fc5ee7cc5 100644 --- a/libpthread/nptl_db/td_symbol_list.c +++ b/libpthread/nptl_db/td_symbol_list.c @@ -23,13 +23,6 @@ #endif #include "thread_dbP.h" - -#ifdef HAVE_ASM_GLOBAL_DOT_NAME -# define DOT "." /* PPC64 requires . prefix on code symbols. */ -#else -# define DOT /* No prefix. */ -#endif - static const char *symbol_list_arr[] = { # define DB_STRUCT(type) \ @@ -39,7 +32,7 @@ static const char *symbol_list_arr[] = # define DB_SYMBOL(name) \ [SYM_##name] = #name, # define DB_FUNCTION(name) \ - [SYM_##name] = DOT #name, + [SYM_##name] = #name, # define DB_VARIABLE(name) \ [SYM_##name] = #name, \ [SYM_DESC_##name] = "_thread_db_" #name, @@ -73,14 +66,5 @@ td_lookup (struct ps_prochandle *ps, int idx, psaddr_t *sym_addr) assert (idx >= 0 && idx < SYM_NUM_MESSAGES); result = ps_pglobal_lookup (ps, LIBPTHREAD_SO, symbol_list_arr[idx], sym_addr); - -#ifdef HAVE_ASM_GLOBAL_DOT_NAME - /* For PowerPC, 64-bit uses dot symbols but 32-bit does not. - We could be a 64-bit libthread_db debugging a 32-bit libpthread. */ - if (result == PS_NOSYM && symbol_list_arr[idx][0] == '.') - result = ps_pglobal_lookup (ps, LIBPTHREAD_SO, &symbol_list_arr[idx][1], - sym_addr); -#endif - return result; } -- cgit v1.2.3