mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

make gcc4 depend on libgcc, and disable the libgcc hack for it

Browse Source 
SVN-Revision: 3161
This commit is contained in:
Imre Kaloz 2006-02-06 11:26:51 +00:00
parent b37df06d50
commit f899e1bc45
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openwrt/toolchain/gcc/4.0.2/static-libgcc.patch.conditional
View File

@ -1,11 +0,0 @@
--- specs~ 2006-01-27 11:44:50.000000000 +0100
+++ specs 2006-01-27 12:00:41.000000000 +0100
@@ -57,7 +57,7 @@
%{fmudflap|fmudflapth: -export-dynamic}
*libgcc:
-%{static|static-libgcc:-lgcc -lgcc_eh}%{!static:%{!static-libgcc:%{!shared-libgcc:-lgcc --as-needed -lgcc_s --no-as-needed}%{shared-libgcc:-lgcc_s%{!shared: -lgcc}}}}
+%{static|static-libgcc:-lgcc -lgcc_eh}%{!static:%{!static-libgcc:%{!shared:%{!shared-libgcc:-lgcc -lgcc_eh}%{shared-libgcc:-lgcc_s -lgcc}}%{shared:%{shared-libgcc:-lgcc_s%{!shared-libgcc: -lgcc}}}}}
*startfile:
%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}

1
openwrt/toolchain/gcc/Config.in
View File

@ -29,6 +29,7 @@ choice
config BR2_GCC_VERSION_4_0_2 config BR2_GCC_VERSION_4_0_2
bool "gcc 4.0.2" bool "gcc 4.0.2"
select BR2_GCC_3_4 select BR2_GCC_3_4
select BR2_PACKAGE_LIBGCC
endchoice endchoice

6
openwrt/toolchain/gcc/Makefile
View File

@ -193,11 +193,7 @@ endif
# We do another ugly hack here because the standard behaviour is # 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 # 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. # 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 \ if [ -f $(STAGING_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \
echo staging dir specs file is missing, assuming GCC 4.x ; \
$(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc -dumpspecs > $(STAGING_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs; \
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 ; \ patch -d $(STAGING_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/ -p0 < ./$(GCC_VERSION)/static-libgcc.patch.conditional ; \
fi; fi;