patches/gcc/4.3.2/250-sh-pr24836.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 747 d3e603e7c17c
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@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/74_all_sh-pr24836.patch
yann@552
     2
http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
yann@552
     3
http://gcc.gnu.org/PR24836
yann@552
     4
yann@874
     5
diff -durN gcc-4.3.2.orig/gcc/configure gcc-4.3.2/gcc/configure
yann@874
     6
--- gcc-4.3.2.orig/gcc/configure	2008-09-23 19:41:45.000000000 +0200
yann@874
     7
+++ gcc-4.3.2/gcc/configure	2008-09-23 19:43:11.000000000 +0200
yann@874
     8
@@ -20689,7 +20689,7 @@
yann@552
     9
 	tls_first_minor=14
yann@552
    10
 	tls_as_opt="-m64 -Aesame --fatal-warnings"
yann@552
    11
 	;;
yann@552
    12
-  sh-*-* | sh[34]-*-*)
yann@552
    13
+  sh-*-* | sh[34]*-*-*)
yann@552
    14
     conftest_s='
yann@552
    15
 	.section ".tdata","awT",@progbits
yann@552
    16
 foo:	.long	25
yann@874
    17
diff -durN gcc-4.3.2.orig/gcc/configure.ac gcc-4.3.2/gcc/configure.ac
yann@874
    18
--- gcc-4.3.2.orig/gcc/configure.ac	2008-09-23 19:41:45.000000000 +0200
yann@874
    19
+++ gcc-4.3.2/gcc/configure.ac	2008-09-23 19:43:11.000000000 +0200
yann@874
    20
@@ -2552,7 +2552,7 @@
yann@552
    21
 	tls_first_minor=14
yann@552
    22
 	tls_as_opt="-m64 -Aesame --fatal-warnings"
yann@552
    23
 	;;
yann@552
    24
-  sh-*-* | sh[34]-*-*)
yann@552
    25
+  sh-*-* | sh[34]*-*-*)
yann@552
    26
     conftest_s='
yann@552
    27
 	.section ".tdata","awT",@progbits
yann@552
    28
 foo:	.long	25