| blob | 1e3385e7cdd2946db5a1bc90308779b052be04c2 |
1 diff -ruN binutils-2.32/bfd/config.bfd binutils-2.32.aros/bfd/config.bfd
2 --- binutils-2.32/bfd/config.bfd 2019-01-19 16:01:32.000000000 +0000
3 +++ binutils-2.32.aros/bfd/config.bfd 2019-01-19 16:10:54.000000000 +0000
4 @@ -230,7 +230,7 @@
5 targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
6 want64=true
7 ;;
8 - aarch64-*-elf | aarch64-*-rtems*)
9 + aarch64-*-elf | aarch64-*-aros | aarch64-*-rtems*)
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 @@ -389,7 +389,7 @@
14 ;;
15 arm-*-elf | arm*-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
16 arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
17 - arm*-*-eabi* | arm-*-rtems* | arm*-*-uclinuxfdpiceabi)
18 + arm*-*-eabi* | arm*-*-aros | arm-*-rtems* | arm*-*-uclinuxfdpiceabi)
19 targ_defvec=arm_elf32_le_vec
20 targ_selvecs="arm_elf32_fdpic_le_vec arm_elf32_be_vec arm_elf32_fdpic_be_vec"
21 ;;
22 @@ -587,7 +587,7 @@
23 ;;
24 i[3-7]86-*-aros*)
25 targ_defvec=i386_elf32_vec
26 - targ_selvecs=iamcu_elf32_vec
27 + targ_selvecs="iamcu_elf32_vec x86_64_elf64_vec"
28 ;;
29 i[3-7]86-*-dicos*)
30 targ_defvec=i386_elf32_vec
31 @@ -718,6 +718,11 @@
32 targ_selvecs=i386_elf32_vec
33 want64=true
34 ;;
35 + x86_64-*-aros*)
36 + targ_defvec=x86_64_elf64_vec
37 + targ_selvecs=i386_elf32_vec
38 + want64=true
39 + ;;
40 #endif
41 i[3-7]86-*-lynxos*)
42 targ_defvec=i386_elf32_vec
43 @@ -1103,6 +1108,11 @@
44 targ_selvecs=rs6000_xcoff_vec
45 want64=true
46 ;;
47 + powerpc64-*-aros*)
48 + targ_defvec=powerpc_elf64_vec
49 + targ_selvecs="powerpc_elf64_le_vec powerpc_elf32_vec powerpc_elf32_le_vec"
50 + want64=true
51 + ;;
52 powerpc64-*-freebsd*)
53 targ_defvec=powerpc_elf64_fbsd_vec
54 targ_selvecs="powerpc_elf64_vec powerpc_elf32_vec powerpc_elf32_fbsd_vec powerpc_elf32_le_vec rs6000_xcoff_vec rs6000_xcoff64_vec rs6000_xcoff64_aix_vec"
55 @@ -1121,6 +1131,11 @@
56 want64=true
57 ;;
58 #endif
59 + powerpc-*-aros*)
60 + targ_defvec=powerpc_elf32_vec
61 + targ_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec powerpc_elf32_le_vec"
62 + want64=true
63 + ;;
64 powerpc-*-*freebsd*)
65 targ_defvec=powerpc_elf32_fbsd_vec
66 targ_selvecs="rs6000_xcoff_vec powerpc_elf32_vec powerpc_elf32_le_vec powerpc_boot_vec"
67 diff -ruN binutils-2.32/binutils/configure binutils-2.32.aros/binutils/configure
68 --- binutils-2.32/binutils/configure 2019-02-02 15:54:08.000000000 +0000
69 +++ binutils-2.32.aros/binutils/configure 2019-01-19 16:10:54.000000000 +0000
70 @@ -13774,7 +13774,9 @@
71 $as_echo_n "checking for mbstate_t... " >&6; }
72 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
73 /* end confdefs.h. */
74 +#if !defined(__AROS__)
75 #include <wchar.h>
76 +#endif
77 int
78 main ()
79 {
80 diff -ruN binutils-2.32/binutils/sysdep.h binutils-2.32.aros/binutils/sysdep.h
81 --- binutils-2.32/binutils/sysdep.h 2019-01-19 16:01:33.000000000 +0000
82 +++ binutils-2.32.aros/binutils/sysdep.h 2019-01-19 16:10:54.000000000 +0000
83 @@ -24,6 +24,7 @@
84 #include "ansidecl.h"
85 #include <stdio.h>
86 #include <sys/types.h>
87 +#include <sys/stat.h>
89 #include "bfdver.h"
91 diff -ruN binutils-2.32/config.guess binutils-2.32.aros/config.guess
92 --- binutils-2.32/config.guess 2019-01-19 16:01:33.000000000 +0000
93 +++ binutils-2.32.aros/config.guess 2019-01-19 16:10:54.000000000 +0000
94 @@ -342,6 +342,9 @@
95 *:[Mm]orph[Oo][Ss]:*:*)
96 echo "$UNAME_MACHINE"-unknown-morphos
97 exit ;;
98 + *:AROS:*:*)
99 + echo ${UNAME_MACHINE}-unknown-aros
100 + exit ;;
101 *:OS/390:*:*)
102 echo i370-ibm-openedition
103 exit ;;
104 diff -ruN binutils-2.32/intl/configure binutils-2.32.aros/intl/configure
105 --- binutils-2.32/intl/configure 2019-01-19 16:01:33.000000000 +0000
106 +++ binutils-2.32.aros/intl/configure 2019-01-19 16:10:54.000000000 +0000
107 @@ -4748,6 +4748,9 @@
109 int main ()
110 {
111 +#if defined(__AROS__)
112 + exit (1);
113 +#endif
114 signal (SIGFPE, sigfpe_handler);
115 /* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
116 #if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
117 diff -ruN binutils-2.32/ld/Makefile.in binutils-2.32.aros/ld/Makefile.in
118 --- binutils-2.32/ld/Makefile.in 2019-02-02 15:54:43.000000000 +0000
119 +++ binutils-2.32.aros/ld/Makefile.in 2019-01-19 16:10:54.000000000 +0000
120 @@ -654,6 +654,7 @@
121 earclinux_prof.c \
122 earm_wince_pe.c \
123 earmelf.c \
124 + earmelf_aros.c \
125 earmelf_fbsd.c \
126 earmelf_fuchsia.c \
127 earmelf_linux.c \
128 @@ -664,6 +665,7 @@
129 earmelf_phoenix.c \
130 earmelf_vxworks.c \
131 earmelfb.c \
132 + earmelfb_aros.c \
133 earmelfb_fbsd.c \
134 earmelfb_fuchsia.c \
135 earmelfb_linux.c \
136 @@ -875,6 +877,8 @@
137 eaarch64elf32.c \
138 eaarch64elfb.c \
139 eaarch64elf32b.c \
140 + eaarch64elf_aros.c \
141 + eaarch64elfb_aros.c \
142 eaarch64cloudabi.c \
143 eaarch64cloudabib.c \
144 eaarch64fbsd.c \
145 @@ -1197,6 +1201,8 @@
146 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf32.Po@am__quote@
147 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf32b.Po@am__quote@
148 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elfb.Po@am__quote@
149 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elf_aros.Po@am__quote@
150 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64elfb_aros.Po@am__quote@
151 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64fbsd.Po@am__quote@
152 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64fbsdb.Po@am__quote@
153 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eaarch64linux.Po@am__quote@
154 @@ -1218,6 +1224,7 @@
155 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earcv2elfx.Po@am__quote@
156 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earm_wince_pe.Po@am__quote@
157 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf.Po@am__quote@
158 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_aros.Po@am__quote@
159 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_fbsd.Po@am__quote@
160 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_fuchsia.Po@am__quote@
161 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux.Po@am__quote@
162 @@ -1228,6 +1235,7 @@
163 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_phoenix.Po@am__quote@
164 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_vxworks.Po@am__quote@
165 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb.Po@am__quote@
166 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_aros.Po@am__quote@
167 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_fbsd.Po@am__quote@
168 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_fuchsia.Po@am__quote@
169 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux.Po@am__quote@
170 @@ -2321,6 +2329,12 @@
171 $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
172 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
174 +earmelf_aros.c: $(srcdir)/emulparams/armelf_aros.sh \
175 + $(srcdir)/emulparams/armelf_linux_eabi.sh \
176 + $(srcdir)/emulparams/armelf_linux.sh \
177 + $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
178 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
179 +
180 earmelf_nacl.c: $(srcdir)/emulparams/armelf_nacl.sh \
181 $(srcdir)/emulparams/armelf_linux_eabi.sh \
182 $(srcdir)/emulparams/armelf_linux.sh \
183 @@ -2375,6 +2389,13 @@
184 $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
185 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
187 +earmelfb_aros.c: $(srcdir)/emulparams/armelfb_aros.sh \
188 + $(srcdir)/emulparams/armelf_aros.sh \
189 + $(srcdir)/emulparams/armelf_linux_eabi.sh \
190 + $(srcdir)/emulparams/armelf_linux.sh \
191 + $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
192 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
193 +
194 earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
195 $(srcdir)/emulparams/armelf_nacl.sh \
196 $(srcdir)/emulparams/armelf_linux_eabi.sh \
197 @@ -3144,6 +3165,14 @@
198 $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
199 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
201 +eaarch64elf_aros.c: $(srcdir)/emulparams/aarch64elf_aros.sh \
202 + $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
203 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
204 +
205 +eaarch64elfb_aros.c: $(srcdir)/emulparams/aarch64elfb_aros.sh $(srcdir)/emulparams/aarch64elf_aros.sh \
206 + $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
207 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
208 +
209 eaarch64linux.c: $(srcdir)/emulparams/aarch64linux.sh \
210 $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
211 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
212 diff -ruN binutils-2.32/ld/configure.tgt binutils-2.32.aros/ld/configure.tgt
213 --- binutils-2.32/ld/configure.tgt 2019-01-19 16:01:33.000000000 +0000
214 +++ binutils-2.32.aros/ld/configure.tgt 2019-01-19 16:10:54.000000000 +0000
215 @@ -45,6 +45,10 @@
216 # architecture variants should be kept together even if their names
217 # break the alpha sorting.
218 case "${targ}" in
219 +aarch64-*-aros*) targ_emul=aarch64elf_aros
220 + targ_extra_emuls=aarch64elfb_aros
221 + targ_extra_libpath=$targ_extra_emuls
222 + ;;
223 aarch64_be-*-elf) targ_emul=aarch64elfb
224 targ_extra_emuls="aarch64elf aarch64elf32 aarch64elf32b armelfb armelf" ;;
225 aarch64-*-elf | aarch64-*-rtems*)
226 @@ -128,6 +132,10 @@
227 targ_extra_emuls="armelfb armelf armelf_linux"
228 targ_extra_libpath="armelf_linux"
229 ;;
230 +arm*-*-aros*) targ_emul=armelf_aros
231 + targ_extra_emuls=armelfb_aros
232 + targ_extra_libpath=$targ_extra_emuls
233 + ;;
234 arm*-*-linux-*eabi*) targ_emul=armelf_linux_eabi
235 targ_extra_emuls="armelfb_linux_eabi"
236 targ_extra_libpath=$targ_extra_emuls
237 @@ -315,6 +323,9 @@
238 targ_extra_libpath="elf_i386 elf_iamcu elf32_x86_64 elf_l1om elf_k1om"
239 tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'`
240 ;;
241 +x86_64-*-aros*) targ_emul=elf_x86_64
242 + targ_extra_emuls=elf_i386
243 + ;;
244 i[3-7]86-*-kaos*) targ_emul=elf_i386 ;;
245 i[3-7]86-*-dragonfly*) targ_emul=elf_i386
246 targ_extra_emuls="elf_iamcu i386bsd" ;;
247 @@ -632,6 +643,7 @@
248 powerpc-*-beos*) targ_emul=aixppc ;;
249 powerpc-*-windiss*) targ_emul=elf32ppcwindiss ;;
250 powerpc-*-lynxos*) targ_emul=ppclynx ;;
251 +powerpc-*-aros*) targ_emul=elf32ppc ;;
252 pru*-*-*) targ_emul=pruelf ;;
253 riscv32*-*-linux*) targ_emul=elf32lriscv
254 targ_extra_emuls="elf32lriscv_ilp32f elf32lriscv_ilp32 elf64lriscv elf64lriscv_lp64f elf64lriscv_lp64"
255 diff -ruN binutils-2.32/ld/emulparams/aarch64elf_aros.sh binutils-2.32.aros/ld/emulparams/aarch64elf_aros.sh
256 --- binutils-2.32/ld/emulparams/aarch64elf_aros.sh 1970-01-01 00:00:00.000000000 +0000
257 +++ binutils-2.32.aros/ld/emulparams/aarch64elf_aros.sh 2019-01-19 16:10:54.000000000 +0000
258 @@ -0,0 +1 @@
259 +. ${srcdir}/emulparams/aarch64elf.sh
260 diff -ruN binutils-2.32/ld/emulparams/aarch64elfb_aros.sh binutils-2.32.aros/ld/emulparams/aarch64elfb_aros.sh
261 --- binutils-2.32/ld/emulparams/aarch64elfb_aros.sh 1970-01-01 00:00:00.000000000 +0000
262 +++ binutils-2.32.aros/ld/emulparams/aarch64elfb_aros.sh 2019-01-19 16:10:54.000000000 +0000
263 @@ -0,0 +1 @@
264 +. ${srcdir}/emulparams/aarch64elfb.sh
265 diff -ruN binutils-2.32/ld/emulparams/armelf_aros.sh binutils-2.32.aros/ld/emulparams/armelf_aros.sh
266 --- binutils-2.32/ld/emulparams/armelf_aros.sh 1970-01-01 00:00:00.000000000 +0000
267 +++ binutils-2.32.aros/ld/emulparams/armelf_aros.sh 2019-01-19 16:10:54.000000000 +0000
268 @@ -0,0 +1 @@
269 +. ${srcdir}/emulparams/armelf_linux_eabi.sh
270 diff -ruN binutils-2.32/ld/emulparams/armelfb_aros.sh binutils-2.32.aros/ld/emulparams/armelfb_aros.sh
271 --- binutils-2.32/ld/emulparams/armelfb_aros.sh 1970-01-01 00:00:00.000000000 +0000
272 +++ binutils-2.32.aros/ld/emulparams/armelfb_aros.sh 2019-01-19 16:10:54.000000000 +0000
273 @@ -0,0 +1,2 @@
274 +. ${srcdir}/emulparams/armelf_aros.sh
275 +OUTPUT_FORMAT="elf32-bigarm"