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 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/62_all_gcc4-noteGNUstack.patch
2 2005-02-08 Jakub Jelinek <jakub@redhat.com>
4 * src/alpha/osf.S: Add .note.GNU-stack on Linux.
5 * src/s390/sysv.S: Likewise.
6 * src/powerpc/linux64.S: Likewise.
7 * src/powerpc/linux64_closure.S: Likewise.
8 * src/powerpc/ppc_closure.S: Likewise.
9 * src/powerpc/sysv.S: Likewise.
10 * src/x86/unix64.S: Likewise.
11 * src/x86/sysv.S: Likewise.
12 * src/sparc/v8.S: Likewise.
13 * src/sparc/v9.S: Likewise.
14 * src/m68k/sysv.S: Likewise.
15 * src/ia64/unix.S: Likewise.
16 * src/arm/sysv.S: Likewise.
18 * ia64_save_regs_in_stack.s: Moved to...
19 * ia64_save_regs_in_stack.S: ... this. Add .note.GNU-stack
22 diff -durN gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.S gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.S
23 --- gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.S 1970-01-01 01:00:00.000000000 +0100
24 +++ gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.S 2008-06-10 14:58:21.000000000 +0200
28 + .global GC_save_regs_in_stack
29 + .proc GC_save_regs_in_stack
30 +GC_save_regs_in_stack:
36 + .endp GC_save_regs_in_stack
39 + .section .note.GNU-stack,"",@progbits
41 diff -durN gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.s gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.s
42 --- gcc-4.3.1.orig/boehm-gc/ia64_save_regs_in_stack.s 2001-10-15 06:57:59.000000000 +0200
43 +++ gcc-4.3.1/boehm-gc/ia64_save_regs_in_stack.s 1970-01-01 02:00:00.000000000 +0200
47 - .global GC_save_regs_in_stack
48 - .proc GC_save_regs_in_stack
49 -GC_save_regs_in_stack:
55 - .endp GC_save_regs_in_stack
57 diff -durN gcc-4.3.1.orig/libffi/src/alpha/osf.S gcc-4.3.1/libffi/src/alpha/osf.S
58 --- gcc-4.3.1.orig/libffi/src/alpha/osf.S 2007-04-06 18:24:16.000000000 +0200
59 +++ gcc-4.3.1/libffi/src/alpha/osf.S 2008-06-10 14:58:21.000000000 +0200
61 .byte 16 # uleb128 offset 16*-8
66 + .section .note.GNU-stack,"",@progbits
69 diff -durN gcc-4.3.1.orig/libffi/src/arm/sysv.S gcc-4.3.1/libffi/src/arm/sysv.S
70 --- gcc-4.3.1.orig/libffi/src/arm/sysv.S 2007-09-04 19:52:45.000000000 +0200
71 +++ gcc-4.3.1/libffi/src/arm/sysv.S 2008-06-10 14:58:21.000000000 +0200
74 .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
76 +#if defined __ELF__ && defined __linux__
77 + .section .note.GNU-stack,"",%progbits
79 diff -durN gcc-4.3.1.orig/libffi/src/ia64/unix.S gcc-4.3.1/libffi/src/ia64/unix.S
80 --- gcc-4.3.1.orig/libffi/src/ia64/unix.S 2005-03-30 23:49:19.000000000 +0200
81 +++ gcc-4.3.1/libffi/src/ia64/unix.S 2008-06-10 14:58:21.000000000 +0200
83 data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT
84 data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE
85 data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE
87 +#if defined __ELF__ && defined __linux__
88 + .section .note.GNU-stack,"",@progbits
90 diff -durN gcc-4.3.1.orig/libffi/src/m68k/sysv.S gcc-4.3.1/libffi/src/m68k/sysv.S
91 --- gcc-4.3.1.orig/libffi/src/m68k/sysv.S 2007-05-10 23:29:04.000000000 +0200
92 +++ gcc-4.3.1/libffi/src/m68k/sysv.S 2008-06-10 14:58:21.000000000 +0200
96 .size ffi_closure_struct_SYSV,.-ffi_closure_struct_SYSV
98 +#if defined __ELF__ && defined __linux__
99 + .section .note.GNU-stack,"",@progbits
101 diff -durN gcc-4.3.1.orig/libffi/src/powerpc/linux64.S gcc-4.3.1/libffi/src/powerpc/linux64.S
102 --- gcc-4.3.1.orig/libffi/src/powerpc/linux64.S 2007-11-17 00:24:53.000000000 +0100
103 +++ gcc-4.3.1/libffi/src/powerpc/linux64.S 2008-06-10 14:58:21.000000000 +0200
109 +#if defined __ELF__ && defined __linux__
110 + .section .note.GNU-stack,"",@progbits
112 diff -durN gcc-4.3.1.orig/libffi/src/powerpc/linux64_closure.S gcc-4.3.1/libffi/src/powerpc/linux64_closure.S
113 --- gcc-4.3.1.orig/libffi/src/powerpc/linux64_closure.S 2005-08-11 23:18:24.000000000 +0200
114 +++ gcc-4.3.1/libffi/src/powerpc/linux64_closure.S 2008-06-10 14:58:21.000000000 +0200
120 +#if defined __ELF__ && defined __linux__
121 + .section .note.GNU-stack,"",@progbits
123 diff -durN gcc-4.3.1.orig/libffi/src/powerpc/ppc_closure.S gcc-4.3.1/libffi/src/powerpc/ppc_closure.S
124 --- gcc-4.3.1.orig/libffi/src/powerpc/ppc_closure.S 2007-12-01 22:00:04.000000000 +0100
125 +++ gcc-4.3.1/libffi/src/powerpc/ppc_closure.S 2008-06-10 14:58:21.000000000 +0200
131 +#if defined __ELF__ && defined __linux__
132 + .section .note.GNU-stack,"",@progbits
134 diff -durN gcc-4.3.1.orig/libffi/src/powerpc/sysv.S gcc-4.3.1/libffi/src/powerpc/sysv.S
135 --- gcc-4.3.1.orig/libffi/src/powerpc/sysv.S 2007-12-01 22:00:04.000000000 +0100
136 +++ gcc-4.3.1/libffi/src/powerpc/sysv.S 2008-06-10 14:58:21.000000000 +0200
142 +#if defined __ELF__ && defined __linux__
143 + .section .note.GNU-stack,"",@progbits
145 diff -durN gcc-4.3.1.orig/libffi/src/s390/sysv.S gcc-4.3.1/libffi/src/s390/sysv.S
146 --- gcc-4.3.1.orig/libffi/src/s390/sysv.S 2003-10-21 21:01:58.000000000 +0200
147 +++ gcc-4.3.1/libffi/src/s390/sysv.S 2008-06-10 14:58:21.000000000 +0200
152 +#if defined __ELF__ && defined __linux__
153 + .section .note.GNU-stack,"",@progbits
155 diff -durN gcc-4.3.1.orig/libffi/src/sparc/v8.S gcc-4.3.1/libffi/src/sparc/v8.S
156 --- gcc-4.3.1.orig/libffi/src/sparc/v8.S 2004-11-22 19:35:16.000000000 +0100
157 +++ gcc-4.3.1/libffi/src/sparc/v8.S 2008-06-10 14:58:21.000000000 +0200
159 .byte 0x1f ! uleb128 0x1f
163 +#if defined __ELF__ && defined __linux__
164 + .section .note.GNU-stack,"",@progbits
166 diff -durN gcc-4.3.1.orig/libffi/src/sparc/v9.S gcc-4.3.1/libffi/src/sparc/v9.S
167 --- gcc-4.3.1.orig/libffi/src/sparc/v9.S 2004-01-25 07:58:33.000000000 +0100
168 +++ gcc-4.3.1/libffi/src/sparc/v9.S 2008-06-10 14:58:21.000000000 +0200
175 + .section .note.GNU-stack,"",@progbits
177 diff -durN gcc-4.3.1.orig/libffi/src/x86/sysv.S gcc-4.3.1/libffi/src/x86/sysv.S
178 --- gcc-4.3.1.orig/libffi/src/x86/sysv.S 2008-01-30 15:36:58.000000000 +0100
179 +++ gcc-4.3.1/libffi/src/x86/sysv.S 2008-06-10 14:58:21.000000000 +0200
183 #endif /* ifndef __x86_64__ */
185 +#if defined __ELF__ && defined __linux__
186 + .section .note.GNU-stack,"",@progbits
188 diff -durN gcc-4.3.1.orig/libffi/src/x86/unix64.S gcc-4.3.1/libffi/src/x86/unix64.S
189 --- gcc-4.3.1.orig/libffi/src/x86/unix64.S 2005-05-05 06:06:38.000000000 +0200
190 +++ gcc-4.3.1/libffi/src/x86/unix64.S 2008-06-10 14:58:21.000000000 +0200
194 #endif /* __x86_64__ */
196 +#if defined __ELF__ && defined __linux__
197 + .section .note.GNU-stack,"",@progbits