patches/gcc/4.3.2/330-unwind-for-uClibc.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 766 717efd8b78b4
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@766
     1
diff -durN gcc-4.3.1.orig/gcc/config/t-linux-uclibc gcc-4.3.1/gcc/config/t-linux-uclibc
yann@766
     2
--- gcc-4.3.1.orig/gcc/config/t-linux-uclibc	1970-01-01 01:00:00.000000000 +0100
yann@766
     3
+++ gcc-4.3.1/gcc/config/t-linux-uclibc	2008-07-29 13:07:15.000000000 +0200
yann@766
     4
@@ -0,0 +1,5 @@
yann@766
     5
+# Remove glibc specific files added in t-linux
yann@766
     6
+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
yann@766
     7
+
yann@766
     8
+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
yann@766
     9
+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
yann@766
    10
diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
yann@766
    11
--- gcc-4.3.1.orig/gcc/config.gcc	2008-07-29 13:11:02.000000000 +0200
yann@766
    12
+++ gcc-4.3.1/gcc/config.gcc	2008-07-29 13:10:05.000000000 +0200
yann@766
    13
@@ -2651,6 +2651,12 @@
yann@766
    14
 	;;
yann@766
    15
 esac
yann@766
    16
 
yann@766
    17
+# Rather than hook into each target, just do it after all the linux
yann@766
    18
+# targets have been processed
yann@766
    19
+case ${target} in
yann@766
    20
+  *-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc";;
yann@766
    21
+esac
yann@766
    22
+
yann@766
    23
 case ${target} in
yann@766
    24
 i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
yann@766
    25
 	tmake_file="${tmake_file} i386/t-gmm_malloc"