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 2006-05-30 Falk Hueffner <falk@debian.org>
3 * sysdeps/unix/sysv/linux/alpha/ioperm.c: force the architecture
4 to ev6 in assembly code.
6 {standard input}: Assembler messages:
7 {standard input}:341: Error: macro requires $at register while noat in effect
8 {standard input}:374: Error: macro requires $at register while noat in effect
9 {standard input}:438: Error: macro requires $at register while noat in effect
10 {standard input}:471: Error: macro requires $at register while noat in effect
11 make[3]: *** [/tmp/buildd/glibc-2.3.6/build-tree/alpha-libc/misc/ioperm.o] Error 1
13 Hrm. gcc puts .arch ev4 into the .s, and this overrides -mev6 for as.
14 I cannot really think of anything better than
16 ports/sysdeps/unix/sysv/linux/alpha/ioperm.c | 8 ++++----
17 1 file changed, 4 insertions(+), 4 deletions(-)
19 diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
20 --- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c 2009-05-16 10:36:20.000000000 +0200
21 +++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c 2009-11-13 00:50:57.000000000 +0100
24 stb_mb(unsigned char val, unsigned long addr)
26 - __asm__("stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
27 + __asm__(".arch ev6; stb %1,%0; mb" : "=m"(*(vucp)addr) : "r"(val));
31 stw_mb(unsigned short val, unsigned long addr)
33 - __asm__("stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
34 + __asm__(".arch ev6; stw %1,%0; mb" : "=m"(*(vusp)addr) : "r"(val));
39 unsigned long int addr = dense_port_to_cpu_addr (port);
42 - __asm__ ("ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
43 + __asm__ (".arch ev6; ldbu %0,%1" : "=r"(r) : "m"(*(vucp)addr));
48 unsigned long int addr = dense_port_to_cpu_addr (port);
51 - __asm__ ("ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
52 + __asm__ (".arch ev6; ldwu %0,%1" : "=r"(r) : "m"(*(vusp)addr));
56 diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.12.1/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c