1diff --git a/bfd/config.bfd b/bfd/config.bfd
2index f04a993f06..1e24a9d030 100644
3--- a/bfd/config.bfd
4+++ b/bfd/config.bfd
5@@ -238,7 +238,7 @@ case "${targ}" in
6
7 # START OF targmatch.h
8 #ifdef BFD64
9- aarch64-*-darwin*)
10+ aarch64-*-darwin* | aarch64-*-ios*)
11 targ_defvec=aarch64_mach_o_vec
12 targ_selvecs="arm_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec"
13 targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
14@@ -358,7 +358,7 @@ case "${targ}" in
15 targ_selvecs=arc_elf32_be_vec
16 ;;
17
18- arm-*-darwin*)
19+ arm-*-darwin* | arm-*-ios*)
20 targ_defvec=arm_mach_o_vec
21 targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec"
22 targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
23@@ -678,7 +678,7 @@ case "${targ}" in
24 i[3-7]86-*-aix*)
25 targ_defvec=i386_coff_vec
26 ;;
27- i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
28+ i[3-7]86-*-darwin* | i[3-7]86-*-ios* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
29 targ_defvec=i386_mach_o_vec
30 targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
31 targ64_selvecs=x86_64_mach_o_vec
32@@ -762,7 +762,7 @@ case "${targ}" in
33 targ_defvec=x86_64_elf64_cloudabi_vec
34 want64=true
35 ;;
36- x86_64-*-darwin*)
37+ x86_64-*-darwin* | x86_64-*-ios*)
38 targ_defvec=x86_64_mach_o_vec
39 targ_selvecs="i386_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
40 targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch"
41@@ -1402,7 +1402,7 @@ case "${targ}" in
42 targ_selvecs="powerpc_elf32_le_vec powerpc_boot_vec"
43 targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec"
44 ;;
45- powerpc-*-darwin* | powerpc-*-macos10* | powerpc-*-rhapsody*)
46+ powerpc-*-darwin* | powerpc-*-ios* | powerpc-*-macos10* | powerpc-*-rhapsody*)
47 targ_defvec=mach_o_be_vec
48 targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
49 targ_archs="$targ_archs bfd_i386_arch"
50diff --git a/configure.ac b/configure.ac
51index aae94501e4..2cceb4dad4 100644
52--- a/configure.ac
53+++ b/configure.ac
54@@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then
55 ;;
56 *-*-solaris2* | *-*-hpux11*)
57 ;;
58- *-*-darwin* | *-*-aix*)
59+ *-*-darwin* | *-*-ios* | *-*-aix*)
60 ;;
61 nvptx*-*-*)
62 ;;
63@@ -700,13 +700,13 @@ esac
64
65 # Disable libffi for some systems.
66 case "${target}" in
67- powerpc-*-darwin*)
68+ powerpc-*-darwin* | powerpc-*-ios*)
69 ;;
70- i[[3456789]]86-*-darwin*)
71+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*)
72 ;;
73- x86_64-*-darwin[[912]]*)
74+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*)
75 ;;
76- *-*-darwin*)
77+ *-*-darwin* | *-*-ios*)
78 noconfigdirs="$noconfigdirs target-libffi"
79 ;;
80 *-*-netware*)
81@@ -788,7 +788,7 @@ esac
82 # Disable the go frontend on systems where it is known to not work. Please keep
83 # this in sync with contrib/config-list.mk.
84 case "${target}" in
85-*-*-darwin* | *-*-cygwin* | *-*-mingw*)
86+*-*-darwin* | *-*-ios* | *-*-cygwin* | *-*-mingw*)
87 unsupported_languages="$unsupported_languages go"
88 ;;
89 esac
90@@ -797,7 +797,7 @@ esac
91 # For testing, you can easily override this with --enable-libgo.
92 if test x$enable_libgo = x; then
93 case "${target}" in
94- *-*-darwin*)
95+ *-*-darwin* | *-*-ios*)
96 # PR 46986
97 noconfigdirs="$noconfigdirs target-libgo"
98 ;;
99@@ -916,27 +916,27 @@ esac
100 case "${target}" in
101 *-*-chorusos)
102 ;;
103- aarch64-*-darwin*)
104+ aarch64-*-darwin* | aarch64-*-ios*)
105 noconfigdirs="$noconfigdirs ld gas gdb gprof"
106 noconfigdirs="$noconfigdirs sim target-rda"
107 ;;
108- arm-*-darwin*)
109+ arm-*-darwin* | arm-*-ios*)
110 noconfigdirs="$noconfigdirs ld gas gdb gprof"
111 noconfigdirs="$noconfigdirs sim target-rda"
112 ;;
113- powerpc-*-darwin*)
114+ powerpc-*-darwin* | powerpc-*-ios*)
115 noconfigdirs="$noconfigdirs ld gas gdb gprof"
116 noconfigdirs="$noconfigdirs sim target-rda"
117 ;;
118- i[[3456789]]86-*-darwin*)
119+ i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*)
120 noconfigdirs="$noconfigdirs ld gprof"
121 noconfigdirs="$noconfigdirs sim target-rda"
122 ;;
123- x86_64-*-darwin[[912]]*)
124+ x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*)
125 noconfigdirs="$noconfigdirs ld gas gprof"
126 noconfigdirs="$noconfigdirs sim target-rda"
127 ;;
128- *-*-darwin*)
129+ *-*-darwin* | *-*-ios*)
130 noconfigdirs="$noconfigdirs ld gas gdb gprof"
131 noconfigdirs="$noconfigdirs sim target-rda"
132 ;;
133@@ -1226,7 +1226,7 @@ case "${host}" in
134 hppa*-*)
135 host_makefile_frag="config/mh-pa"
136 ;;
137- *-*-darwin*)
138+ *-*-darwin* | *-*-ios*)
139 host_makefile_frag="config/mh-darwin"
140 ;;
141 powerpc-*-aix*)
142@@ -1697,7 +1697,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
143 build_lto_plugin=yes
144 ],[if test x"$default_enable_lto" = x"yes" ; then
145 case $target in
146- *-apple-darwin[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;;
147+ *-apple-darwin[[912]]* | *-apple-ios[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;;
148 # On other non-ELF platforms, LTO has yet to be validated.
149 *) enable_lto=no ;;
150 esac
151@@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
152 # warn during gcc/ subconfigure; unless you're bootstrapping with
153 # -flto it won't be needed until after installation anyway.
154 case $target in
155- *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;;
156+ *-cygwin* | *-mingw* | *-apple-darwin* | *-apple-ios* | *djgpp*) ;;
157 *) if test x"$enable_lto" = x"yes"; then
158 AC_MSG_ERROR([LTO support is not enabled for this target.])
159 fi
160@@ -2590,7 +2590,7 @@ rm -f conftest*
161 # Decide which environment variable is used to find dynamic libraries.
162 case "${host}" in
163 *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
164- *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
165+ *-*-darwin* | *-*-ios* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
166 *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;;
167 *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
168 esac