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 Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
3 Always try to prepend the sysroot prefix to absolute filenames first.
5 http://bugs.gentoo.org/275666
6 http://sourceware.org/bugzilla/show_bug.cgi?id=10340
8 diff -durN binutils-2.20.1.orig/ld/ldfile.c binutils-2.20.1/ld/ldfile.c
9 --- binutils-2.20.1.orig/ld/ldfile.c 2009-08-30 00:11:01.000000000 +0200
10 +++ binutils-2.20.1/ld/ldfile.c 2010-08-17 19:32:08.000000000 +0200
13 if (! entry->is_archive)
15 - if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
16 + /* For absolute pathnames, try to always open the file in the
17 + sysroot first. If this fails, try to open the file at the
19 + entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
20 + if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
22 char *name = concat (ld_sysroot, entry->filename,
24 if (ldfile_try_open_bfd (name, entry))
26 entry->filename = name;
27 + entry->sysrooted = TRUE;
32 - else if (ldfile_try_open_bfd (entry->filename, entry))
34 + if (ldfile_try_open_bfd (entry->filename, entry))
36 entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
37 && is_sysrooted_pathname (entry->filename, TRUE);