handle USER_INCLUDES via the CPPFLAGS
[AROS.git] / tools / crosstools / binutils-2.21.1-aros.diff
blobe99f84c8b8aa397a50a152cf318c82510049cf1d
1 diff -ruN binutils-2.21.1/bfd/config.bfd binutils-2.21.1.aros/bfd/config.bfd
2 --- binutils-2.21.1/bfd/config.bfd 2011-04-01 14:02:42.000000000 +0200
3 +++ binutils-2.21.1.aros/bfd/config.bfd 2011-06-27 09:39:00.000000000 +0200
4 @@ -281,7 +281,7 @@
5 ;;
6 arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
7 arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
8 - arm*-*-eabi* )
9 + arm*-*-eabi* | arm-*-aros)
10 targ_defvec=bfd_elf32_littlearm_vec
11 targ_selvecs=bfd_elf32_bigarm_vec
13 @@ -518,6 +518,8 @@
15 i[3-7]86-*-aros*)
16 targ_defvec=bfd_elf32_i386_vec
17 + targ_selvecs="bfd_elf64_x86_64_vec bfd_elf32_powerpc_vec"
18 + want64=true
20 i[3-7]86-*-chorus*)
21 targ_defvec=bfd_elf32_i386_vec
22 @@ -647,6 +649,11 @@
23 want64=true
24 targ_underscore=no
26 + x86_64-*-aros*)
27 + targ_defvec=bfd_elf64_x86_64_vec
28 + targ_selvecs="bfd_elf32_i386_vec bfd_elf32_powerpc_vec"
29 + want64=true
30 + ;;
31 #endif
32 i[3-7]86-*-lynxos*)
33 targ_defvec=bfd_elf32_i386_vec
34 @@ -802,7 +809,7 @@
35 targ_selvecs="cisco_core_big_vec ieee_vec"
36 targ_underscore=yes
38 - m68*-*-elf* | m68*-*-sysv4* | m68*-*-uclinux*)
39 + m68*-*-elf* | m68*-*-sysv4* | m68*-*-uclinux* | m68*-*-aros*)
40 targ_defvec=bfd_elf32_m68k_vec
41 targ_selvecs="m68kcoff_vec ieee_vec"
43 @@ -1197,6 +1204,11 @@
44 targ_defvec=bfd_elf32_rx_le_vec
45 targ_selvecs="bfd_elf32_rx_be_vec bfd_elf32_rx_le_vec"
47 + powerpc-*-aros*)
48 + targ_defvec=bfd_elf32_powerpc_vec
49 + targ_selvecs="bfd_elf32_i386_vec bfd_elf64_x86_64_vec"
50 + want64=true
51 + ;;
53 s390-*-linux*)
54 targ_defvec=bfd_elf32_s390_vec
55 diff -ruN binutils-2.21.1/binutils/sysdep.h binutils-2.21.1.aros/binutils/sysdep.h
56 --- binutils-2.21.1/binutils/sysdep.h 2009-03-18 12:27:17.000000000 +0100
57 +++ binutils-2.21.1.aros/binutils/sysdep.h 2011-06-27 09:39:00.000000000 +0200
58 @@ -26,6 +26,7 @@
59 #include "ansidecl.h"
60 #include <stdio.h>
61 #include <sys/types.h>
62 +#include <sys/stat.h>
64 #include "bfdver.h"
66 diff -ruN binutils-2.21.1/config.guess binutils-2.21.1.aros/config.guess
67 --- binutils-2.21.1/config.guess 2010-06-01 19:53:40.000000000 +0200
68 +++ binutils-2.21.1.aros/config.guess 2011-06-27 09:39:00.000000000 +0200
69 @@ -289,6 +289,9 @@
70 *:[Mm]orph[Oo][Ss]:*:*)
71 echo ${UNAME_MACHINE}-unknown-morphos
72 exit ;;
73 + *:AROS:*:*)
74 + echo ${UNAME_MACHINE}-unknown-aros
75 + exit ;;
76 *:OS/390:*:*)
77 echo i370-ibm-openedition
78 exit ;;
79 diff -ruN binutils-2.21.1/intl/configure binutils-2.21.1.aros/intl/configure
80 --- binutils-2.21.1/intl/configure 2010-11-05 11:31:38.000000000 +0100
81 +++ binutils-2.21.1.aros/intl/configure 2011-06-27 09:39:00.000000000 +0200
82 @@ -4606,6 +4606,9 @@
84 int main ()
86 +#if defined(__AROS__)
87 + exit (1);
88 +#endif
89 signal (SIGFPE, sigfpe_handler);
90 /* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
91 #if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
92 diff -ruN binutils-2.21.1/ld/configure.tgt binutils-2.21.1.aros/ld/configure.tgt
93 --- binutils-2.21.1/ld/configure.tgt 2011-04-01 14:03:54.000000000 +0200
94 +++ binutils-2.21.1.aros/ld/configure.tgt 2013-08-26 13:30:21.000000000 +0200
95 @@ -79,6 +79,10 @@
96 targ_extra_emuls="armelfb armelf armelf_linux"
97 targ_extra_libpath="armelf_linux"
99 +arm*-*-aros*) targ_emul=armelf_aros
100 + targ_extra_emuls=armelfb_aros
101 + targ_extra_libpath=$targ_extra_emuls
102 + ;;
103 arm*-*-linux-*eabi) targ_emul=armelf_linux_eabi
104 targ_extra_emuls=armelfb_linux_eabi
105 targ_extra_libpath=$targ_extra_emuls
106 @@ -245,6 +249,9 @@
107 x86_64-*-elf*) targ_emul=elf_x86_64
108 targ_extra_emuls="elf_i386 elf_l1om"
110 +x86_64-*-aros*) targ_emul=elf_x86_64
111 + targ_extra_emuls=elf_i386
112 + ;;
113 i[3-7]86-*-kaos*) targ_emul=elf_i386 ;;
114 i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12])
115 targ_emul=i386bsd ;;
116 @@ -336,6 +343,7 @@
117 m68k-hp-bsd*) targ_emul=hp300bsd ;;
118 m68*-motorola-sysv*) targ_emul=delta68 ;;
119 m68*-*-aout) targ_emul=m68kaout ;;
120 +m68*-*-aros) targ_emul=m68kelf ;;
121 m68*-*-coff) targ_emul=m68kcoff ;;
122 m68*-*-elf) targ_emul=m68kelf ;;
123 m68*-*-hpux*) targ_emul=hp3hpux ;;
124 @@ -504,6 +512,7 @@
125 powerpc-*-beos*) targ_emul=aixppc ;;
126 powerpc-*-windiss*) targ_emul=elf32ppcwindiss ;;
127 powerpc-*-lynxos*) targ_emul=ppclynx ;;
128 +powerpc-*-aros*) targ_emul=elf32ppc ;;
129 rs6000-*-aix[5-9]*) targ_emul=aix5rs6 ;;
130 rs6000-*-aix*) targ_emul=aixrs6
132 diff -ruN binutils-2.21.1/ld/emulparams/armelf_aros.sh binutils-2.21.1.aros/ld/emulparams/armelf_aros.sh
133 --- binutils-2.21.1/ld/emulparams/armelf_aros.sh 1970-01-01 01:00:00.000000000 +0100
134 +++ binutils-2.21.1.aros/ld/emulparams/armelf_aros.sh 2012-06-28 13:50:52.000000000 +0200
135 @@ -0,0 +1,3 @@
136 +. ${srcdir}/emulparams/armelf_linux_eabi.sh
137 +# Remap R_ARM_TARGET2 to R_ARM_ABS32
138 +TARGET2_TYPE=abs
139 diff -ruN binutils-2.21.1/ld/emulparams/armelfb_aros.sh binutils-2.21.1.aros/ld/emulparams/armelfb_aros.sh
140 --- binutils-2.21.1/ld/emulparams/armelfb_aros.sh 1970-01-01 01:00:00.000000000 +0100
141 +++ binutils-2.21.1.aros/ld/emulparams/armelfb_aros.sh 2012-06-28 13:50:52.000000000 +0200
142 @@ -0,0 +1,2 @@
143 +. ${srcdir}/emulparams/armelf_aros.sh
144 +OUTPUT_FORMAT="elf32-bigarm"
145 diff -ruN binutils-2.21.1/ld/Makefile.in binutils-2.21.1.aros/ld/Makefile.in
146 --- binutils-2.21.1/ld/Makefile.in 2011-03-16 09:37:30.000000000 +0100
147 +++ binutils-2.21.1.aros/ld/Makefile.in 2013-08-26 13:33:27.000000000 +0200
148 @@ -445,12 +445,14 @@
149 earmaoutl.c \
150 earmcoff.c \
151 earmelf.c \
152 + earmelf_aros.c \
153 earmelf_fbsd.c \
154 earmelf_linux.c \
155 earmelf_linux_eabi.c \
156 earmelf_nbsd.c \
157 earmelf_vxworks.c \
158 earmelfb.c \
159 + earmelfb_aros.c \
160 earmelfb_linux.c \
161 earmelfb_linux_eabi.c \
162 earmelfb_nbsd.c \
163 @@ -1027,12 +1029,14 @@
164 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmaoutl.Po@am__quote@
165 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmcoff.Po@am__quote@
166 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf.Po@am__quote@
167 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_aros.Po@am__quote@
168 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_fbsd.Po@am__quote@
169 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux.Po@am__quote@
170 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux_eabi.Po@am__quote@
171 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nbsd.Po@am__quote@
172 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_vxworks.Po@am__quote@
173 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb.Po@am__quote@
174 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_aros.Po@am__quote@
175 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux.Po@am__quote@
176 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux_eabi.Po@am__quote@
177 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nbsd.Po@am__quote@
178 @@ -2114,6 +2118,12 @@
179 $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
180 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
181 ${GENSCRIPTS} armelf_linux_eabi "$(tdir_armelf_linux_abi)"
182 +earmelf_aros.c: $(srcdir)/emulparams/armelf_aros.sh \
183 + $(srcdir)/emulparams/armelf_linux_eabi.sh \
184 + $(srcdir)/emulparams/armelf_linux.sh \
185 + $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
186 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
187 + ${GENSCRIPTS} armelf_aros "$(tdir_armelf_aros)"
188 earmelf_nbsd.c: $(srcdir)/emulparams/armelf_nbsd.sh \
189 $(srcdir)/emulparams/armelf.sh \
190 $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
191 @@ -2140,6 +2150,13 @@
192 $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
193 $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
194 ${GENSCRIPTS} armelfb_linux_eabi "$(tdir_armelfb_linux_abi)"
195 +earmelfb_aros.c: $(srcdir)/emulparams/armelfb_aros.sh \
196 + $(srcdir)/emulparams/armelf_aros.sh \
197 + $(srcdir)/emulparams/armelf_linux_eabi.sh \
198 + $(srcdir)/emulparams/armelf_linux.sh \
199 + $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
200 + $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
201 + ${GENSCRIPTS} armelfb_aros "$(tdir_armelfb_aros)"
202 earmelfb_nbsd.c: $(srcdir)/emulparams/armelfb_nbsd.sh \
203 $(srcdir)/emulparams/armelf_nbsd.sh \
204 $(srcdir)/emulparams/armelf.sh \