grub2: bring back build of aros-side grub2 tools
[AROS.git] / tools / crosstools / binutils-2.25-aros.diff
blobfc5f69b971e35a27e7eaddb38b7f521a235d0d4f
1 diff -ruN binutils-2.25/bfd/config.bfd binutils-2.25.aros/bfd/config.bfd
2 --- binutils-2.25/bfd/config.bfd 2014-10-14 08:32:02.000000000 +0100
3 +++ binutils-2.25.aros/bfd/config.bfd 2014-10-14 08:32:02.000000000 +0100
4 @@ -167,7 +167,7 @@
6 # START OF targmatch.h
7 #ifdef BFD64
8 - aarch64-*-elf)
9 + aarch64-*-elf | aarch64-*-aros)
10 targ_defvec=aarch64_elf64_le_vec
11 targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
12 want64=true
13 @@ -338,7 +338,7 @@
15 arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
16 arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
17 - arm*-*-eabi* )
18 + arm*-*-eabi* | arm-*-aros)
19 targ_defvec=arm_elf32_le_vec
20 targ_selvecs=arm_elf32_be_vec
22 @@ -546,6 +546,8 @@
24 i[3-7]86-*-aros*)
25 targ_defvec=i386_elf32_vec
26 + targ_selvecs="x86_64_elf64_vec powerpc_elf32_vec"
27 + want64=true
29 i[3-7]86-*-chorus*)
30 targ_defvec=i386_elf32_vec
31 @@ -692,6 +694,11 @@
32 targ_defvec=x86_64_elf64_vec
33 want64=true
35 + x86_64-*-aros*)
36 + targ_defvec=x86_64_elf64_vec
37 + targ_selvecs="i386_elf32_vec powerpc_elf32_vec"
38 + want64=true
39 + ;;
40 #endif
41 i[3-7]86-*-lynxos*)
42 targ_defvec=i386_elf32_vec
43 @@ -847,7 +854,7 @@
44 targ_selvecs="core_cisco_be_vec ieee_vec"
45 targ_underscore=yes
47 - m68*-*-elf* | m68*-*-sysv4* | m68*-*-uclinux*)
48 + m68*-*-elf* | m68*-*-sysv4* | m68*-*-uclinux* | m68*-*-aros)
49 targ_defvec=m68k_elf32_vec
50 targ_selvecs="m68k_coff_vec ieee_vec"
52 @@ -1257,6 +1264,11 @@
53 want64=true
55 #endif
56 + powerpc-*-aros*)
57 + targ_defvec=powerpc_elf32_vec
58 + targ_selvecs="i386_elf32_vec x86_64_elf64_vec"
59 + want64=true
60 + ;;
61 powerpc-*-*freebsd*)
62 targ_defvec=powerpc_elf32_fbsd_vec
63 targ_selvecs="rs6000_xcoff_vec powerpc_elf32_vec powerpc_elf32_le_vec powerpc_boot_vec"
64 diff -ruN binutils-2.25/binutils/configure binutils-2.25.aros/binutils/configure
65 --- binutils-2.25/binutils/configure 2014-12-23 14:22:06.000000000 +0000
66 +++ binutils-2.25.aros/binutils/configure 2014-10-14 08:32:02.000000000 +0100
67 @@ -12875,7 +12875,9 @@
68 $as_echo_n "checking for mbstate_t... " >&6; }
69 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
70 /* end confdefs.h. */
71 +#if !defined(__AROS__)
72 #include <wchar.h>
73 +#endif
74 int
75 main ()
77 diff -ruN binutils-2.25/binutils/sysdep.h binutils-2.25.aros/binutils/sysdep.h
78 --- binutils-2.25/binutils/sysdep.h 2014-10-14 08:32:02.000000000 +0100
79 +++ binutils-2.25.aros/binutils/sysdep.h 2014-10-14 08:32:02.000000000 +0100
80 @@ -24,6 +24,7 @@
81 #include "ansidecl.h"
82 #include <stdio.h>
83 #include <sys/types.h>
84 +#include <sys/stat.h>
86 #include "bfdver.h"
88 diff -ruN binutils-2.25/config.guess binutils-2.25.aros/config.guess
89 --- binutils-2.25/config.guess 2014-10-14 08:32:02.000000000 +0100
90 +++ binutils-2.25.aros/config.guess 2014-10-14 08:32:02.000000000 +0100
91 @@ -309,6 +309,9 @@
92 *:[Mm]orph[Oo][Ss]:*:*)
93 echo ${UNAME_MACHINE}-unknown-morphos
94 exit ;;
95 + *:AROS:*:*)
96 + echo ${UNAME_MACHINE}-unknown-aros
97 + exit ;;
98 *:OS/390:*:*)
99 echo i370-ibm-openedition
100 exit ;;
101 diff -ruN binutils-2.25/intl/configure binutils-2.25.aros/intl/configure
102 --- binutils-2.25/intl/configure 2013-11-04 15:33:39.000000000 +0000
103 +++ binutils-2.25.aros/intl/configure 2014-10-14 08:32:02.000000000 +0100
104 @@ -4606,6 +4606,9 @@
106 int main ()
108 +#if defined(__AROS__)
109 + exit (1);
110 +#endif
111 signal (SIGFPE, sigfpe_handler);
112 /* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
113 #if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
114 diff -ruN binutils-2.25/ld/configure.tgt binutils-2.25.aros/ld/configure.tgt
115 --- binutils-2.25/ld/configure.tgt 2014-10-14 08:32:04.000000000 +0100
116 +++ binutils-2.25.aros/ld/configure.tgt 2014-10-14 08:32:02.000000000 +0100
117 @@ -47,6 +47,10 @@
118 case "${targ}" in
119 aarch64_be-*-elf) targ_emul=aarch64elfb
120 targ_extra_emuls="aarch64elf aarch64elf32 aarch64elf32b armelfb armelf" ;;
121 +aarch64-*-aros*) targ_emul=aarch64elf_aros
122 + targ_extra_emuls=aarch64elfb_aros
123 + targ_extra_libpath=$targ_extra_emuls
124 + ;;
125 aarch64-*-elf) targ_emul=aarch64elf
126 targ_extra_emuls="aarch64elf32 aarch64elf32b aarch64elfb armelf armelfb" ;;
127 aarch64_be-*-linux*) targ_emul=aarch64linuxb
128 @@ -110,6 +114,10 @@
129 targ_extra_emuls="armelfb armelf armelf_linux"
130 targ_extra_libpath="armelf_linux"
132 +arm*-*-aros*) targ_emul=armelf_aros
133 + targ_extra_emuls=armelfb_aros
134 + targ_extra_libpath=$targ_extra_emuls
135 + ;;
136 arm*-*-linux-*eabi*) targ_emul=armelf_linux_eabi
137 targ_extra_emuls=armelfb_linux_eabi
138 targ_extra_libpath=$targ_extra_emuls
139 @@ -289,6 +297,9 @@
140 targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om"
141 tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'`
143 +x86_64-*-aros*) targ_emul=elf_x86_64
144 + targ_extra_emuls=elf_i386
145 + ;;
146 i[3-7]86-*-kaos*) targ_emul=elf_i386 ;;
147 i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12])
148 targ_emul=i386bsd ;;
149 @@ -399,6 +410,7 @@
150 m68k-hp-bsd*) targ_emul=hp300bsd ;;
151 m68*-motorola-sysv*) targ_emul=delta68 ;;
152 m68*-*-aout) targ_emul=m68kaout ;;
153 +m68*-*-aros) targ_emul=m68kelf ;;
154 m68*-*-coff) targ_emul=m68kcoff ;;
155 m68*-*-elf) targ_emul=m68kelf ;;
156 m68*-*-hpux*) targ_emul=hp3hpux ;;
157 @@ -604,6 +616,7 @@
158 powerpc-*-beos*) targ_emul=aixppc ;;
159 powerpc-*-windiss*) targ_emul=elf32ppcwindiss ;;
160 powerpc-*-lynxos*) targ_emul=ppclynx ;;
161 +powerpc-*-aros*) targ_emul=elf32ppc ;;
162 rs6000-*-aix[5-9]*) targ_emul=aix5rs6 ;;
163 rs6000-*-aix*) targ_emul=aixrs6
165 diff -ruN binutils-2.25/ld/emulparams/aarch64elf_aros.sh binutils-2.25.aros/ld/emulparams/aarch64elf_aros.sh
166 --- binutils-2.25/ld/emulparams/aarch64elf_aros.sh 1970-01-01 01:00:00.000000000 +0100
167 +++ binutils-2.25.aros/ld/emulparams/aarch64elf_aros.sh 2016-04-01 07:58:51.909224114 +0100
168 @@ -0,0 +1 @@
169 +. ${srcdir}/emulparams/aarch64elf.sh
170 diff -ruN binutils-2.25/ld/emulparams/aarch64elfb_aros.sh binutils-2.25.aros/ld/emulparams/aarch64elfb_aros.sh
171 --- binutils-2.25/ld/emulparams/aarch64elfb_aros.sh 1970-01-01 01:00:00.000000000 +0100
172 +++ binutils-2.25.aros/ld/emulparams/aarch64elfb_aros.sh 2014-10-14 08:32:02.000000000 +0100
173 @@ -0,0 +1 @@
174 +. ${srcdir}/emulparams/aarch64elfb.sh
175 diff -ruN binutils-2.25/ld/emulparams/armelf_aros.sh binutils-2.25.aros/ld/emulparams/armelf_aros.sh
176 --- binutils-2.25/ld/emulparams/armelf_aros.sh 1970-01-01 01:00:00.000000000 +0100
177 +++ binutils-2.25.aros/ld/emulparams/armelf_aros.sh 2014-10-14 08:32:02.000000000 +0100
178 @@ -0,0 +1 @@
179 +. ${srcdir}/emulparams/armelf_linux_eabi.sh
180 diff -ruN binutils-2.25/ld/emulparams/armelfb_aros.sh binutils-2.25.aros/ld/emulparams/armelfb_aros.sh
181 --- binutils-2.25/ld/emulparams/armelfb_aros.sh 1970-01-01 01:00:00.000000000 +0100
182 +++ binutils-2.25.aros/ld/emulparams/armelfb_aros.sh 2014-10-14 08:32:02.000000000 +0100
183 @@ -0,0 +1,2 @@
184 +. ${srcdir}/emulparams/armelf_aros.sh
185 +OUTPUT_FORMAT="elf32-bigarm"
186 diff -ruN binutils-2.25/ld/Makefile.in binutils-2.25.aros/ld/Makefile.in
187 --- binutils-2.25/ld/Makefile.in 2014-10-14 08:32:04.000000000 +0100
188 +++ binutils-2.25.aros/ld/Makefile.in 2014-10-14 08:32:02.000000000 +0100
189 @@ -468,6 +468,7 @@
190 earmaoutl.c \
191 earmcoff.c \
192 earmelf.c \
193 + earmelf_aros.c \
194 earmelf_fbsd.c \
195 earmelf_linux.c \
196 earmelf_linux_eabi.c \
197 @@ -475,6 +476,7 @@
198 earmelf_nbsd.c \
199 earmelf_vxworks.c \
200 earmelfb.c \
201 + earmelfb_aros.c \
202 earmelfb_fbsd.c \
203 earmelfb_linux.c \
204 earmelfb_linux_eabi.c \
205 @@ -727,6 +729,8 @@
206 eaarch64elf32.c \
207 eaarch64elfb.c \
208 eaarch64elf32b.c \
209 + eaarch64elf_aros.c \
210 + eaarch64elfb_aros.c \
211 eaarch64linux.c \
212 eaarch64linuxb.c \
213 eaarch64linux32.c \
214 @@ -1046,6 +1050,8 @@
215 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf32.Po@am__quote@
216 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf32b.Po@am__quote@
217 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elfb.Po@am__quote@
218 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf_aros.Po@am__quote@
219 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elfb_aros.Po@am__quote@
220 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux.Po@am__quote@
221 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32.Po@am__quote@
222 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux32b.Po@am__quote@
223 @@ -1063,6 +1069,7 @@
224 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmaoutl.Po@am__quote@
225 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmcoff.Po@am__quote@
226 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf.Po@am__quote@
227 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_aros.Po@am__quote@
228 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_fbsd.Po@am__quote@
229 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux.Po@am__quote@
230 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux_eabi.Po@am__quote@
231 @@ -1070,6 +1077,7 @@
232 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nbsd.Po@am__quote@
233 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_vxworks.Po@am__quote@
234 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb.Po@am__quote@
235 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_aros.Po@am__quote@
236 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_fbsd.Po@am__quote@
237 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux.Po@am__quote@
238 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux_eabi.Po@am__quote@
239 @@ -2156,6 +2164,12 @@
240 $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
241 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
243 +earmelf_aros.c: $(srcdir)/emulparams/armelf_aros.sh \
244 + $(srcdir)/emulparams/armelf_linux_eabi.sh \
245 + $(srcdir)/emulparams/armelf_linux.sh \
246 + $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
247 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
249 earmelf_nacl.c: $(srcdir)/emulparams/armelf_nacl.sh \
250 $(srcdir)/emulparams/armelf_linux_eabi.sh \
251 $(srcdir)/emulparams/armelf_linux.sh \
252 @@ -2194,6 +2208,13 @@
253 $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
254 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
256 +earmelfb_aros.c: $(srcdir)/emulparams/armelfb_aros.sh \
257 + $(srcdir)/emulparams/armelf_aros.sh \
258 + $(srcdir)/emulparams/armelf_linux_eabi.sh \
259 + $(srcdir)/emulparams/armelf_linux.sh \
260 + $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
261 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
263 earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
264 $(srcdir)/emulparams/armelf_nacl.sh \
265 $(srcdir)/emulparams/armelf_linux_eabi.sh \
266 @@ -3001,6 +3022,14 @@
267 $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
268 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
270 +eaarch64elf_aros.c: $(srcdir)/emulparams/aarch64elf_aros.sh \
271 + $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
272 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
274 +eaarch64elfb_aros.c: $(srcdir)/emulparams/aarch64elfb_aros.sh $(srcdir)/emulparams/aarch64elf_aros.sh \
275 + $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
276 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
278 eaarch64linux.c: $(srcdir)/emulparams/aarch64linux.sh \
279 $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
280 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}