X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2Fgcc%2FMakefile;h=57debe12b82ad4a988bece372168f4d78b43e135;hb=3a456bbb944dce505eca814b2abfef458637f93d;hp=dc7e02c7ae8b80c94338819466dbbdaac2047c8a;hpb=027be0e8962dd2f8869a19ece22d3d88fb763876;p=openwrt-10.03%2F.git diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index dc7e02c7a..57debe12b 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -79,6 +79,8 @@ ifeq ("$(strip $(ARCH))","armeb") $(SCRIPT_DIR)/patch-kernel.sh $(GCC_DIR) ./$(GCC_VERSION) arm-softfloat.patch.conditional endif endif + $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(GCC_DIR)/gcc/version.c + $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1\2,' $(GCC_DIR)/gcc/version.c touch $(GCC_DIR)/.patched # The --without-headers option stopped working with gcc 3.0 and has never been @@ -188,6 +190,16 @@ ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) cp ./$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif endif +# We do another ugly hack here because the standard behaviour is +# to include a reference to libgcc.so.1 in all binaries. For flash space +# saving, we change the specs file to link in a static libgcc here. + if [ ! -f $(STAGING_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \ + echo staging dir specs file is missing ; \ + /bin/false ; \ + fi; + if grep -q as-needed $(STAGING_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs; then \ + patch -d $(STAGING_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/ -p0 < ./$(GCC_VERSION)/static-libgcc.patch.conditional ; \ + fi; source: $(DL_DIR)/$(GCC_SOURCE) prepare: $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc