| blob | 2e85596cff3ec6b562f17a293febc6e5a51c55c7 |
1 diff -ruN gcc-5-20150208/boehm-gc/include/gc_amiga_redirects.h gcc-5-20150208.aros/boehm-gc/include/gc_amiga_redirects.h
2 --- gcc-5-20150208/boehm-gc/include/gc_amiga_redirects.h 2001-08-17 19:30:51.000000000 +0100
3 +++ gcc-5-20150208.aros/boehm-gc/include/gc_amiga_redirects.h 2015-02-11 12:11:29.591059272 +0000
4 @@ -2,7 +2,7 @@
6 # define GC_AMIGA_REDIRECTS_H
8 -# if ( defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB) )
9 +# if !defined(__AROS__) && ( defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB) )
10 extern void *GC_amiga_realloc(void *old_object,size_t new_size_in_bytes);
11 # define GC_realloc(a,b) GC_amiga_realloc(a,b)
12 extern void GC_amiga_set_toany(void (*func)(void));
13 diff -ruN gcc-5-20150208/boehm-gc/include/gc.h gcc-5-20150208.aros/boehm-gc/include/gc.h
14 --- gcc-5-20150208/boehm-gc/include/gc.h 2014-10-23 09:39:19.000000000 +0100
15 +++ gcc-5-20150208.aros/boehm-gc/include/gc.h 2015-02-11 12:11:10.150863455 +0000
16 @@ -1056,7 +1056,7 @@
17 GC_API void GC_win32_free_heap ();
18 #endif
20 -#if ( defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB) )
21 +#if !defined(__AROS__) && ( defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB) )
22 /* Allocation really goes through GC_amiga_allocwrapper_do */
23 # include "gc_amiga_redirects.h"
24 #endif
25 diff -ruN gcc-5-20150208/configure gcc-5-20150208.aros/configure
26 --- gcc-5-20150208/configure 2015-01-09 21:23:09.000000000 +0000
27 +++ gcc-5-20150208.aros/configure 2015-02-08 21:24:55.289352061 +0000
28 @@ -3826,6 +3826,9 @@
29 powerpcle-*-solaris*)
30 noconfigdirs="$noconfigdirs gdb sim tcl tk itcl"
31 ;;
32 + *-*-aros*)
33 + noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl tix gnuserv gdb"
34 + ;;
35 powerpc-*-beos*)
36 noconfigdirs="$noconfigdirs gdb"
37 ;;
38 @@ -3965,6 +3968,8 @@
39 rs6000-*-aix*)
40 host_makefile_frag="config/mh-ppc-aix"
41 ;;
42 + *-*-aros*)
43 + ;;
44 esac
45 fi
47 diff -ruN gcc-5-20150208/configure.ac gcc-5-20150208.aros/configure.ac
48 --- gcc-5-20150208/configure.ac 2015-01-09 21:23:09.000000000 +0000
49 +++ gcc-5-20150208.aros/configure.ac 2015-02-08 21:24:55.289352061 +0000
50 @@ -1176,6 +1176,9 @@
51 powerpcle-*-solaris*)
52 noconfigdirs="$noconfigdirs gdb sim tcl tk itcl"
53 ;;
54 + *-*-aros*)
55 + noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl tix gnuserv gdb"
56 + ;;
57 powerpc-*-beos*)
58 noconfigdirs="$noconfigdirs gdb"
59 ;;
60 @@ -1296,6 +1299,8 @@
61 rs6000-*-aix*)
62 host_makefile_frag="config/mh-ppc-aix"
63 ;;
64 + *-*-aros*)
65 + ;;
66 esac
67 fi
69 diff -ruN gcc-5-20150208/fixincludes/configure gcc-5-20150208.aros/fixincludes/configure
70 --- gcc-5-20150208/fixincludes/configure 2012-05-29 20:28:57.000000000 +0100
71 +++ gcc-5-20150208.aros/fixincludes/configure 2015-02-08 21:24:55.289352061 +0000
72 @@ -4712,6 +4712,7 @@
73 fi
74 else
75 case $host in
76 + *-*-aros* | \
77 i?86-*-msdosdjgpp* | \
78 i?86-*-mingw32* | \
79 x86_64-*-mingw32* | \
80 diff -ruN gcc-5-20150208/fixincludes/configure.ac gcc-5-20150208.aros/fixincludes/configure.ac
81 --- gcc-5-20150208/fixincludes/configure.ac 2012-05-29 20:28:57.000000000 +0100
82 +++ gcc-5-20150208.aros/fixincludes/configure.ac 2015-02-08 21:24:55.289352061 +0000
83 @@ -50,6 +50,7 @@
84 TARGET=oneprocess
85 fi],
86 [case $host in
87 + *-*-aros* | \
88 i?86-*-msdosdjgpp* | \
89 i?86-*-mingw32* | \
90 x86_64-*-mingw32* | \
91 diff -ruN gcc-5-20150208/gcc/config/arm/aros.h gcc-5-20150208.aros/gcc/config/arm/aros.h
92 --- gcc-5-20150208/gcc/config/arm/aros.h 1970-01-01 01:00:00.000000000 +0100
93 +++ gcc-5-20150208.aros/gcc/config/arm/aros.h 2015-02-08 21:24:55.289352061 +0000
94 @@ -0,0 +1,82 @@
95 +/* Configuration file for ARM AROS EABI targets.
96 + Copyright (C) 2004, 2005, 2006, 2007, 2010
97 + Free Software Foundation, Inc.
98 + Contributed by Pavel Fedin
99 + Based on linux-eabi.h and other AROS targets
100 +
101 + This file is part of GCC.
102 +
103 + GCC is free software; you can redistribute it and/or modify it
104 + under the terms of the GNU General Public License as published
105 + by the Free Software Foundation; either version 3, or (at your
106 + option) any later version.
107 +
108 + GCC is distributed in the hope that it will be useful, but WITHOUT
109 + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
110 + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
111 + License for more details.
112 +
113 + You should have received a copy of the GNU General Public License
114 + along with GCC; see the file COPYING3. If not see
115 + <http://www.gnu.org/licenses/>. */
116 +
117 +/* On EABI GNU/Linux, we want both the BPABI builtins and the
118 + GNU/Linux builtins. */
119 +#undef TARGET_OS_CPP_BUILTINS
120 +#define TARGET_OS_CPP_BUILTINS() \
121 + do \
122 + { \
123 + TARGET_BPABI_CPP_BUILTINS(); \
124 + builtin_define_std ("AROS"); \
125 + builtin_define ("AMIGA"); \
126 + builtin_define ("_AMIGA"); \
127 + builtin_assert ("system=posix"); \
128 + if (flag_pic) \
129 + { \
130 + builtin_define ("__PIC__"); \
131 + builtin_define ("__pic__"); \
132 + } \
133 + } \
134 + while (false)
135 +
136 +/* We default to a softfp ABI so that we are compatible
137 + with the Linux EABI (as used by the linker). */
138 +#undef TARGET_DEFAULT_FLOAT_ABI
139 +#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFTFP
140 +
141 +/* We default to the "aapcs-linux" ABI so that enums are int-sized by
142 + default. */
143 +#undef ARM_DEFAULT_ABI
144 +#define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
145 +
146 +/* Default to armv5t so that thumb shared libraries work.
147 + The ARM10TDMI core is the default for armv5t, so set
148 + SUBTARGET_CPU_DEFAULT to achieve this. */
149 +#undef SUBTARGET_CPU_DEFAULT
150 +#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
151 +
152 +/* TARGET_BIG_ENDIAN_DEFAULT is set in
153 + config.gcc for big endian configurations. */
154 +#undef TARGET_LINKER_EMULATION
155 +#if TARGET_BIG_ENDIAN_DEFAULT
156 +#define TARGET_LINKER_EMULATION "armelfb_aros"
157 +#else
158 +#define TARGET_LINKER_EMULATION "armelf_aros"
159 +#endif
160 +
161 +#undef SUBTARGET_CPP_SPEC
162 +#define SUBTARGET_CPP_SPEC "-D__ELF__ %{!nostdinc:-isystem %R/include%{!nostdc:%{!noposixc: -isystem %R/include/aros/posixc} -isystem %R/include/aros/stdc}}"
163 +
164 +#undef SUBTARGET_EXTRA_LINK_SPEC
165 +#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION
166 +
167 +/* Provide a LINK_SPEC appropriate for AROS. */
168 +#undef LINK_SPEC
169 +#define LINK_SPEC "-m armelf_aros -L %R/lib"
170 +
171 +/* Use own supplement to libgcc. */
172 +#undef LIBGCC_SPEC
173 +#define LIBGCC_SPEC "-laeabi -lgcc"
174 +
175 +/* FIXME: AROS doesn't support dw2 unwinding yet. */
176 +#undef MD_FALLBACK_FRAME_STATE_FOR
177 diff -ruN gcc-5-20150208/gcc/config/arm/t-aros gcc-5-20150208.aros/gcc/config/arm/t-aros
178 --- gcc-5-20150208/gcc/config/arm/t-aros 1970-01-01 01:00:00.000000000 +0100
179 +++ gcc-5-20150208.aros/gcc/config/arm/t-aros 2015-02-08 21:24:55.289352061 +0000
180 @@ -0,0 +1,21 @@
181 +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
182 +# 2008, 2010 Free Software Foundation, Inc.
183 +#
184 +# This file is part of GCC.
185 +#
186 +# GCC is free software; you can redistribute it and/or modify
187 +# it under the terms of the GNU General Public License as published by
188 +# the Free Software Foundation; either version 3, or (at your option)
189 +# any later version.
190 +#
191 +# GCC is distributed in the hope that it will be useful,
192 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
193 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
194 +# GNU General Public License for more details.
195 +#
196 +# You should have received a copy of the GNU General Public License
197 +# along with GCC; see the file COPYING3. If not see
198 +# <http://www.gnu.org/licenses/>.
199 +
200 +MULTILIB_OPTIONS = marm mfloat-abi=hard
201 +MULTILIB_DIRNAMES = arm fpu
202 diff -ruN gcc-5-20150208/gcc/config/aros.h gcc-5-20150208.aros/gcc/config/aros.h
203 --- gcc-5-20150208/gcc/config/aros.h 1970-01-01 01:00:00.000000000 +0100
204 +++ gcc-5-20150208.aros/gcc/config/aros.h 2015-02-08 21:24:55.289352061 +0000
205 @@ -0,0 +1,113 @@
206 +/* Definitions for AROS
207 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
208 + Contributed by Fabio Alemagna
209 + Based upon linux.h, contributed by Eric Youngdale.
210 +
211 +This file is part of GNU CC.
212 +
213 +GNU CC is free software; you can redistribute it and/or modify
214 +it under the terms of the GNU General Public License as published by
215 +the Free Software Foundation; either version 2, or (at your option)
216 +any later version.
217 +
218 +GNU CC is distributed in the hope that it will be useful,
219 +but WITHOUT ANY WARRANTY; without even the implied warranty of
220 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
221 +GNU General Public License for more details.
222 +
223 +You should have received a copy of the GNU General Public License
224 +along with GNU CC; see the file COPYING. If not, write to
225 +the Free Software Foundation, 59 Temple Place - Suite 330,
226 +Boston, MA 02111-1307, USA. */
227 +
228 +/* Don't assume anything about the header files. */
229 +#define NO_IMPLICIT_EXTERN_C
230 +
231 +#undef SIZE_TYPE
232 +#define SIZE_TYPE "long unsigned int"
233 +
234 +#undef WCHAR_TYPE
235 +#define WCHAR_TYPE "char"
236 +
237 +#undef WCHAR_TYPE_SIZE
238 +#define WCHAR_TYPE_SIZE 8
239 +
240 +#undef PTRDIFF_TYPE
241 +#define PTRDIFF_TYPE "long int"
242 +
243 +#undef TARGET_OS_CPP_BUILTINS
244 +#define TARGET_OS_CPP_BUILTINS() \
245 + do \
246 + { \
247 + builtin_define_std ("AROS"); \
248 + builtin_define ("AMIGA"); \
249 + builtin_define ("_AMIGA"); \
250 + builtin_define ("__ELF__"); \
251 + builtin_assert ("system=posix"); \
252 + } \
253 + while (0)
254 +
255 +#undef ASM_APP_ON
256 +#define ASM_APP_ON "#APP\n"
257 +
258 +#undef ASM_APP_OFF
259 +#define ASM_APP_OFF "#NO_APP\n"
260 +
261 +#undef MD_EXEC_PREFIX
262 +#undef MD_STARTFILE_PREFIX
263 +
264 +/* Provide a STARTFILE_SPEC appropriate for AROS. AROS has its own
265 + set of startup files which also take care of handling C++
266 + constructors/destructors. */
267 +
268 +#undef STARTFILE_SPEC
269 +#define STARTFILE_SPEC \
270 + "startup.o%s %{detach:detach.o%s} %{nix:nixmain.o%s}"
271 +
272 +/* Provide a ENDFILE_SPEC appropriate for AROS. */
273 +
274 +#undef ENDFILE_SPEC
275 +#define ENDFILE_SPEC \
276 + "-lautoinit"
277 +
278 +/* The compiler is configured with ONLY the gcc/g++ standard headers.
279 + N.B-: NATIVE_SYSTEM_HEADER_DIR must come before GCC_INCLUDE_DIR on AROS */
280 +#undef INCLUDE_DEFAULTS
281 +#define INCLUDE_DEFAULTS \
282 +{ \
283 + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
284 + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \
285 + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \
286 + { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 }, \
287 + { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
288 + { 0, 0, 0, 0, 0, 0 } \
289 +};
290 +
291 +#undef CPP_SPEC
292 +#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} %{nix:-D__NIX__} %{!nostdinc:%{!nostdc:%{!noposixc:-isystem %R/include/aros/posixc} -isystem %R/include/aros/stdc} -isystem %R/include}"
293 +
294 +/* This is for -profile to use -lc_p instead of -lc. */
295 +#ifndef CC1_SPEC
296 +#define CC1_SPEC "%{profile:-p}"
297 +#endif
298 +
299 +/* The GNU C++ standard library requires that these macros be defined. */
300 +#undef CPLUSPLUS_CPP_SPEC
301 +#define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
302 +
303 +#undef LIB_SPEC
304 +#define LIB_SPEC \
305 + "--start-group -lmui -larossupport -lamiga %{!nostartfiles:%{!static:%{!nostdc:%{!noposixc:-lposixc} -lstdcio -lstdc}}%{static:%{!nostdc:-lstdc.static}}} -lcodesets -lkeymap -lexpansion -lcommodities -ldiskfont -lasl -lmuimaster -ldatatypes -lcybergraphics -lworkbench -licon -lintuition -lgadtools -llayers -laros -lpartition -liffparse -lgraphics -llocale -ldos -lutility -loop %{!nosysbase:-lexec} -lautoinit -llibinit %{nostartfiles:%{static:-lstdc.static}} --end-group"
306 +
307 +#undef LIBSTDCXX_STATIC
308 +#define LIBSTDCXX_STATIC "pthread"
309 +
310 +#if !defined(USE_GNULIBC_1) && defined(HAVE_LD_EH_FRAME_HDR)
311 +#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
312 +#endif
313 +
314 +/* AROS uses its own collect-like program for the moment. */
315 +#undef LINKER_NAME
316 +#define LINKER_NAME "collect-aros"
317 +
318 +#define TARGET_HAS_F_SETLKW
319 diff -ruN gcc-5-20150208/gcc/config/aros.opt gcc-5-20150208.aros/gcc/config/aros.opt
320 --- gcc-5-20150208/gcc/config/aros.opt 1970-01-01 01:00:00.000000000 +0100
321 +++ gcc-5-20150208.aros/gcc/config/aros.opt 2015-02-08 21:24:55.289352061 +0000
322 @@ -0,0 +1,35 @@
323 +; Processor-independent options for AROS.
324 +
325 +; Copyright (C) 2015 Free Software Foundation, Inc.
326 +;
327 +; This file is part of GCC.
328 +;
329 +; GCC is free software; you can redistribute it and/or modify it under
330 +; the terms of the GNU General Public License as published by the Free
331 +; Software Foundation; either version 3, or (at your option) any later
332 +; version.
333 +;
334 +; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
335 +; WARRANTY; without even the implied warranty of MERCHANTABILITY or
336 +; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
337 +; for more details.
338 +;
339 +; You should have received a copy of the GNU General Public License
340 +; along with GCC; see the file COPYING3. If not see
341 +; <http://www.gnu.org/licenses/>.
342 +
343 +posix
344 +Driver
345 +
346 +noposixc
347 +Driver
348 +
349 +nostdc
350 +Driver
351 +
352 +nosysbase
353 +Driver
354 +
355 +nix
356 +Driver
357 +
358 diff -ruN gcc-5-20150208/gcc/config/i386/aros64.h gcc-5-20150208.aros/gcc/config/i386/aros64.h
359 --- gcc-5-20150208/gcc/config/i386/aros64.h 1970-01-01 01:00:00.000000000 +0100
360 +++ gcc-5-20150208.aros/gcc/config/i386/aros64.h 2015-02-08 21:24:55.289352061 +0000
361 @@ -0,0 +1,34 @@
362 +/* Definitions for AMD x86_64 running AROS systems with ELF64 format.
363 + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
364 + Free Software Foundation, Inc.
365 + Contributed by Stanislaw Szymczyk <sszymczy@gmail.com>. Based on aros.h.
366 +
367 +This file is part of GNU CC.
368 +
369 +GNU CC is free software; you can redistribute it and/or modify
370 +it under the terms of the GNU General Public License as published by
371 +the Free Software Foundation; either version 2, or (at your option)
372 +any later version.
373 +
374 +GNU CC is distributed in the hope that it will be useful,
375 +but WITHOUT ANY WARRANTY; without even the implied warranty of
376 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
377 +GNU General Public License for more details.
378 +
379 +You should have received a copy of the GNU General Public License
380 +along with GNU CC; see the file COPYING. If not, write to
381 +the Free Software Foundation, 59 Temple Place - Suite 330,
382 +Boston, MA 02111-1307, USA. */
383 +
384 +/* The svr4 ABI for the i386 says that records and unions are returned
385 + in memory. In the 64bit compilation we will turn this flag off in
386 + override_options, as we never do pcc_struct_return scheme on this target. */
387 +#undef DEFAULT_PCC_STRUCT_RETURN
388 +#define DEFAULT_PCC_STRUCT_RETURN 1
389 +
390 +/* Provide a LINK_SPEC appropriate for AROS. */
391 +
392 +#undef LINK_SPEC
393 +#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} -L %R/lib"
394 +
395 +/* FIXME: AROS doesn't support dw2 unwinding yet. */
396 diff -ruN gcc-5-20150208/gcc/config/i386/aros.h gcc-5-20150208.aros/gcc/config/i386/aros.h
397 --- gcc-5-20150208/gcc/config/i386/aros.h 1970-01-01 01:00:00.000000000 +0100
398 +++ gcc-5-20150208.aros/gcc/config/i386/aros.h 2015-02-08 21:24:55.289352061 +0000
399 @@ -0,0 +1,25 @@
400 +/* Definitions for Intel 386 running AROS systems with ELF format.
401 + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
402 + Free Software Foundation, Inc.
403 + Contributed by Fabio Alemagna.
404 + Based upon i386/linux.h by Eric Youngdale.
405 +
406 +This file is part of GNU CC.
407 +
408 +GNU CC is free software; you can redistribute it and/or modify
409 +it under the terms of the GNU General Public License as published by
410 +the Free Software Foundation; either version 2, or (at your option)
411 +any later version.
412 +
413 +GNU CC is distributed in the hope that it will be useful,
414 +but WITHOUT ANY WARRANTY; without even the implied warranty of
415 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
416 +GNU General Public License for more details.
417 +
418 +You should have received a copy of the GNU General Public License
419 +along with GNU CC; see the file COPYING. If not, write to
420 +the Free Software Foundation, 59 Temple Place - Suite 330,
421 +Boston, MA 02111-1307, USA. */
422 +
423 +#undef LINK_SPEC
424 +#define LINK_SPEC "-m elf_i386 -L%R/lib"
425 diff -ruN gcc-5-20150208/gcc/config/m68k/m68k.c gcc-5-20150208.aros/gcc/config/m68k/m68k.c
426 --- gcc-5-20150208/gcc/config/m68k/m68k.c 2015-01-15 13:28:42.000000000 +0000
427 +++ gcc-5-20150208.aros/gcc/config/m68k/m68k.c 2015-02-08 21:24:55.289352061 +0000
428 @@ -4469,7 +4469,7 @@
429 else if (letter == '/')
430 asm_fprintf (file, "%R");
431 else if (letter == '?')
432 - asm_fprintf (file, m68k_library_id_string);
433 + asm_fprintf (file, "%s", m68k_library_id_string);
434 else if (letter == 'p')
435 {
436 output_addr_const (file, op);
437 diff -ruN gcc-5-20150208/gcc/config/m68k/m68k.h gcc-5-20150208.aros/gcc/config/m68k/m68k.h
438 --- gcc-5-20150208/gcc/config/m68k/m68k.h 2015-01-05 12:33:28.000000000 +0000
439 +++ gcc-5-20150208.aros/gcc/config/m68k/m68k.h 2015-02-08 21:24:55.289352061 +0000
440 @@ -329,7 +329,9 @@
441 register elimination. */
442 #define FIRST_PSEUDO_REGISTER 25
444 -/* All m68k targets (except AmigaOS) use %a5 as the PIC register */
445 +/* All m68k targets (except AmigaOS) use %a5 as the PIC register.
446 + * On AmigaOS, we use %a4
447 + */
448 #define PIC_OFFSET_TABLE_REGNUM \
449 (!flag_pic ? INVALID_REGNUM \
450 : reload_completed ? REGNO (pic_offset_table_rtx) \
451 @@ -419,7 +421,8 @@
452 /* Most m68k targets use %a6 as a frame pointer. The AmigaOS
453 ABI uses %a6 for shared library calls, therefore the frame
454 pointer is shifted to %a5 on this target. */
455 -#define FRAME_POINTER_REGNUM A6_REG
456 +#define FRAME_POINTER_REGNUM A5_REG
457 +#define PIC_REG A4_REG
459 /* Base register for access to arguments of the function.
460 * This isn't a hardware register. It will be eliminated to the
461 diff -ruN gcc-5-20150208/gcc/config/m68k/m68k.md gcc-5-20150208.aros/gcc/config/m68k/m68k.md
462 --- gcc-5-20150208/gcc/config/m68k/m68k.md 2015-01-22 21:24:28.000000000 +0000
463 +++ gcc-5-20150208.aros/gcc/config/m68k/m68k.md 2015-02-08 21:24:55.289352061 +0000
464 @@ -133,7 +133,8 @@
465 [(D0_REG 0)
466 (A0_REG 8)
467 (A1_REG 9)
468 - (PIC_REG 13)
469 + (A4_REG 12)
470 + (A5_REG 13)
471 (A6_REG 14)
472 (SP_REG 15)
473 (FP0_REG 16)
474 @@ -7093,7 +7094,7 @@
475 {
476 if (TARGET_ID_SHARED_LIBRARY)
477 {
478 - operands[1] = gen_rtx_REG (Pmode, PIC_REG);
479 + operands[1] = gen_rtx_REG (Pmode, A4_REG);
480 return MOTOROLA ? "move.l %?(%1),%0" : "movel %1@(%?), %0";
481 }
482 else if (MOTOROLA)
483 diff -ruN gcc-5-20150208/gcc/config/m68k/t-aros gcc-5-20150208.aros/gcc/config/m68k/t-aros
484 --- gcc-5-20150208/gcc/config/m68k/t-aros 1970-01-01 01:00:00.000000000 +0100
485 +++ gcc-5-20150208.aros/gcc/config/m68k/t-aros 2015-02-08 21:24:55.289352061 +0000
486 @@ -0,0 +1,2 @@
487 +# Custom multilibs for AROS
488 +M68K_MLIB_CPU += && match(MLIB, "^68")
489 diff -ruN gcc-5-20150208/gcc/config/rs6000/aros.h gcc-5-20150208.aros/gcc/config/rs6000/aros.h
490 --- gcc-5-20150208/gcc/config/rs6000/aros.h 1970-01-01 01:00:00.000000000 +0100
491 +++ gcc-5-20150208.aros/gcc/config/rs6000/aros.h 2015-02-08 21:24:55.289352061 +0000
492 @@ -0,0 +1,151 @@
493 +/* Definitions for Powerpc running AROS systems with ELF format.
494 + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002
495 + Free Software Foundation, Inc.
496 + Contributed by Markus Weiss.
497 + Based upon i386/aros.h by Fabio Alemagna.
498 +
499 +This file is part of GNU CC.
500 +
501 +GNU CC is free software; you can redistribute it and/or modify
502 +it under the terms of the GNU General Public License as published by
503 +the Free Software Foundation; either version 2, or (at your option)
504 +any later version.
505 +
506 +GNU CC is distributed in the hope that it will be useful,
507 +but WITHOUT ANY WARRANTY; without even the implied warranty of
508 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
509 +GNU General Public License for more details.
510 +
511 +You should have received a copy of the GNU General Public License
512 +along with GNU CC; see the file COPYING. If not, write to
513 +the Free Software Foundation, 59 Temple Place - Suite 330,
514 +Boston, MA 02111-1307, USA. */
515 +
516 +/* Symbols missing in comparison to i386/aros.h are either
517 + defined in elfos.h, rs6000/rs6000.h rs6000/sysv4.h
518 + or not needed for PowerPC.
519 +*/
520 +
521 +/* We need to define __powerpc__. */
522 +
523 +#undef TARGET_OS_CPP_BUILTINS
524 +#define TARGET_OS_CPP_BUILTINS() \
525 + do \
526 + { \
527 + builtin_define_std ("AROS"); \
528 + builtin_define ("AMIGA"); \
529 + builtin_define ("_AMIGA"); \
530 + builtin_define ("__powerpc__"); \
531 + builtin_define ("__ELF__"); \
532 + builtin_assert ("system=posix"); \
533 + if (flag_pic) \
534 + { \
535 + builtin_define ("__PIC__"); \
536 + builtin_define ("__pic__"); \
537 + } \
538 + } \
539 + while (0)
540 +
541 +/* This one taken from linux.h. */
542 +/* We are 32-bit all the time, so optimize a little. */
543 +#undef TARGET_64BIT
544 +#define TARGET_64BIT 0
545 +
546 +/* The svr4 ABI for the i386 says that records and unions are returned
547 + in memory. */
548 +/*#undef DEFAULT_PCC_STRUCT_RETURN
549 +#define DEFAULT_PCC_STRUCT_RETURN 1
550 +see rs6000/rs6000.h
551 +*/
552 +
553 +/*
554 +#undef ASM_COMMENT_START
555 +#define ASM_COMMENT_START "#"
556 +see rs6000/rs6000.h
557 +*/
558 +
559 +/*
560 +#undef DBX_REGISTER_NUMBER
561 +#define DBX_REGISTER_NUMBER(n) \
562 + (TARGET_64BIT ? dbx64_register_map[n] : svr4_dbx_register_map[n])
563 +see rs6000/sysv4.h
564 +*/
565 +
566 +/* Output assembler code to FILE to call the profiler.
567 + To the best of my knowledge, no Linux libc has required the label
568 + argument to mcount. */
569 +
570 +/*
571 +#define NO_PROFILE_COUNTERS 1
572 +not used by other similar ppc compilers
573 +only in darwin.h rs6000/linux64.h rs6000/rs6000.c
574 +*/
575 +
576 +/*
577 +#undef MCOUNT_NAME
578 +#define MCOUNT_NAME "mcount"
579 +see rs6000/sysv4.h RS6000_MCOUNT
580 +*/
581 +
582 +/* The GLIBC version of mcount for the x86 assumes that there is a
583 + frame, so we cannot allow profiling without a frame pointer. */
584 +/*
585 +#undef SUBTARGET_FRAME_POINTER_REQUIRED
586 +#define SUBTARGET_FRAME_POINTER_REQUIRED crtl->profile
587 +seems to be handled by rs6000/rs6000.h
588 +*/
589 +
590 +#undef CC1_SPEC
591 +#define CC1_SPEC "%(cc1_cpu) %{profile:-p}"
592 +
593 +/* Provide a LINK_SPEC appropriate for AROS. */
594 +
595 +#undef LINK_SPEC
596 +#define LINK_SPEC "-m elf32ppc -L %R/lib"
597 +
598 +/* A C statement (sans semicolon) to output to the stdio stream
599 + FILE the assembler definition of uninitialized global DECL named
600 + NAME whose size is SIZE bytes and alignment is ALIGN bytes.
601 + Try to use asm_output_aligned_bss to implement this macro. */
602 +/*
603 +#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
604 + asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
605 +see rs6000/sysv4.h
606 +*/
607 +
608 +/* A C statement to output to the stdio stream FILE an assembler
609 + command to advance the location counter to a multiple of 1<<LOG
610 + bytes if it is within MAX_SKIP bytes.
611 +
612 + This is used to align code labels according to Intel recommendations. */
613 +/*
614 +#ifdef HAVE_GAS_MAX_SKIP_P2ALIGN
615 +#define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP) \
616 + do { \
617 + if ((LOG) != 0) { \
618 + if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG)); \
619 + else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \
620 + } \
621 + } while (0)
622 +#endif
623 +see rs6000/sysv4.h
624 +*/
625 +
626 +/* Handle special EH pointer encodings. Absolute, pc-relative, and
627 + indirect are handled automatically. */
628 +/*
629 +#define ASM_MAYBE_OUTPUT_ENCODED_ADDR_RTX(FILE, ENCODING, SIZE, ADDR, DONE) \
630 + do { \
631 + if ((SIZE) == 4 && ((ENCODING) & 0x70) == DW_EH_PE_datarel) \
632 + { \
633 + fputs (ASM_LONG, FILE); \
634 + assemble_name (FILE, XSTR (ADDR, 0)); \
635 + fputs (((ENCODING) & DW_EH_PE_indirect ? "@GOT" : "@GOTOFF"), FILE); \
636 + goto DONE; \
637 + } \
638 + } while (0)
639 +not used for PowerPC
640 +*/
641 +
642 +/* FIXME: AROS doesn't support dw2 unwinding yet. */
643 +#undef MD_FALLBACK_FRAME_STATE_FOR
644 diff -ruN gcc-5-20150208/gcc/config/rs6000/rs6000.c gcc-5-20150208.aros/gcc/config/rs6000/rs6000.c
645 --- gcc-5-20150208/gcc/config/rs6000/rs6000.c 2015-01-23 23:02:25.000000000 +0000
646 +++ gcc-5-20150208.aros/gcc/config/rs6000/rs6000.c 2015-02-08 21:24:55.289352061 +0000
647 @@ -1316,6 +1316,8 @@
648 false },
649 { "shortcall", 0, 0, false, true, true, rs6000_handle_longcall_attribute,
650 false },
651 + { "stackparm", 0, 0, false, true, true, rs6000_handle_longcall_attribute,
652 + false },
653 { "ms_struct", 0, 0, false, false, false, rs6000_handle_struct_attribute,
654 false },
655 { "gcc_struct", 0, 0, false, false, false, rs6000_handle_struct_attribute,
656 @@ -9269,6 +9271,9 @@
657 && !lookup_attribute ("shortcall", TYPE_ATTRIBUTES (fntype))))
658 cum->call_cookie |= CALL_LONG;
660 + cum->stackparm = fntype && lookup_attribute("stackparm",
661 + TYPE_ATTRIBUTES(fntype));
662 +
663 if (TARGET_DEBUG_ARG)
664 {
665 fprintf (stderr, "\ninit_cumulative_args:");
666 @@ -10404,6 +10409,9 @@
668 rs6000_discover_homogeneous_aggregate (mode, type, &elt_mode, &n_elts);
670 + if (cum->stackparm)
671 + return NULL_RTX;
672 +
673 if (TARGET_MACHO && rs6000_darwin64_struct_check_p (mode, type))
674 {
675 rtx rslt = rs6000_darwin64_record_arg (cum, type, named, /*retval= */false);
676 @@ -11006,6 +11014,9 @@
677 int first_reg_offset;
678 alias_set_type set;
680 + if (cum->stackparm)
681 + return;
682 +
683 /* Skip the last named argument. */
684 next_cum = *get_cumulative_args (cum);
685 rs6000_function_arg_advance_1 (&next_cum, mode, type, true, 0);
686 diff -ruN gcc-5-20150208/gcc/config/rs6000/rs6000.h gcc-5-20150208.aros/gcc/config/rs6000/rs6000.h
687 --- gcc-5-20150208/gcc/config/rs6000/rs6000.h 2015-01-16 16:31:37.000000000 +0000
688 +++ gcc-5-20150208.aros/gcc/config/rs6000/rs6000.h 2015-02-08 21:24:55.289352061 +0000
689 @@ -1765,6 +1765,7 @@
690 int nargs_prototype; /* # args left in the current prototype */
691 int prototype; /* Whether a prototype was defined */
692 int stdarg; /* Whether function is a stdarg function. */
693 + int stackparm; /* Whether function has all args on the stack */
694 int call_cookie; /* Do special things for this call */
695 int sysv_gregno; /* next available GP register */
696 int intoffset; /* running offset in struct (darwin64) */
697 diff -ruN gcc-5-20150208/gcc/config/t-aros gcc-5-20150208.aros/gcc/config/t-aros
698 --- gcc-5-20150208/gcc/config/t-aros 1970-01-01 01:00:00.000000000 +0100
699 +++ gcc-5-20150208.aros/gcc/config/t-aros 2015-02-08 21:24:55.289352061 +0000
700 @@ -0,0 +1,29 @@
701 +# In AROS, "/usr" is a four-letter word.
702 +# Must match NATIVE_SYSTEM_HEADER_COMPONENT in aros.h !
703 +NATIVE_SYSTEM_HEADER_DIR = /include
704 +
705 +# Don't add AROS target include path when compiling host compiler
706 +CPPFLAGS =
707 +
708 +# Copy AROS specific include replacement files
709 +LIBGCC_DEPS += stmp-aros-hrds
710 +
711 +EXTRA_AROS_HEADERS = aros/types/size_t.h aros/types/ptrdiff_t.h \
712 + aros/types/wchar_t.h aros/types/wint_t.h aros/types/null.h
713 +
714 +stmp-int-hdrs : | include/aros/types
715 +
716 +include/aros/types : $(addprefix $(srcdir)/ginclude/,$(EXTRA_AROS_HEADERS))
717 + -if [ -d include ] ; then true; else mkdir include; chmod a+rx include; fi
718 + -if [ -d include/aros/types ] ; \
719 + then true; \
720 + else \
721 + mkdir include/aros; chmod a+rx include/aros; \
722 + mkdir include/aros/types; chmod a+rx include/aros/types; \
723 + fi
724 + for file in $(EXTRA_AROS_HEADERS); do \
725 + $(STAMP) include/$$file; \
726 + rm -fr include/$$file; \
727 + cp $(srcdir)/ginclude/$$file include/$$file; \
728 + chmod a+r include/$$file; \
729 + done
730 diff -ruN gcc-5-20150208/gcc/config.build gcc-5-20150208.aros/gcc/config.build
731 --- gcc-5-20150208/gcc/config.build 2015-01-05 12:33:28.000000000 +0000
732 +++ gcc-5-20150208.aros/gcc/config.build 2015-02-08 21:24:55.289352061 +0000
733 @@ -102,6 +102,9 @@
734 # HP 9000 series 300
735 build_install_headers_dir=install-headers-cpio
736 ;;
737 + *-*-aros*)
738 + build_xm_file=xm-aros.h
739 + ;;
740 *-*-sysv*)
741 # All other System V variants.
742 build_install_headers_dir=install-headers-cpio
743 diff -ruN gcc-5-20150208/gcc/config.gcc gcc-5-20150208.aros/gcc/config.gcc
744 --- gcc-5-20150208/gcc/config.gcc 2015-01-15 20:11:12.000000000 +0000
745 +++ gcc-5-20150208.aros/gcc/config.gcc 2015-02-08 21:24:55.289352061 +0000
746 @@ -774,6 +774,15 @@
747 ;;
748 esac
749 ;;
750 +*-*-aros*)
751 + gas=yes
752 + gnu_ld=yes
753 + thread_file=posix
754 + use_collect2=no
755 + xm_defines='STDC_HEADERS=1'
756 + extra_options="${extra_options} aros.opt"
757 + ;;
758 +
759 *-*-openbsd*)
760 tmake_file="t-openbsd"
761 case ${enable_threads} in
762 @@ -956,6 +965,16 @@
763 tm_file="${tm_file} vms/vms.h alpha/vms.h"
764 tmake_file="${tmake_file} alpha/t-vms"
765 ;;
766 +arm*-*-aros*)
767 + tm_file="dbxelf.h elfos.h arm/elf.h arm/bpabi.h aros.h arm/aros.h arm/aout.h arm/arm.h"
768 + tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
769 + tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf arm/t-arm-softfp arm/t-bpabi arm/t-aros t-aros"
770 + xm_file="xm-aros.h"
771 + # The BPABI long long divmod functions return a 128-bit value in
772 + # registers r0-r3. Correctly modeling that requires the use of
773 + # TImode.
774 + need_64bit_hwint=yes
775 + ;;
776 arc*-*-elf*)
777 extra_headers="arc-simd.h"
778 tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
779 @@ -1540,6 +1559,16 @@
780 done
781 TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
782 ;;
783 +i[34567]86-*-aros*)
784 + tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h aros.h i386/aros.h"
785 + xm_file=xm-aros.h
786 + tmake_file="${tmake_file} i386/t-i386elf t-aros"
787 + ;;
788 +x86_64-*-aros*)
789 + tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/x86-64.h aros.h i386/aros64.h"
790 + tmake_file="${tmake_file} i386/t-i386elf t-aros"
791 + xm_file=xm-aros.h
792 + ;;
793 i[34567]86-pc-msdosdjgpp*)
794 xm_file=i386/xm-djgpp.h
795 tm_file="dbxcoff.h ${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/djgpp.h i386/djgpp-stdint.h"
796 @@ -1837,6 +1866,16 @@
797 thread_file='posix'
798 fi
799 ;;
800 +m68k-*-aros*)
801 + default_m68k_cpu=68000
802 + default_cf_cpu=5206
803 + tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h newlib-stdint.h m68k/m68kemb.h m68k/m68020-elf.h"
804 + tm_file="${tm_file} aros.h"
805 + tm_defines="${tm_defines} MOTOROLA=1"
806 + tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-m68kelf"
807 + tmake_file="$tmake_file m68k/t-aros m68k/t-mlibs t-aros"
808 + extra_parts="crtbegin.o crtend.o"
809 + ;;
810 m68k-*-elf* | fido-*-elf*)
811 case ${target} in
812 fido-*-elf*)
813 @@ -2333,6 +2372,13 @@
814 extra_options="${extra_options} rs6000/sysv4.opt"
815 tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-rtems rs6000/t-ppccomm"
816 ;;
817 +powerpc-*-aros*)
818 + tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h rs6000/sysv4.h aros.h"
819 + extra_options="${extra_options} rs6000/sysv4.opt"
820 + tm_file="${tm_file} rs6000/aros.h"
821 + xm_file=xm-aros.h
822 + tmake_file="$tmake_file t-aros"
823 + ;;
824 powerpc*-*-linux*)
825 tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h freebsd-spec.h rs6000/sysv4.h"
826 extra_options="${extra_options} rs6000/sysv4.opt"
827 diff -ruN gcc-5-20150208/gcc/config.host gcc-5-20150208.aros/gcc/config.host
828 --- gcc-5-20150208/gcc/config.host 2015-01-09 14:06:02.000000000 +0000
829 +++ gcc-5-20150208.aros/gcc/config.host 2015-02-08 21:24:55.289352061 +0000
830 @@ -276,6 +276,10 @@
831 out_host_hook_obj=host-hpux.o
832 host_xmake_file="${host_xmake_file} x-hpux"
833 ;;
834 + *-*-aros*)
835 + host_can_use_collect2=no
836 + host_xm_file=xm-aros.h
837 + ;;
838 *-*-*vms*)
839 host_xm_file="vms/xm-vms.h"
840 host_xmake_file=vms/x-vms
841 diff -ruN gcc-5-20150208/gcc/ginclude/aros/types/null.h gcc-5-20150208.aros/gcc/ginclude/aros/types/null.h
842 --- gcc-5-20150208/gcc/ginclude/aros/types/null.h 1970-01-01 01:00:00.000000000 +0100
843 +++ gcc-5-20150208.aros/gcc/ginclude/aros/types/null.h 2015-02-08 21:24:55.289352061 +0000
844 @@ -0,0 +1,3 @@
845 +/* Replace AROS' NULL definition with gcc's one */
846 +#define __need_NULL
847 +#include <stddef.h>
848 diff -ruN gcc-5-20150208/gcc/ginclude/aros/types/ptrdiff_t.h gcc-5-20150208.aros/gcc/ginclude/aros/types/ptrdiff_t.h
849 --- gcc-5-20150208/gcc/ginclude/aros/types/ptrdiff_t.h 1970-01-01 01:00:00.000000000 +0100
850 +++ gcc-5-20150208.aros/gcc/ginclude/aros/types/ptrdiff_t.h 2015-02-08 21:24:55.289352061 +0000
851 @@ -0,0 +1,3 @@
852 +/* Replace AROS' ptrdiff_t definition with gcc's one */
853 +#define __need_ptrdiff_t
854 +#include <stddef.h>
855 diff -ruN gcc-5-20150208/gcc/ginclude/aros/types/size_t.h gcc-5-20150208.aros/gcc/ginclude/aros/types/size_t.h
856 --- gcc-5-20150208/gcc/ginclude/aros/types/size_t.h 1970-01-01 01:00:00.000000000 +0100
857 +++ gcc-5-20150208.aros/gcc/ginclude/aros/types/size_t.h 2015-02-08 21:24:55.289352061 +0000
858 @@ -0,0 +1,3 @@
859 +/* Replace AROS' size_t definition with gcc's one */
860 +#define __need_size_t
861 +#include <stddef.h>
862 diff -ruN gcc-5-20150208/gcc/ginclude/aros/types/wchar_t.h gcc-5-20150208.aros/gcc/ginclude/aros/types/wchar_t.h
863 --- gcc-5-20150208/gcc/ginclude/aros/types/wchar_t.h 1970-01-01 01:00:00.000000000 +0100
864 +++ gcc-5-20150208.aros/gcc/ginclude/aros/types/wchar_t.h 2015-02-08 21:24:55.289352061 +0000
865 @@ -0,0 +1,3 @@
866 +/* Replace AROS' wchar_t definition with gcc's one */
867 +#define __need_wchar_t
868 +#include <stddef.h>
869 diff -ruN gcc-5-20150208/gcc/ginclude/aros/types/wint_t.h gcc-5-20150208.aros/gcc/ginclude/aros/types/wint_t.h
870 --- gcc-5-20150208/gcc/ginclude/aros/types/wint_t.h 1970-01-01 01:00:00.000000000 +0100
871 +++ gcc-5-20150208.aros/gcc/ginclude/aros/types/wint_t.h 2015-02-08 21:24:55.289352061 +0000
872 @@ -0,0 +1,3 @@
873 +/* Replace AROS' wint_t definition with gcc's one */
874 +#define __need_wint_t
875 +#include <stddef.h>
876 diff -ruN gcc-5-20150208/gcc/ginclude/stddef.h gcc-5-20150208.aros/gcc/ginclude/stddef.h
877 --- gcc-5-20150208/gcc/ginclude/stddef.h 2015-01-05 12:33:28.000000000 +0000
878 +++ gcc-5-20150208.aros/gcc/ginclude/stddef.h 2015-02-08 21:24:55.289352061 +0000
879 @@ -131,6 +131,7 @@
880 #ifndef __PTRDIFF_T
881 #ifndef _PTRDIFF_T_
882 #ifndef _BSD_PTRDIFF_T_
883 +#ifndef _AROS_TYPES_PTRDIFF_T_H
884 #ifndef ___int_ptrdiff_t_h
885 #ifndef _GCC_PTRDIFF_T
886 #ifndef _PTRDIFF_T_DECLARED /* DragonFly */
887 @@ -140,6 +141,7 @@
888 #define __PTRDIFF_T
889 #define _PTRDIFF_T_
890 #define _BSD_PTRDIFF_T_
891 +#define _AROS_TYPES_PTRDIFF_T_H
892 #define ___int_ptrdiff_t_h
893 #define _GCC_PTRDIFF_T
894 #define _PTRDIFF_T_DECLARED
895 @@ -150,6 +152,7 @@
896 #endif /* _PTRDIFF_T_DECLARED */
897 #endif /* _GCC_PTRDIFF_T */
898 #endif /* ___int_ptrdiff_t_h */
899 +#endif /* _AROS_TYPES_PTRDIFF_T_H */
900 #endif /* _BSD_PTRDIFF_T_ */
901 #endif /* _PTRDIFF_T_ */
902 #endif /* __PTRDIFF_T */
903 @@ -176,6 +179,7 @@
904 #ifndef __SIZE_T
905 #ifndef _SIZE_T_
906 #ifndef _BSD_SIZE_T_
907 +#ifndef _AROS_TYPES_SIZE_T_H
908 #ifndef _SIZE_T_DEFINED_
909 #ifndef _SIZE_T_DEFINED
910 #ifndef _BSD_SIZE_T_DEFINED_ /* Darwin */
911 @@ -193,6 +197,7 @@
912 #define __SIZE_T
913 #define _SIZE_T_
914 #define _BSD_SIZE_T_
915 +#define _AROS_TYPES_SIZE_T_H
916 #define _SIZE_T_DEFINED_
917 #define _SIZE_T_DEFINED
918 #define _BSD_SIZE_T_DEFINED_ /* Darwin */
919 @@ -226,6 +231,7 @@
920 #endif /* _BSD_SIZE_T_DEFINED_ */
921 #endif /* _SIZE_T_DEFINED */
922 #endif /* _SIZE_T_DEFINED_ */
923 +#endif /* _AROS_TYPES_SIZE_T_H */
924 #endif /* _BSD_SIZE_T_ */
925 #endif /* _SIZE_T_ */
926 #endif /* __SIZE_T */
927 diff -ruN gcc-5-20150208/include/filenames.h gcc-5-20150208.aros/include/filenames.h
928 --- gcc-5-20150208/include/filenames.h 2014-11-11 23:33:25.000000000 +0000
929 +++ gcc-5-20150208.aros/include/filenames.h 2015-02-08 21:24:55.289352061 +0000
930 @@ -42,6 +42,10 @@
931 # define HAS_DRIVE_SPEC(f) HAS_DOS_DRIVE_SPEC (f)
932 # define IS_DIR_SEPARATOR(c) IS_DOS_DIR_SEPARATOR (c)
933 # define IS_ABSOLUTE_PATH(f) IS_DOS_ABSOLUTE_PATH (f)
934 +#elif defined __AROS__
935 +# define IS_DIR_SEPARATOR(c) ((c) == '/' || (c) == ':')
936 +# define IS_ABSOLUTE_PATH(f) (IS_DIR_SEPARATOR((f)[0]) || (strchr((f), ':')))
937 +# define HAVE_CASE_INSENSITIVE_FILE_SYSTEM
938 #else /* not DOSish */
939 # if defined(__APPLE__)
940 # ifndef HAVE_CASE_INSENSITIVE_FILE_SYSTEM
941 diff -ruN gcc-5-20150208/libgcc/config.host gcc-5-20150208.aros/libgcc/config.host
942 --- gcc-5-20150208/libgcc/config.host 2015-01-23 19:46:43.000000000 +0000
943 +++ gcc-5-20150208.aros/libgcc/config.host 2015-02-08 21:24:55.289352061 +0000
944 @@ -766,7 +766,7 @@
945 m32rle-*-linux*)
946 tmake_file="$tmake_file m32r/t-linux t-fdpbit"
947 ;;
948 -m68k-*-elf* | fido-*-elf)
949 +m68k-*-elf* | fido-*-elf | m68k-*-aros*)
950 tmake_file="$tmake_file m68k/t-floatlib"
951 ;;
952 m68k*-*-netbsdelf*)
953 @@ -1277,6 +1277,9 @@
954 tmake_file="$tmake_file nvptx/t-nvptx"
955 extra_parts="crt0.o"
956 ;;
957 +*-*-aros*)
958 + tmake_file=
959 + ;;
960 *)
961 echo "*** Configuration ${host} not supported" 1>&2
962 exit 1
963 diff -ruN gcc-5-20150208/libgcc/gthr.h gcc-5-20150208.aros/libgcc/gthr.h
964 --- gcc-5-20150208/libgcc/gthr.h 2015-01-05 12:33:28.000000000 +0000
965 +++ gcc-5-20150208.aros/libgcc/gthr.h 2015-02-08 21:24:55.289352061 +0000
966 @@ -141,6 +141,11 @@
967 #define GTHREAD_USE_WEAK 0
968 #endif
970 +#ifdef __AROS__
971 +#undef GTHREAD_USE_WEAK
972 +#define GTHREAD_USE_WEAK 0
973 +#endif
974 +
975 #ifndef GTHREAD_USE_WEAK
976 #define GTHREAD_USE_WEAK 1
977 #endif
978 diff -ruN gcc-5-20150208/libgcc/unwind-dw2-fde.c gcc-5-20150208.aros/libgcc/unwind-dw2-fde.c
979 --- gcc-5-20150208/libgcc/unwind-dw2-fde.c 2015-01-05 12:33:28.000000000 +0000
980 +++ gcc-5-20150208.aros/libgcc/unwind-dw2-fde.c 2015-02-08 21:24:55.289352061 +0000
981 @@ -92,12 +92,16 @@
982 #endif
984 init_object_mutex_once ();
985 +#ifndef __AROS__ /* This is called when SysBase is not yet set up */
986 __gthread_mutex_lock (&object_mutex);
987 +#endif
989 ob->next = unseen_objects;
990 unseen_objects = ob;
992 +#ifndef __AROS__
993 __gthread_mutex_unlock (&object_mutex);
994 +#endif
995 }
997 void
998 diff -ruN gcc-5-20150208/libiberty/filename_cmp.c gcc-5-20150208.aros/libiberty/filename_cmp.c
999 --- gcc-5-20150208/libiberty/filename_cmp.c 2014-11-11 23:33:25.000000000 +0000
1000 +++ gcc-5-20150208.aros/libiberty/filename_cmp.c 2015-02-08 21:24:55.289352061 +0000
1001 @@ -55,9 +55,12 @@
1002 int
1003 filename_cmp (const char *s1, const char *s2)
1004 {
1005 -#if !defined(HAVE_DOS_BASED_FILE_SYSTEM) \
1006 - && !defined(HAVE_CASE_INSENSITIVE_FILE_SYSTEM)
1007 +#if !defined(HAVE_DOS_BASED_FILE_SYSTEM)
1008 +#if defined(HAVE_CASE_INSENSITIVE_FILE_SYSTEM)
1009 + return strcasecmp(s1, s2);
1010 +#else
1011 return strcmp(s1, s2);
1012 +#endif
1013 #else
1014 for (;;)
1015 {
1016 diff -ruN gcc-5-20150208/libobjc/configure gcc-5-20150208.aros/libobjc/configure
1017 --- gcc-5-20150208/libobjc/configure 2015-01-26 02:53:23.000000000 +0000
1018 +++ gcc-5-20150208.aros/libobjc/configure 2015-02-08 21:24:55.289352061 +0000
1019 @@ -11256,214 +11256,7 @@
1020 # -----------
1022 # Check if we have thread-local storage
1023 -
1024 -
1025 - # Check whether --enable-tls was given.
1026 -if test "${enable_tls+set}" = set; then :
1027 - enableval=$enable_tls;
1028 - case "$enableval" in
1029 - yes|no) ;;
1030 - *) as_fn_error "Argument to enable/disable tls must be yes or no" "$LINENO" 5 ;;
1031 - esac
1032 -
1033 -else
1034 - enable_tls=yes
1035 -fi
1036 -
1037 -
1038 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the target supports thread-local storage" >&5
1039 -$as_echo_n "checking whether the target supports thread-local storage... " >&6; }
1040 -if test "${gcc_cv_have_tls+set}" = set; then :
1041 - $as_echo_n "(cached) " >&6
1042 -else
1043 -
1044 - if test "$cross_compiling" = yes; then :
1045 - if test x$gcc_no_link = xyes; then
1046 - as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
1047 -fi
1048 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1049 -/* end confdefs.h. */
1050 -__thread int a; int b; int main() { return a = b; }
1051 -_ACEOF
1052 -if ac_fn_c_try_link "$LINENO"; then :
1053 - chktls_save_LDFLAGS="$LDFLAGS"
1054 - case $host in
1055 - *-*-linux*)
1056 - LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS"
1057 - ;;
1058 - esac
1059 - chktls_save_CFLAGS="$CFLAGS"
1060 - CFLAGS="-fPIC $CFLAGS"
1061 - if test x$gcc_no_link = xyes; then
1062 - as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
1063 -fi
1064 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1065 -/* end confdefs.h. */
1066 -int f() { return 0; }
1067 -_ACEOF
1068 -if ac_fn_c_try_link "$LINENO"; then :
1069 - if test x$gcc_no_link = xyes; then
1070 - as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
1071 -fi
1072 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1073 -/* end confdefs.h. */
1074 -__thread int a; int b; int f() { return a = b; }
1075 -_ACEOF
1076 -if ac_fn_c_try_link "$LINENO"; then :
1077 - gcc_cv_have_tls=yes
1078 -else
1079 - gcc_cv_have_tls=no
1080 -fi
1081 -rm -f core conftest.err conftest.$ac_objext \
1082 - conftest$ac_exeext conftest.$ac_ext
1083 -else
1084 - gcc_cv_have_tls=yes
1085 -fi
1086 -rm -f core conftest.err conftest.$ac_objext \
1087 - conftest$ac_exeext conftest.$ac_ext
1088 - CFLAGS="$chktls_save_CFLAGS"
1089 - LDFLAGS="$chktls_save_LDFLAGS"
1090 -else
1091 - gcc_cv_have_tls=no
1092 -fi
1093 -rm -f core conftest.err conftest.$ac_objext \
1094 - conftest$ac_exeext conftest.$ac_ext
1095 -
1096 -
1097 -else
1098 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1099 -/* end confdefs.h. */
1100 -__thread int a; int b; int main() { return a = b; }
1101 -_ACEOF
1102 -if ac_fn_c_try_run "$LINENO"; then :
1103 - chktls_save_LDFLAGS="$LDFLAGS"
1104 - LDFLAGS="-static $LDFLAGS"
1105 - if test x$gcc_no_link = xyes; then
1106 - as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
1107 -fi
1108 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1109 -/* end confdefs.h. */
1110 -int main() { return 0; }
1111 -_ACEOF
1112 -if ac_fn_c_try_link "$LINENO"; then :
1113 - if test "$cross_compiling" = yes; then :
1114 - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1115 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1116 -as_fn_error "cannot run test program while cross compiling
1117 -See \`config.log' for more details." "$LINENO" 5; }
1118 -else
1119 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1120 -/* end confdefs.h. */
1121 -__thread int a; int b; int main() { return a = b; }
1122 -_ACEOF
1123 -if ac_fn_c_try_run "$LINENO"; then :
1124 - gcc_cv_have_tls=yes
1125 -else
1126 - gcc_cv_have_tls=no
1127 -fi
1128 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
1129 - conftest.$ac_objext conftest.beam conftest.$ac_ext
1130 -fi
1131 -
1132 -else
1133 - gcc_cv_have_tls=yes
1134 -fi
1135 -rm -f core conftest.err conftest.$ac_objext \
1136 - conftest$ac_exeext conftest.$ac_ext
1137 - LDFLAGS="$chktls_save_LDFLAGS"
1138 - if test $gcc_cv_have_tls = yes; then
1139 - chktls_save_CFLAGS="$CFLAGS"
1140 - thread_CFLAGS=failed
1141 - for flag in '' '-pthread' '-lpthread'; do
1142 - CFLAGS="$flag $chktls_save_CFLAGS"
1143 - if test x$gcc_no_link = xyes; then
1144 - as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
1145 -fi
1146 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1147 -/* end confdefs.h. */
1148 -#include <pthread.h>
1149 - void *g(void *d) { return NULL; }
1150 -int
1151 -main ()
1152 -{
1153 -pthread_t t; pthread_create(&t,NULL,g,NULL);
1154 - ;
1155 - return 0;
1156 -}
1157 -_ACEOF
1158 -if ac_fn_c_try_link "$LINENO"; then :
1159 - thread_CFLAGS="$flag"
1160 -fi
1161 -rm -f core conftest.err conftest.$ac_objext \
1162 - conftest$ac_exeext conftest.$ac_ext
1163 - if test "X$thread_CFLAGS" != Xfailed; then
1164 - break
1165 - fi
1166 - done
1167 - CFLAGS="$chktls_save_CFLAGS"
1168 - if test "X$thread_CFLAGS" != Xfailed; then
1169 - CFLAGS="$thread_CFLAGS $chktls_save_CFLAGS"
1170 - if test "$cross_compiling" = yes; then :
1171 - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1172 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1173 -as_fn_error "cannot run test program while cross compiling
1174 -See \`config.log' for more details." "$LINENO" 5; }
1175 -else
1176 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1177 -/* end confdefs.h. */
1178 -#include <pthread.h>
1179 - __thread int a;
1180 - static int *volatile a_in_other_thread;
1181 - static void *
1182 - thread_func (void *arg)
1183 - {
1184 - a_in_other_thread = &a;
1185 - return (void *)0;
1186 - }
1187 -int
1188 -main ()
1189 -{
1190 -pthread_t thread;
1191 - void *thread_retval;
1192 - int *volatile a_in_main_thread;
1193 - a_in_main_thread = &a;
1194 - if (pthread_create (&thread, (pthread_attr_t *)0,
1195 - thread_func, (void *)0))
1196 - return 0;
1197 - if (pthread_join (thread, &thread_retval))
1198 - return 0;
1199 - return (a_in_other_thread == a_in_main_thread);
1200 - ;
1201 - return 0;
1202 -}
1203 -_ACEOF
1204 -if ac_fn_c_try_run "$LINENO"; then :
1205 - gcc_cv_have_tls=yes
1206 -else
1207 - gcc_cv_have_tls=no
1208 -fi
1209 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
1210 - conftest.$ac_objext conftest.beam conftest.$ac_ext
1211 -fi
1212 -
1213 - CFLAGS="$chktls_save_CFLAGS"
1214 - fi
1215 - fi
1216 -else
1217 - gcc_cv_have_tls=no
1218 -fi
1219 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
1220 - conftest.$ac_objext conftest.beam conftest.$ac_ext
1221 -fi
1222 -
1223 -fi
1224 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_have_tls" >&5
1225 -$as_echo "$gcc_cv_have_tls" >&6; }
1226 - if test "$enable_tls $gcc_cv_have_tls" = "yes yes"; then
1227 -
1228 -$as_echo "#define HAVE_TLS 1" >>confdefs.h
1229 -
1230 - fi
1231 +#dnl GCC_ENABLE_TLS
1233 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exception model to use" >&5
1234 $as_echo_n "checking for exception model to use... " >&6; }
1235 diff -ruN gcc-5-20150208/libobjc/configure.ac gcc-5-20150208.aros/libobjc/configure.ac
1236 --- gcc-5-20150208/libobjc/configure.ac 2015-01-05 12:33:28.000000000 +0000
1237 +++ gcc-5-20150208.aros/libobjc/configure.ac 2015-02-08 21:24:55.289352061 +0000
1238 @@ -210,7 +210,7 @@
1239 # -----------
1241 # Check if we have thread-local storage
1242 -GCC_CHECK_TLS
1243 +dnl GCC_CHECK_TLS
1245 AC_MSG_CHECKING([for exception model to use])
1246 AC_LANG_PUSH(C)
1247 diff -ruN gcc-5-20150208/libobjc/thr.c gcc-5-20150208.aros/libobjc/thr.c
1248 --- gcc-5-20150208/libobjc/thr.c 2015-01-05 12:33:28.000000000 +0000
1249 +++ gcc-5-20150208.aros/libobjc/thr.c 2015-02-08 21:24:55.289352061 +0000
1250 @@ -40,6 +40,7 @@
1251 #include "objc/runtime.h"
1252 #include "objc-private/module-abi-8.h"
1253 #include "objc-private/runtime.h"
1254 +#define __typedef_BOOL /* Remove definition of BOOL */
1255 #include <gthr.h>
1257 #include <stdlib.h>
1258 diff -ruN gcc-5-20150208/libstdc++-v3/config/os/aros/ctype_base.h gcc-5-20150208.aros/libstdc++-v3/config/os/aros/ctype_base.h
1259 --- gcc-5-20150208/libstdc++-v3/config/os/aros/ctype_base.h 1970-01-01 01:00:00.000000000 +0100
1260 +++ gcc-5-20150208.aros/libstdc++-v3/config/os/aros/ctype_base.h 2015-02-08 21:24:55.289352061 +0000
1261 @@ -0,0 +1,30 @@
1262 +namespace std _GLIBCXX_VISIBILITY(default)
1263 +{
1264 +_GLIBCXX_BEGIN_NAMESPACE_VERSION
1265 +
1266 +struct ctype_base {
1267 + /* Non-standard typedefs */
1268 + typedef int * __to_type;
1269 +
1270 + /* NB: Offsets into ctype<char>::_M_table force a particular size
1271 + on the mask type. Because of this, we don't use an enum. */
1272 + typedef unsigned short int mask;
1273 +
1274 + static const mask upper = _ISupper;
1275 + static const mask lower = _ISlower;
1276 + static const mask alpha = _ISalpha;
1277 + static const mask digit = _ISdigit;
1278 + static const mask xdigit = _ISxdigit;
1279 + static const mask space = _ISspace;
1280 + static const mask print = _ISprint;
1281 + static const mask graph = _ISgraph;
1282 + static const mask cntrl = _IScntrl;
1283 + static const mask punct = _ISpunct;
1284 + static const mask alnum = _ISalnum;
1285 +#if __cplusplus >= 201103L
1286 + static const mask blank = _ISblank;
1287 +#endif
1288 +};
1289 +
1290 +_GLIBCXX_END_NAMESPACE_VERSION
1291 +} // namespace
1292 diff -ruN gcc-5-20150208/libstdc++-v3/config/os/aros/ctype_configure_char.cc gcc-5-20150208.aros/libstdc++-v3/config/os/aros/ctype_configure_char.cc
1293 --- gcc-5-20150208/libstdc++-v3/config/os/aros/ctype_configure_char.cc 1970-01-01 01:00:00.000000000 +0100
1294 +++ gcc-5-20150208.aros/libstdc++-v3/config/os/aros/ctype_configure_char.cc 2015-02-08 21:24:55.289352061 +0000
1295 @@ -0,0 +1,99 @@
1296 +// Locale support -*- C++ -*-
1297 +
1298 +// Copyright (C) 2011-2013 Free Software Foundation, Inc.
1299 +//
1300 +// This file is part of the GNU ISO C++ Library. This library is free
1301 +// software; you can redistribute it and/or modify it under the
1302 +// terms of the GNU General Public License as published by the
1303 +// Free Software Foundation; either version 3, or (at your option)
1304 +// any later version.
1305 +
1306 +// This library is distributed in the hope that it will be useful,
1307 +// but WITHOUT ANY WARRANTY; without even the implied warranty of
1308 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1309 +// GNU General Public License for more details.
1310 +
1311 +// Under Section 7 of GPL version 3, you are granted additional
1312 +// permissions described in the GCC Runtime Library Exception, version
1313 +// 3.1, as published by the Free Software Foundation.
1314 +
1315 +// You should have received a copy of the GNU General Public License and
1316 +// a copy of the GCC Runtime Library Exception along with this program;
1317 +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
1318 +// <http://www.gnu.org/licenses/>.
1319 +
1320 +/** @file ctype_configure_char.cc */
1321 +
1322 +//
1323 +// ISO C++ 14882: 22.1 Locales
1324 +//
1325 +
1326 +#include <locale>
1327 +#include <cstdlib>
1328 +#include <cstring>
1329 +
1330 +namespace std _GLIBCXX_VISIBILITY(default)
1331 +{
1332 +_GLIBCXX_BEGIN_NAMESPACE_VERSION
1333 +
1334 +// Information as gleaned from /usr/include/ctype.h
1335 +
1336 + const ctype_base::mask*
1337 + ctype<char>::classic_table() throw()
1338 + { return 0; }
1339 +
1340 + ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
1341 + size_t __refs)
1342 + : facet(__refs), _M_del(__table != 0 && __del),
1343 + _M_toupper(NULL), _M_tolower(NULL),
1344 + _M_table(__table ? __table : classic_table())
1345 + {
1346 + memset(_M_widen, 0, sizeof(_M_widen));
1347 + _M_widen_ok = 0;
1348 + memset(_M_narrow, 0, sizeof(_M_narrow));
1349 + _M_narrow_ok = 0;
1350 + }
1351 +
1352 + ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
1353 + : facet(__refs), _M_del(__table != 0 && __del),
1354 + _M_toupper(NULL), _M_tolower(NULL),
1355 + _M_table(__table ? __table : classic_table())
1356 + {
1357 + memset(_M_widen, 0, sizeof(_M_widen));
1358 + _M_widen_ok = 0;
1359 + memset(_M_narrow, 0, sizeof(_M_narrow));
1360 + _M_narrow_ok = 0;
1361 + }
1362 +
1363 + char
1364 + ctype<char>::do_toupper(char __c) const
1365 + { return ::toupper((int) __c); }
1366 +
1367 + const char*
1368 + ctype<char>::do_toupper(char* __low, const char* __high) const
1369 + {
1370 + while (__low < __high)
1371 + {
1372 + *__low = ::toupper((int) *__low);
1373 + ++__low;
1374 + }
1375 + return __high;
1376 + }
1377 +
1378 + char
1379 + ctype<char>::do_tolower(char __c) const
1380 + { return ::tolower((int) __c); }
1381 +
1382 + const char*
1383 + ctype<char>::do_tolower(char* __low, const char* __high) const
1384 + {
1385 + while (__low < __high)
1386 + {
1387 + *__low = ::tolower((int) *__low);
1388 + ++__low;
1389 + }
1390 + return __high;
1391 + }
1392 +
1393 +_GLIBCXX_END_NAMESPACE_VERSION
1394 +} // namespace
1395 diff -ruN gcc-5-20150208/libstdc++-v3/config/os/aros/ctype_inline.h gcc-5-20150208.aros/libstdc++-v3/config/os/aros/ctype_inline.h
1396 --- gcc-5-20150208/libstdc++-v3/config/os/aros/ctype_inline.h 1970-01-01 01:00:00.000000000 +0100
1397 +++ gcc-5-20150208.aros/libstdc++-v3/config/os/aros/ctype_inline.h 2015-02-08 21:24:55.289352061 +0000
1398 @@ -0,0 +1,173 @@
1399 +// Locale support -*- C++ -*-
1400 +
1401 +// Copyright (C) 2000, 2003 Free Software Foundation, Inc.
1402 +//
1403 +// This file is part of the GNU ISO C++ Library. This library is free
1404 +// software; you can redistribute it and/or modify it under the
1405 +// terms of the GNU General Public License as published by the
1406 +// Free Software Foundation; either version 2, or (at your option)
1407 +// any later version.
1408 +
1409 +// This library is distributed in the hope that it will be useful,
1410 +// but WITHOUT ANY WARRANTY; without even the implied warranty of
1411 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1412 +// GNU General Public License for more details.
1413 +
1414 +// You should have received a copy of the GNU General Public License along
1415 +// with this library; see the file COPYING. If not, write to the Free
1416 +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
1417 +// USA.
1418 +
1419 +// As a special exception, you may use this file as part of a free software
1420 +// library without restriction. Specifically, if other files instantiate
1421 +// templates or use macros or inline functions from this file, or you compile
1422 +// this file and link it with other files to produce an executable, this
1423 +// file does not by itself cause the resulting executable to be covered by
1424 +// the GNU General Public License. This exception does not however
1425 +// invalidate any other reasons why the executable file might be covered by
1426 +// the GNU General Public License.
1427 +
1428 +/** @file ctype_inline.h
1429 + * This is an internal header file, included by other library headers.
1430 + * You should not attempt to use it directly.
1431 + */
1432 +
1433 +//
1434 +// ISO C++ 14882: 22.1 Locales
1435 +//
1436 +
1437 +// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
1438 +// functions go in ctype.cc
1439 +
1440 +// The following definitions are portable, but insanely slow. If one
1441 +// cares at all about performance, then specialized ctype
1442 +// functionality should be added for the native os in question: see
1443 +// the config/os/bits/ctype_*.h files.
1444 +
1445 +// Constructing a synthetic "C" table should be seriously considered...
1446 +
1447 +namespace std _GLIBCXX_VISIBILITY(default)
1448 +{
1449 +_GLIBCXX_BEGIN_NAMESPACE_VERSION
1450 +
1451 + bool
1452 + ctype<char>::
1453 + is(mask __m, char __c) const
1454 + {
1455 + if (_M_table)
1456 + return _M_table[static_cast<unsigned char>(__c)] & __m;
1457 + else
1458 + {
1459 + bool __ret = false;
1460 + const size_t __bitmasksize = 15;
1461 + size_t __bitcur = 0; // Lowest bitmask in ctype_base == 0
1462 + for (; __bitcur <= __bitmasksize; ++__bitcur)
1463 + {
1464 + const mask __bit = static_cast<mask>(1 << __bitcur);
1465 + if (__m & __bit)
1466 + {
1467 + bool __testis;
1468 + switch (__bit)
1469 + {
1470 + case space:
1471 + __testis = isspace(__c);
1472 + break;
1473 + case print:
1474 + __testis = isprint(__c);
1475 + break;
1476 + case cntrl:
1477 + __testis = iscntrl(__c);
1478 + break;
1479 + case upper:
1480 + __testis = isupper(__c);
1481 + break;
1482 + case lower:
1483 + __testis = islower(__c);
1484 + break;
1485 + case alpha:
1486 + __testis = isalpha(__c);
1487 + break;
1488 + case digit:
1489 + __testis = isdigit(__c);
1490 + break;
1491 + case punct:
1492 + __testis = ispunct(__c);
1493 + break;
1494 + case xdigit:
1495 + __testis = isxdigit(__c);
1496 + break;
1497 + case alnum:
1498 + __testis = isalnum(__c);
1499 + break;
1500 + case graph:
1501 + __testis = isgraph(__c);
1502 + break;
1503 + default:
1504 + __testis = false;
1505 + break;
1506 + }
1507 + __ret |= __testis;
1508 + }
1509 + }
1510 + return __ret;
1511 + }
1512 + }
1513 +
1514 + const char*
1515 + ctype<char>::
1516 + is(const char* __low, const char* __high, mask* __vec) const
1517 + {
1518 + if (_M_table)
1519 + while (__low < __high)
1520 + *__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
1521 + else
1522 + {
1523 + // Highest bitmask in ctype_base == 10.
1524 + const size_t __bitmasksize = 15;
1525 + for (;__low < __high; ++__vec, ++__low)
1526 + {
1527 + mask __m = 0;
1528 + // Lowest bitmask in ctype_base == 0
1529 + size_t __i = 0;
1530 + for (;__i <= __bitmasksize; ++__i)
1531 + {
1532 + const mask __bit = static_cast<mask>(1 << __i);
1533 + if (this->is(__bit, *__low))
1534 + __m |= __bit;
1535 + }
1536 + *__vec = __m;
1537 + }
1538 + }
1539 + return __high;
1540 + }
1541 +
1542 + const char*
1543 + ctype<char>::
1544 + scan_is(mask __m, const char* __low, const char* __high) const
1545 + {
1546 + if (_M_table)
1547 + while (__low < __high
1548 + && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
1549 + ++__low;
1550 + else
1551 + while (__low < __high && !this->is(__m, *__low))
1552 + ++__low;
1553 + return __low;
1554 + }
1555 +
1556 + const char*
1557 + ctype<char>::
1558 + scan_not(mask __m, const char* __low, const char* __high) const
1559 + {
1560 + if (_M_table)
1561 + while (__low < __high
1562 + && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
1563 + ++__low;
1564 + else
1565 + while (__low < __high && this->is(__m, *__low) != 0)
1566 + ++__low;
1567 + return __low;
1568 + }
1569 +
1570 +_GLIBCXX_END_NAMESPACE_VERSION
1571 +} // namespace
1572 diff -ruN gcc-5-20150208/libstdc++-v3/config/os/aros/ctype_noninline.h gcc-5-20150208.aros/libstdc++-v3/config/os/aros/ctype_noninline.h
1573 --- gcc-5-20150208/libstdc++-v3/config/os/aros/ctype_noninline.h 1970-01-01 01:00:00.000000000 +0100
1574 +++ gcc-5-20150208.aros/libstdc++-v3/config/os/aros/ctype_noninline.h 2015-02-08 21:24:55.289352061 +0000
1575 @@ -0,0 +1,56 @@
1576 + const ctype_base::mask*
1577 + ctype<char>::classic_table() throw()
1578 + { return *__ctype_b_ptr; }
1579 +
1580 + ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
1581 + size_t __refs)
1582 + : facet(__refs), _M_del(__table != 0 && __del),
1583 + _M_toupper(NULL), _M_tolower(NULL),
1584 + _M_table(__table ? __table : classic_table())
1585 + {
1586 + memset(_M_widen, 0, sizeof(_M_widen));
1587 + _M_widen_ok = 0;
1588 + memset(_M_narrow, 0, sizeof(_M_narrow));
1589 + _M_narrow_ok = 0;
1590 + }
1591 +
1592 + ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
1593 + : facet(__refs), _M_del(__table != 0 && __del),
1594 + _M_toupper(NULL), _M_tolower(NULL),
1595 + _M_table(__table ? __table : classic_table())
1596 + {
1597 + memset(_M_widen, 0, sizeof(_M_widen));
1598 + _M_widen_ok = 0;
1599 + memset(_M_narrow, 0, sizeof(_M_narrow));
1600 + _M_narrow_ok = 0;
1601 + }
1602 +
1603 + char
1604 + ctype<char>::do_toupper(char __c) const
1605 + { return ::toupper((int) __c); }
1606 +
1607 + const char*
1608 + ctype<char>::do_toupper(char* __low, const char* __high) const
1609 + {
1610 + while (__low < __high)
1611 + {
1612 + *__low = ::toupper((int) *__low);
1613 + ++__low;
1614 + }
1615 + return __high;
1616 + }
1617 +
1618 + char
1619 + ctype<char>::do_tolower(char __c) const
1620 + { return ::tolower((int) __c); }
1621 +
1622 + const char*
1623 + ctype<char>::do_tolower(char* __low, const char* __high) const
1624 + {
1625 + while (__low < __high)
1626 + {
1627 + *__low = ::tolower((int) *__low);
1628 + ++__low;
1629 + }
1630 + return __high;
1631 + }
1632 diff -ruN gcc-5-20150208/libstdc++-v3/config/os/aros/os_defines.h gcc-5-20150208.aros/libstdc++-v3/config/os/aros/os_defines.h
1633 --- gcc-5-20150208/libstdc++-v3/config/os/aros/os_defines.h 1970-01-01 01:00:00.000000000 +0100
1634 +++ gcc-5-20150208.aros/libstdc++-v3/config/os/aros/os_defines.h 2015-02-08 21:24:55.289352061 +0000
1635 @@ -0,0 +1,6 @@
1636 +#ifndef _GLIBCXX_OS_DEFINES
1637 +#define _GLIBCXX_OS_DEFINES
1638 +
1639 +#define __off64_t off_t
1640 +
1641 +#endif
1642 diff -ruN gcc-5-20150208/libstdc++-v3/configure gcc-5-20150208.aros/libstdc++-v3/configure
1643 --- gcc-5-20150208/libstdc++-v3/configure 2015-01-16 15:02:35.000000000 +0000
1644 +++ gcc-5-20150208.aros/libstdc++-v3/configure 2015-02-08 21:24:55.289352061 +0000
1645 @@ -5306,12 +5306,12 @@
1648 # Libtool setup.
1649 -if test "x${with_newlib}" != "xyes"; then
1650 - enable_dlopen=yes
1651 -
1652 -
1653 -
1654 -fi
1655 +#if test "x${with_newlib}" != "xyes"; then
1656 +# AC_LIBTOOL_DLOPEN
1657 +#
1658 +#
1659 +#
1660 +#fi
1661 case `pwd` in
1662 *\ * | *\ *)
1663 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
1664 @@ -8042,6 +8042,8 @@
1668 + enable_dlopen=no
1669 +
1671 enable_win32_dll=no
1673 @@ -18660,6 +18662,7 @@
1674 {
1675 struct iovec iov[2];
1676 writev(0, iov, 0);
1677 +#error be sure to fail
1678 ;
1679 return 0;
1680 }
1681 @@ -18682,6 +18685,7 @@
1682 {
1683 struct iovec iov[2];
1684 writev(0, iov, 0);
1685 +#error be sure to fail
1686 ;
1687 return 0;
1688 }
1689 @@ -27858,6 +27862,58 @@
1691 # Base decisions on target environment.
1692 case "${host}" in
1693 + *-aros*)
1694 + for ac_header in nan.h ieeefp.h endian.h sys/isa_defs.h machine/endian.h \
1695 + machine/param.h sys/machine.h sys/types.h fp.h locale.h float.h inttypes.h
1696 +do :
1697 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1698 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
1699 +eval as_val=\$$as_ac_Header
1700 + if test "x$as_val" = x""yes; then :
1701 + cat >>confdefs.h <<_ACEOF
1702 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1703 +_ACEOF
1704 +
1705 +fi
1706 +
1707 +done
1708 +
1709 +
1710 + GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
1711 + GLIBCXX_CHECK_WCHAR_T_SUPPORT
1712 +
1713 + $as_echo "#define HAVE_FINITE 1" >>confdefs.h
1714 +
1715 + $as_echo "#define HAVE_FINITEF 1" >>confdefs.h
1716 +
1717 + $as_echo "#define HAVE_FREXPF 1" >>confdefs.h
1718 +
1719 + $as_echo "#define HAVE_HYPOTF 1" >>confdefs.h
1720 +
1721 + $as_echo "#define HAVE_ISINF 1" >>confdefs.h
1722 +
1723 + $as_echo "#define HAVE_ISINFF 1" >>confdefs.h
1724 +
1725 + $as_echo "#define HAVE_ISNAN 1" >>confdefs.h
1726 +
1727 + $as_echo "#define HAVE_ISNANF 1" >>confdefs.h
1728 +
1729 + $as_echo "#define HAVE_SINCOS 1" >>confdefs.h
1730 +
1731 + $as_echo "#define HAVE_SINCOSF 1" >>confdefs.h
1732 +
1733 + if test x"long_double_math_on_this_cpu" = x"yes"; then
1734 + $as_echo "#define HAVE_FINITEL 1" >>confdefs.h
1735 +
1736 + $as_echo "#define HAVE_HYPOTL 1" >>confdefs.h
1737 +
1738 + $as_echo "#define HAVE_ISINFL 1" >>confdefs.h
1739 +
1740 + $as_echo "#define HAVE_ISNANL 1" >>confdefs.h
1741 +
1742 + fi
1743 + ;;
1744 +
1745 arm*-*-symbianelf*)
1746 # This is a freestanding configuration; there is nothing to do here.
1747 ;;
1748 diff -ruN gcc-5-20150208/libstdc++-v3/configure.ac gcc-5-20150208.aros/libstdc++-v3/configure.ac
1749 --- gcc-5-20150208/libstdc++-v3/configure.ac 2014-12-19 18:16:39.000000000 +0000
1750 +++ gcc-5-20150208.aros/libstdc++-v3/configure.ac 2015-02-08 21:24:55.289352061 +0000
1751 @@ -89,9 +89,9 @@
1752 GLIBCXX_CONFIGURE
1754 # Libtool setup.
1755 -if test "x${with_newlib}" != "xyes"; then
1756 - AC_LIBTOOL_DLOPEN
1757 -fi
1758 +#if test "x${with_newlib}" != "xyes"; then
1759 +# AC_LIBTOOL_DLOPEN
1760 +#fi
1761 AM_PROG_LIBTOOL
1762 ACX_LT_HOST_FLAGS
1763 AC_SUBST(enable_shared)
1764 diff -ruN gcc-5-20150208/libstdc++-v3/configure.host gcc-5-20150208.aros/libstdc++-v3/configure.host
1765 --- gcc-5-20150208/libstdc++-v3/configure.host 2015-01-09 14:06:02.000000000 +0000
1766 +++ gcc-5-20150208.aros/libstdc++-v3/configure.host 2015-02-08 21:24:55.289352061 +0000
1767 @@ -235,6 +235,9 @@
1768 os_include_dir="os/generic"
1769 atomicity_dir="cpu/generic"
1770 ;;
1771 + aros*)
1772 + os_include_dir="os/aros"
1773 + ;;
1774 bsd*)
1775 # Plain BSD attempts to share FreeBSD files.
1776 os_include_dir="os/bsd/freebsd"
1777 diff -ruN gcc-5-20150208/libstdc++-v3/crossconfig.m4 gcc-5-20150208.aros/libstdc++-v3/crossconfig.m4
1778 --- gcc-5-20150208/libstdc++-v3/crossconfig.m4 2014-04-22 13:30:59.000000000 +0100
1779 +++ gcc-5-20150208.aros/libstdc++-v3/crossconfig.m4 2015-02-08 21:24:55.289352061 +0000
1780 @@ -5,6 +5,31 @@
1781 AC_DEFUN([GLIBCXX_CROSSCONFIG],[
1782 # Base decisions on target environment.
1783 case "${host}" in
1784 + *-aros*)
1785 + AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h machine/endian.h \
1786 + machine/param.h sys/machine.h sys/types.h fp.h locale.h float.h inttypes.h])
1787 +
1788 + GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
1789 + GLIBCXX_CHECK_WCHAR_T_SUPPORT
1790 +
1791 + AC_DEFINE(HAVE_FINITE)
1792 + AC_DEFINE(HAVE_FINITEF)
1793 + AC_DEFINE(HAVE_FREXPF)
1794 + AC_DEFINE(HAVE_HYPOTF)
1795 + AC_DEFINE(HAVE_ISINF)
1796 + AC_DEFINE(HAVE_ISINFF)
1797 + AC_DEFINE(HAVE_ISNAN)
1798 + AC_DEFINE(HAVE_ISNANF)
1799 + AC_DEFINE(HAVE_SINCOS)
1800 + AC_DEFINE(HAVE_SINCOSF)
1801 + if test x"long_double_math_on_this_cpu" = x"yes"; then
1802 + AC_DEFINE(HAVE_FINITEL)
1803 + AC_DEFINE(HAVE_HYPOTL)
1804 + AC_DEFINE(HAVE_ISINFL)
1805 + AC_DEFINE(HAVE_ISNANL)
1806 + fi
1807 + ;;
1808 +
1809 arm*-*-symbianelf*)
1810 # This is a freestanding configuration; there is nothing to do here.
1811 ;;
1812 diff -ruN gcc-5-20150208/libstdc++-v3/include/Makefile.in gcc-5-20150208.aros/libstdc++-v3/include/Makefile.in
1813 --- gcc-5-20150208/libstdc++-v3/include/Makefile.in 2015-01-16 23:38:48.000000000 +0000
1814 +++ gcc-5-20150208.aros/libstdc++-v3/include/Makefile.in 2015-02-08 21:24:55.289352061 +0000
1815 @@ -1597,6 +1597,7 @@
1816 -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
1817 -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
1818 -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
1819 + -e 's/_GLIBCXX___AROS__/__AROS__/g' \
1820 -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
1821 < $< > $@
1823 diff -ruN gcc-5-20150208/libstdc++-v3/include/std/ratio gcc-5-20150208.aros/libstdc++-v3/include/std/ratio
1824 --- gcc-5-20150208/libstdc++-v3/include/std/ratio 2015-01-05 12:33:28.000000000 +0000
1825 +++ gcc-5-20150208.aros/libstdc++-v3/include/std/ratio 2015-02-08 21:24:55.289352061 +0000
1826 @@ -211,10 +211,10 @@
1827 {
1828 private:
1829 static_assert(__d != 0, "Internal library error");
1830 - static_assert(sizeof (uintmax_t) == sizeof (unsigned long long),
1831 - "This library calls __builtin_clzll on uintmax_t, which "
1832 - "is unsafe on your platform. Please complain to "
1833 - "http://gcc.gnu.org/bugzilla/");
1834 +// static_assert(sizeof (uintmax_t) == sizeof (unsigned long long),
1835 +// "This library calls __builtin_clzll on uintmax_t, which "
1836 +// "is unsafe on your platform. Please complain to "
1837 +// "http://gcc.gnu.org/bugzilla/");
1838 static constexpr int __shift = __builtin_clzll(__d);
1839 static constexpr int __coshift_ = sizeof(uintmax_t) * 8 - __shift;
1840 static constexpr int __coshift = (__shift != 0) ? __coshift_ : 0;