90 lines
3.5 KiB
Diff
90 lines
3.5 KiB
Diff
|
From 15186b99774df74cf8ab02acd1a3f0ffd4c54ca1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||
|
|
Date: Fri, 30 Sep 2016 04:49:58 +0200
|
||
|
|
Subject: [PATCH] ubacktrace/uargp: remove unneeded and false linker scripts
|
||
|
|
|
||
|
|
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||
|
|
---
|
||
|
|
Rules.mak | 28 ----------------------------
|
||
|
|
extra/Configs/Config.in | 9 +++------
|
||
|
|
2 files changed, 3 insertions(+), 34 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Rules.mak b/Rules.mak
|
||
|
|
index 15dfa37..67189ff 100644
|
||
|
|
--- a/Rules.mak
|
||
|
|
+++ b/Rules.mak
|
||
|
|
@@ -140,7 +140,6 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL
|
||
|
|
|
||
|
|
LIBC := libc
|
||
|
|
SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
|
||
|
|
-UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
|
||
|
|
|
||
|
|
UCLIBC_LDSO_NAME := ld-uClibc
|
||
|
|
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)
|
||
|
|
ifndef ASNEEDED
|
||
|
|
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
|
||
|
|
|
||
|
|
# Add a bunch of extra pedantic annoyingly strict checks
|
||
|
|
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
|
||
|
|
index fc6669b..c5e54e1 100644
|
||
|
|
--- a/extra/Configs/Config.in
|
||
|
|
+++ b/extra/Configs/Config.in
|
||
|
|
@@ -1896,8 +1896,6 @@ config UCLIBC_HAS_ARGP
|
||
|
|
`--help' and `--version' options.
|
||
|
|
A library can export an argp option parser, which programs can easily
|
||
|
|
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.
|
||
|
|
|
||
|
|
Most people can safely answer N.
|
||
|
|
@@ -2391,12 +2389,11 @@ config UCLIBC_HAS_BACKTRACE
|
||
|
|
bool "Add support for application self-debugging"
|
||
|
|
depends on HAVE_SHARED
|
||
|
|
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
|
||
|
|
|
||
|
|
- 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
|
||
|
|
want to use backtrace needs to be built with -fexceptions flag.
|
||
|
|
|
||
|
|
--
|
||
|
|
2.1.4
|
||
|
|
|