summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-02-10 05:23:32 +0000
committerMike Frysinger <vapier@gentoo.org>2006-02-10 05:23:32 +0000
commit32fa323b895141e70e705ac6791e62c7376289bc (patch)
tree08445f85940eaf70662366d50e2f9662829fdf54
parentcc58ac77fe1c3be7c9382ee38d3c3f805dd453c8 (diff)
mach writes in bug 685:
The last revision of gcc-3.4.4 patch file 100-uclibc-conf.patch builds file unwind-dw2-fde-glibc.c into libgcc (at least on mipsel-linux-uclibc and arm-linux-uclibc, but it should be the same on most architectures). this is due to the simplification of the uclibc patch ... simplified a little too much :)
-rw-r--r--toolchain/gcc/3.4.4/100-uclibc-conf.patch10
-rw-r--r--toolchain/gcc/3.4.5/100-uclibc-conf.patch10
-rw-r--r--toolchain/gcc/4.0.2/100-uclibc-conf.patch10
3 files changed, 27 insertions, 3 deletions
diff --git a/toolchain/gcc/3.4.4/100-uclibc-conf.patch b/toolchain/gcc/3.4.4/100-uclibc-conf.patch
index 6bc73a427..00ea4eeb5 100644
--- a/toolchain/gcc/3.4.4/100-uclibc-conf.patch
+++ b/toolchain/gcc/3.4.4/100-uclibc-conf.patch
@@ -1,3 +1,11 @@
+--- gcc-3.4.1/gcc/config/t-linux-uclibc
++++ gcc-3.4.1/gcc/config/t-linux-uclibc
+@@ -0,0 +1,5 @@
++# Remove glibc specific files added in t-linux
++SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
++
++# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
++LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
--- gcc-3.4.1/gcc/config.gcc
+++ gcc-3.4.1/gcc/config.gcc
@@ -2310,10 +2310,16 @@
@@ -10,7 +18,7 @@
+# Rather than hook into each target, just do it after all the linux
+# targets have been processed
+case ${target} in
-+*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC"
++*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
+esac
# Support for --with-cpu and related options (and a few unrelated options,
diff --git a/toolchain/gcc/3.4.5/100-uclibc-conf.patch b/toolchain/gcc/3.4.5/100-uclibc-conf.patch
index 6bc73a427..00ea4eeb5 100644
--- a/toolchain/gcc/3.4.5/100-uclibc-conf.patch
+++ b/toolchain/gcc/3.4.5/100-uclibc-conf.patch
@@ -1,3 +1,11 @@
+--- gcc-3.4.1/gcc/config/t-linux-uclibc
++++ gcc-3.4.1/gcc/config/t-linux-uclibc
+@@ -0,0 +1,5 @@
++# Remove glibc specific files added in t-linux
++SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
++
++# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
++LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
--- gcc-3.4.1/gcc/config.gcc
+++ gcc-3.4.1/gcc/config.gcc
@@ -2310,10 +2310,16 @@
@@ -10,7 +18,7 @@
+# Rather than hook into each target, just do it after all the linux
+# targets have been processed
+case ${target} in
-+*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC"
++*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
+esac
# Support for --with-cpu and related options (and a few unrelated options,
diff --git a/toolchain/gcc/4.0.2/100-uclibc-conf.patch b/toolchain/gcc/4.0.2/100-uclibc-conf.patch
index 700c1aec5..3be7d0975 100644
--- a/toolchain/gcc/4.0.2/100-uclibc-conf.patch
+++ b/toolchain/gcc/4.0.2/100-uclibc-conf.patch
@@ -1,3 +1,11 @@
+--- gcc-4.0.2/gcc/config/t-linux-uclibc
++++ gcc-4.0.2/gcc/config/t-linux-uclibc
+@@ -0,0 +1,5 @@
++# Remove glibc specific files added in t-linux
++SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
++
++# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
++LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
--- gcc-4.0.2/gcc/config.gcc
+++ gcc-4.0.2/gcc/config.gcc
@@ -1778,7 +1778,7 @@
@@ -19,7 +27,7 @@
+# Rather than hook into each target, just do it after all the linux
+# targets have been processed
+case ${target} in
-+*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC"
++*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
+esac
case ${target} in