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>
1 2008-04-03 Nathan Froyd <froydnj@codesourcery.com>
2 Nathan Sidwell <nathan@codesourcery.com>
4 * config/rs6000/rs6000.opt (mspe): Remove Var property.
6 * config/rs6000/rs6000.h (rs6000_spe): Declare.
7 (rs6000_isel): Likewise.
8 * config/rs6000/rs6000.c (rs6000_spe): New variable.
9 (rs6000_isel): New variable.
10 (rs6000_handle_option): Handle OPT_mspe and OPT_misel.
12 diff -durN gcc-4.3.2.orig/gcc/config/rs6000/rs6000.c gcc-4.3.2/gcc/config/rs6000/rs6000.c
13 --- gcc-4.3.2.orig/gcc/config/rs6000/rs6000.c 2008-06-10 19:13:57.000000000 +0200
14 +++ gcc-4.3.2/gcc/config/rs6000/rs6000.c 2008-09-23 19:46:45.000000000 +0200
16 /* Nonzero to use AltiVec ABI. */
17 int rs6000_altivec_abi;
19 +/* Nonzero if we want SPE SIMD instructions. */
22 /* Nonzero if we want SPE ABI extensions. */
25 +/* Nonzero to use isel instructions. */
28 /* Nonzero if floating point operations are done in the GPRs. */
29 int rs6000_float_gprs = 0;
31 @@ -2144,11 +2150,21 @@
32 rs6000_parse_yes_no_option ("vrsave", arg, &(TARGET_ALTIVEC_VRSAVE));
36 + rs6000_explicit_options.isel = true;
37 + rs6000_isel = value;
41 rs6000_explicit_options.isel = true;
42 rs6000_parse_yes_no_option ("isel", arg, &(rs6000_isel));
46 + rs6000_explicit_options.spe = true;
51 rs6000_explicit_options.spe = true;
52 rs6000_parse_yes_no_option ("spe", arg, &(rs6000_spe));
53 diff -durN gcc-4.3.2.orig/gcc/config/rs6000/rs6000.opt gcc-4.3.2/gcc/config/rs6000/rs6000.opt
54 --- gcc-4.3.2.orig/gcc/config/rs6000/rs6000.opt 2007-10-31 08:56:01.000000000 +0100
55 +++ gcc-4.3.2/gcc/config/rs6000/rs6000.opt 2008-09-23 19:46:45.000000000 +0200
57 -mvrsave=yes/no Deprecated option. Use -mvrsave/-mno-vrsave instead
60 -Target Var(rs6000_isel)
62 Generate isel instructions
66 -misel=yes/no Deprecated option. Use -misel/-mno-isel instead
69 -Target Var(rs6000_spe)
71 Generate SPE SIMD instructions on E500
74 diff -durN gcc-4.3.2.orig/gcc/config/rs6000/rs6000.h gcc-4.3.2/gcc/config/rs6000/rs6000.h
75 --- gcc-4.3.2.orig/gcc/config/rs6000/rs6000.h 2008-01-26 18:18:35.000000000 +0100
76 +++ gcc-4.3.2/gcc/config/rs6000/rs6000.h 2008-09-23 19:46:45.000000000 +0200
78 extern int rs6000_ieeequad;
79 extern int rs6000_altivec_abi;
80 extern int rs6000_spe_abi;
81 +extern int rs6000_spe;
82 +extern int rs6000_isel;
83 extern int rs6000_float_gprs;
84 extern int rs6000_alignment_flags;
85 extern const char *rs6000_sched_insert_nops_str;