diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-11-10 21:11:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-11-10 21:11:03 +0000 |
| commit | 79e14650e0a19b183163dea83e32a6a39b754d0f (patch) | |
| tree | b31ae92bf4c56f76968d28c1e4c1e3a27141747e /package/libs/toolchain | |
| parent | 1fb3259541d502d45aa435b47d438d4802fe654d (diff) | |
| download | upstream-79e14650e0a19b183163dea83e32a6a39b754d0f.tar.gz upstream-79e14650e0a19b183163dea83e32a6a39b754d0f.tar.bz2 upstream-79e14650e0a19b183163dea83e32a6a39b754d0f.zip | |
toolchain: remove obsolete relinking code
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47445
Diffstat (limited to 'package/libs/toolchain')
| -rw-r--r-- | package/libs/toolchain/Makefile | 65 |
1 files changed, 4 insertions, 61 deletions
diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile index 0153d99989..734e68dc70 100644 --- a/package/libs/toolchain/Makefile +++ b/package/libs/toolchain/Makefile @@ -318,73 +318,19 @@ endef LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a)) LIBGCC_MAP=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map)) LIBGCC_SO=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*)) -ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) - ifneq ($(if $(CONFIG_USE_UCLIBC),$(CONFIG_GCC_VERSION_LINARO)),) - BUILD_LIBGCC:=$(if $(CONFIG_m68k)$(CONFIG_powerpc),,$(PKG_BUILD_DIR)/libgcc_s.so.*) - endif -endif -ifneq ($(BUILD_LIBGCC),) - define Build/Compile/uClibc - $(SCRIPT_DIR)/relink-lib.sh \ - "$(TARGET_CROSS)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libc_so.a)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libc_so.a)" \ - "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libuClibc-*.so))" \ - -Wl,-init,__uClibc_init -Wl,-soname=libc.so.0 \ - $(BUILD_LIBGCC) - $(SCRIPT_DIR)/relink-lib.sh \ - "$(TARGET_CROSS)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt-*.so)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt_pic.a)" \ - "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt-*.so))" \ - $(BUILD_LIBGCC) \ - -Wl,-soname=libcrypt.so.0 - $(SCRIPT_DIR)/relink-lib.sh \ - "$(TARGET_CROSS)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libatomic.so)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libatomic.a)" \ - "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libatomic*.so))" \ - $(BUILD_LIBGCC) \ - -Wl,-soname=libatomic.so.0 - $(SCRIPT_DIR)/relink-lib.sh \ - "$(TARGET_CROSS)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libm-*.so)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libm_pic.a)" \ - "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libm-*.so))" \ - $(BUILD_LIBGCC) \ - -Wl,-soname=libm.so.0 - $(SCRIPT_DIR)/relink-lib.sh \ - "$(TARGET_CROSS)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread-*.so)" \ - "$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread_so.a)" \ - "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread-*.so))" \ - -Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal \ - -ldl -lc $(BUILD_LIBGCC) \ - -Wl,-soname=libpthread.so.0 - endef - define Build/Compile/libgcc - $(SCRIPT_DIR)/relink-lib.sh \ - "$(TARGET_CROSS)" \ - "$(LIBGCC_SO)" \ - "$(LIBGCC_A)" \ - "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(LIBGCC_SO))" \ - -Wl,--version-script=$(LIBGCC_MAP) -Wl,-soname=libgcc_s.so.1 - endef -else - define Build/Compile/uClibc +define Build/Compile/uClibc $(CP) \ $(TOOLCHAIN_DIR)/lib/libuClibc-*.so \ $(TOOLCHAIN_DIR)/lib/libcrypt-*.so \ $(TOOLCHAIN_DIR)/lib/libm-*.so \ $(TOOLCHAIN_DIR)/lib/libpthread-*.so \ $(PKG_BUILD_DIR)/ - endef - ifneq ($(LIBGCC_SO),) +endef +ifneq ($(LIBGCC_SO),) define Build/Compile/libgcc $(CP) $(LIBGCC_SO) $(PKG_BUILD_DIR)/ endef - endif endif define Build/Compile/Default @@ -497,10 +443,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) ifneq ($(CONFIG_USE_MUSL),y) $(CP) \ $(TOOLCHAIN_DIR)/lib/libpthread.so.* \ - $(if $(BUILD_LIBGCC),\ - $(PKG_BUILD_DIR)/libpthread-$(LIBC_SO_VERSION).so, \ - $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \ - ) \ + $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \ $(1)/lib/ endif endef |