hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

toolchain: remove obsolete relinking code 

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47445
owl
Felix Fietkau 2015-11-10 21:11:03 +00:00
parent 1fb3259541
commit 79e14650e0
1 changed files with 4 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
package/libs/toolchain/Makefile
View File

@ -318,60 +318,7 @@ endef
LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a)) LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a))
LIBGCC_MAP=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map)) LIBGCC_MAP=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map))
LIBGCC_SO=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*)) 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) \ $(CP) \
$(TOOLCHAIN_DIR)/lib/libuClibc-*.so \ $(TOOLCHAIN_DIR)/lib/libuClibc-*.so \
@ -385,7 +332,6 @@ else
$(CP) $(LIBGCC_SO) $(PKG_BUILD_DIR)/ $(CP) $(LIBGCC_SO) $(PKG_BUILD_DIR)/
endef endef
endif endif
endif
define Build/Compile/Default define Build/Compile/Default
$(call Build/Compile/libgcc) $(call Build/Compile/libgcc)
@ -497,10 +443,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
ifneq ($(CONFIG_USE_MUSL),y) ifneq ($(CONFIG_USE_MUSL),y)
$(CP) \ $(CP) \
$(TOOLCHAIN_DIR)/lib/libpthread.so.* \ $(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/ $(1)/lib/
endif endif
endef endef