Ver código fonte

ubacktrace/uargp: remove unneeded and false linker scripts

Waldemar Brodkorb 7 anos atrás
pai
commit
15186b9977
2 arquivos alterados com 3 adições e 34 exclusões
  1. 0 28
      Rules.mak
  2. 3 6
      extra/Configs/Config.in

+ 0 - 28
Rules.mak

@@ -140,7 +140,6 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL
 
 
 LIBC := libc
 LIBC := libc
 SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
 SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
-UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
 
 
 UCLIBC_LDSO_NAME := ld-uClibc
 UCLIBC_LDSO_NAME := ld-uClibc
 ARCH_NATIVE_BIT := 32
 ARCH_NATIVE_BIT := 32
@@ -548,33 +547,6 @@ link.asneeded = $(if $(CC_FLAG_ASNEEDED),$(if $(CC_FLAG_NO_ASNEEDED),$(CC_FLAG_A
 # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it)
 # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it)
 ifndef ASNEEDED
 ifndef ASNEEDED
 export ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UCLIBC_LDSO) )" || echo "$(UCLIBC_LDSO)")
 export ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UCLIBC_LDSO) )" || echo "$(UCLIBC_LDSO)")
-
-# Only used in installed libc.so linker script
-ifeq ($(UCLIBC_HAS_BACKTRACE),y)
-ifeq ($(HARDWIRED_ABSPATH),y)
-UBACKTRACE_FULL_NAME := $(subst //,/,$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UBACKTRACE_DSO))
-else
-UBACKTRACE_FULL_NAME := $(UBACKTRACE_DSO)
-endif
-export UBACKTRACE_ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && \
-	echo "GROUP ( AS_NEEDED ( $(UBACKTRACE_FULL_NAME) ) )" || \
-	echo "GROUP ( $(UBACKTRACE_FULL_NAME) )")
-else
-export UBACKTRACE_ASNEEDED:=""
-endif
-ifeq ($(UCLIBC_HAS_ARGP),y)
-ifeq ($(HARDWIRED_ABSPATH),y)
-# Only used in installed libc.so linker script
-UARGP_FULL_NAME := $(subst //,/,$(RUNTIME_PREFIX)$(MULTILIB_DIR)/libuargp.so.$(MAJOR_VERSION))
-else
-UARGP_FULL_NAME := libuargp.so.$(MAJOR_VERSION)
-endif
-export UARGP_ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && \
-	echo "GROUP ( AS_NEEDED ( $(UARGP_FULL_NAME) ) )" || \
-	echo "GROUP ( $(UARGP_FULL_NAME) )")
-else
-export UARGP_ASNEEDED:=""
-endif
 endif
 endif
 
 
 # Add a bunch of extra pedantic annoyingly strict checks
 # Add a bunch of extra pedantic annoyingly strict checks

+ 3 - 6
extra/Configs/Config.in

@@ -1896,8 +1896,6 @@ config UCLIBC_HAS_ARGP
 	  `--help' and `--version' options.
 	  `--help' and `--version' options.
 	  A library can export an argp option parser, which programs can easily
 	  A library can export an argp option parser, which programs can easily
 	  use in conjunction with their own option parser.
 	  use in conjunction with their own option parser.
-	  A new shared object "libuargp" is created. The "libc.so" linker script
-	  contains the AS_NEEDED entry for getting the libuargp linked automatically.
 	  Argp support is needed by elfutils libdw.
 	  Argp support is needed by elfutils libdw.
 
 
 	  Most people can safely answer N.
 	  Most people can safely answer N.
@@ -2391,12 +2389,11 @@ config UCLIBC_HAS_BACKTRACE
 	bool "Add support for application self-debugging"
 	bool "Add support for application self-debugging"
 	depends on HAVE_SHARED
 	depends on HAVE_SHARED
 	help
 	help
-	  Answer Y here to compile support for application self-debugging, by adding
-	  a new shared object "libubacktrace.so" that provides the following new
-	  functions:
+	  Answer Y here to compile support for application self-debugging that
+	  provides the following new functions:
 	  backtrace, backtrace_symbols, backtrace_symbols_fd
 	  backtrace, backtrace_symbols, backtrace_symbols_fd
 
 
-	  The backtrace functionality is currently supported on SH platform, and it
+	  The backtrace functionality is currently supported on some platforms, and it
 	  based on dwarf2 informations to properly work, so any application that
 	  based on dwarf2 informations to properly work, so any application that
 	  want to use backtrace needs to be built with -fexceptions flag.
 	  want to use backtrace needs to be built with -fexceptions flag.