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

base-files: do not build or use libgcc on m68k and avr32 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25852 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2011-03-03 14:50:00 +00:00
parent 5f776e9507
commit 2c828301c2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/base-files/Makefile
View File

@ -329,6 +329,7 @@ endef
LIBGCC_A=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a) LIBGCC_A=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a)
LIBGCC_MAP=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map) LIBGCC_MAP=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map)
BUILD_LIBGCC:=$(if $(CONFIG_avr32)$(CONFIG_m68k),,$(PKG_BUILD_DIR)/libgcc_s.so.*)
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
define Build/Compile/uClibc define Build/Compile/uClibc
@ -338,20 +339,20 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
"$(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))" \ "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libuClibc-*.so))" \
-Wl,-init,__uClibc_init -Wl,-soname=libc.so.0 \ -Wl,-init,__uClibc_init -Wl,-soname=libc.so.0 \
$(PKG_BUILD_DIR)/libgcc_s.so.* $(BUILD_LIBGCC)
$(SCRIPT_DIR)/relink-lib.sh \ $(SCRIPT_DIR)/relink-lib.sh \
"$(TARGET_CROSS)" \ "$(TARGET_CROSS)" \
"$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt-*.so)" \ "$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt-*.so)" \
"$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt_pic.a)" \ "$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt_pic.a)" \
"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt-*.so))" \ "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libcrypt-*.so))" \
$(PKG_BUILD_DIR)/libgcc_s.so.* \ $(BUILD_LIBGCC) \
-Wl,-soname=libcrypt.so.0 -Wl,-soname=libcrypt.so.0
$(SCRIPT_DIR)/relink-lib.sh \ $(SCRIPT_DIR)/relink-lib.sh \
"$(TARGET_CROSS)" \ "$(TARGET_CROSS)" \
"$(wildcard $(TOOLCHAIN_DIR)/lib/libm-*.so)" \ "$(wildcard $(TOOLCHAIN_DIR)/lib/libm-*.so)" \
"$(wildcard $(TOOLCHAIN_DIR)/lib/libm_pic.a)" \ "$(wildcard $(TOOLCHAIN_DIR)/lib/libm_pic.a)" \
"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libm-*.so))" \ "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libm-*.so))" \
$(PKG_BUILD_DIR)/libgcc_s.so.* \ $(BUILD_LIBGCC) \
-Wl,-soname=libm.so.0 -Wl,-soname=libm.so.0
$(SCRIPT_DIR)/relink-lib.sh \ $(SCRIPT_DIR)/relink-lib.sh \
"$(TARGET_CROSS)" \ "$(TARGET_CROSS)" \
@ -359,18 +360,19 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
"$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread_so.a)" \ "$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread_so.a)" \
"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread-*.so))" \ "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libpthread-*.so))" \
-Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal \ -Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal \
$(PKG_BUILD_DIR)/libgcc_s.so.* \ $(BUILD_LIBGCC) \
-Wl,-soname=libpthread.so.0 -Wl,-soname=libpthread.so.0
endef endef
ifneq ($(BUILD_LIBGCC),)
define Build/Compile/libgcc define Build/Compile/libgcc
$(SCRIPT_DIR)/relink-lib.sh \ $(SCRIPT_DIR)/relink-lib.sh \
"$(TARGET_CROSS)" \ "$(TARGET_CROSS)" \
"$(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*)" \ "$(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*)" \
"$(LIBGCC_A)" \ "$(LIBGCC_A)" \
"$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*))" \ "$(patsubst $(TOOLCHAIN_DIR)/lib/%,$(PKG_BUILD_DIR)/%,$(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*))" \
-Wl,--version-script=$(LIBGCC_MAP) -Wl,-soname=libgcc_s.so.1 -Wl,--version-script=$(LIBGCC_MAP) -Wl,-soname=libgcc_s.so.1
endef endef
endif
endif endif
define Build/Compile define Build/Compile