casa-mp-base
Public
Commits
Mojca Miklavec authored a28aa8b15ac
| 1 1 | Upstream: https://projects.archlinux.org/svntogit/community.git/tree/trunk/enable-with-multilib-list-for-arm.patch?h=packages/arm-none-eabi-gcc |
| 2 2 | |
| 3 3 | commit 71587241301d28b68bbe2f41c5eb2856053c750c |
| 4 4 | Author: Anatol Pomozov <anatol.pomozov@gmail.com> |
| 5 5 | Date: Tue May 9 21:19:27 2017 -0700 |
| 6 6 | |
| 7 7 | ARM patch https://gcc.gnu.org/ml/gcc-patches/2012-05/msg00083/enable-with-multilib-list-for-arm.patch |
| 8 8 | |
| 9 9 | diff --git a/gcc/Makefile.in b/gcc/Makefile.in |
| 10 10 | index f675e073ecc..cced5329b47 100644 |
| 11 - | --- a/gcc/Makefile.in |
| 12 - | +++ b/gcc/Makefile.in |
| 11 + | --- gcc/Makefile.in |
| 12 + | +++ gcc/Makefile.in |
| 13 13 | |
| 14 14 | lang_specs_files=@lang_specs_files@ |
| 15 15 | lang_tree_files=@lang_tree_files@ |
| 16 16 | target_cpu_default=@target_cpu_default@ |
| 17 17 | +with_multilib_list=@with_multilib_list@ |
| 18 18 | OBJC_BOEHM_GC=@objc_boehm_gc@ |
| 19 19 | extra_modes_file=@extra_modes_file@ |
| 20 20 | extra_opt_files=@extra_opt_files@ |
| 21 21 | diff --git a/gcc/config.gcc b/gcc/config.gcc |
| 22 22 | index b8bb4d65825..713e35b62af 100644 |
| 23 - | --- a/gcc/config.gcc |
| 24 - | +++ b/gcc/config.gcc |
| 23 + | --- gcc/config.gcc |
| 24 + | +++ gcc/config.gcc |
| 25 25 | |
| 26 26 | case ${target} in |
| 27 27 | arm*-*-eabi*) |
| 28 28 | tm_file="$tm_file newlib-stdint.h" |
| 29 29 | - tmake_file="${tmake_file} arm/t-bpabi" |
| 30 30 | + tmake_file="${tmake_file} arm/t-bpabi arm/t-mlibs" |
| 31 31 | use_gcc_stdint=wrap |
| 32 32 | ;; |
| 33 33 | arm*-*-fuchsia*) |
| 34 34 | |
| 85 85 | - tmake_file="${tmake_file} ${tmake_profile_file}" |
| 86 86 | - fi |
| 87 87 | - fi |
| 88 88 | ;; |
| 89 89 | |
| 90 90 | fr*-*-*linux*) |
| 91 91 | diff --git a/gcc/config/arm/t-mlibs b/gcc/config/arm/t-mlibs |
| 92 92 | new file mode 100644 |
| 93 93 | index 00000000000..5720cf7503d |
| 94 94 | --- /dev/null |
| 95 - | +++ b/gcc/config/arm/t-mlibs |
| 95 + | +++ gcc/config/arm/t-mlibs |
| 96 96 | |
| 97 97 | +# A set of predefined MULTILIB which can be used for different ARM targets. |
| 98 98 | +# Via the configure option --with-multilib-list, user can customize the |
| 99 99 | +# final MULTILIB implementation. |
| 100 100 | + |
| 101 101 | +comma := , |
| 102 102 | +space := |
| 103 103 | +space += |
| 104 104 | + |
| 105 105 | +MULTILIB_OPTIONS = mthumb/marm |
| 178 178 | +MULTILIB_REQUIRED += mthumb/march=armv7/mfloat-abi=hard/mfpu=vfpv3-d16 |
| 179 179 | +MULTILIB_OSDIRNAMES += mthumb/march.armv7=!armv7-ar/thumb |
| 180 180 | +MULTILIB_OSDIRNAMES += mthumb/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16=!armv7-ar/thumb/fpu |
| 181 181 | +MULTILIB_OSDIRNAMES += mthumb/march.armv7/mfloat-abi.softfp/mfpu.vfpv3-d16=!armv7-ar/thumb/softfp |
| 182 182 | +MULTILIB_REUSE += mthumb/march.armv7=marm/march.armv7 |
| 183 183 | +MULTILIB_REUSE += mthumb/march.armv7/mfloat-abi.softfp/mfpu.vfpv3-d16=marm/march.armv7/mfloat-abi.softfp/mfpu.vfpv3-d16 |
| 184 184 | +MULTILIB_REUSE += mthumb/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16=marm/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16 |
| 185 185 | +endif |
| 186 186 | diff --git a/gcc/configure b/gcc/configure |
| 187 187 | index ea73b151a4e..c609f25e50c 100755 |
| 188 - | --- a/gcc/configure |
| 189 - | +++ b/gcc/configure |
| 188 + | --- gcc/configure |
| 189 + | +++ gcc/configure |
| 190 190 | |
| 191 191 | accel_dir_suffix |
| 192 192 | real_target_noncanonical |
| 193 193 | enable_as_accelerator |
| 194 194 | +with_multilib_list |
| 195 195 | REPORT_BUGS_TEXI |
| 196 196 | REPORT_BUGS_TO |
| 197 197 | PKGVERSION |
| 198 198 | |
| 199 199 | fi |
| 200 200 | |
| 201 201 | |
| 202 202 | + |
| 203 203 | # ------------------------- |
| 204 204 | # Checks for other programs |
| 205 205 | # ------------------------- |
| 206 206 | diff --git a/gcc/configure.ac b/gcc/configure.ac |
| 207 207 | index 9d4c792a33f..abd988eb113 100644 |
| 208 - | --- a/gcc/configure.ac |
| 209 - | +++ b/gcc/configure.ac |
| 208 + | --- gcc/configure.ac |
| 209 + | +++ gcc/configure.ac |
| 210 210 | |
| 211 211 | [AS_HELP_STRING([--with-multilib-list], [select multilibs (AArch64, SH and x86-64 only)])], |
| 212 212 | :, |
| 213 213 | with_multilib_list=default) |
| 214 214 | +AC_SUBST(with_multilib_list) |
| 215 215 | |
| 216 216 | # ------------------------- |
| 217 217 | # Checks for other programs |