Ticket #48543: arm-none-eabi-gcc-multilib.diff

File arm-none-eabi-gcc-multilib.diff, 9.0 KB (added by raimue (Rainer Müller), 9 years ago)

  • Portfile

     
    77crossgcc.setup      arm-none-eabi 5.1.0
    88crossgcc.setup_libc newlib 1.20.0
    99
    10 revision        1
     10revision        2
    1111maintainers     gmail.com:stuartwesterman openmaintainer
    1212
    1313checksums       gcc-${version}.tar.bz2 \
    … …  
    1717                sha1    65e7bdbeda0cbbf99c8160df573fd04d1cbe00d1 \
    1818                rmd160  e36c5337a74633456b47d09594974c7dd7a9cc3e
    1919
     20patchfiles      patch-enable-with-multilib-list-for-arm.diff
     21patch.pre_args  -p1
     22
    2023# specific to ARM
    21 configure.args-append --enable-interwork --disable-newlib-supplied-syscalls
     24configure.args-append --enable-interwork \
     25                      --disable-newlib-supplied-syscalls \
     26                      --with-multilib-list=armv6-m,armv7-m,armv7e-m,cortex-m7,armv7-r
    2227
    2328# Failed to build with clang from Xcode 4.5
    2429# fatal error: error in backend: ran out of registers during register allocation

  • files/patch-enable-with-multilib-list-for-arm.diff

     
     1Upstream: https://projects.archlinux.org/svntogit/community.git/tree/trunk/enable-with-multilib-list-for-arm.patch?h=packages/arm-none-eabi-gcc
     2
     3commit 605db6de62e8144a1b8f721c05f40d879f70625b
     4Author: Anatol Pomozov <anatol.pomozov@gmail.com>
     5Date:   Fri Jan 30 06:23:17 2015 -0800
     6
     7    ARM patch https://gcc.gnu.org/ml/gcc-patches/2012-05/msg00083/enable-with-multilib-list-for-arm.patch
     8
     9diff --git a/gcc/Makefile.in b/gcc/Makefile.in
     10index 4ab7405..6e1ea2c 100644
     11--- a/gcc/Makefile.in
     12+++ b/gcc/Makefile.in
     13@@ -535,6 +535,7 @@ lang_opt_files=@lang_opt_files@ $(srcdir)/c-family/c.opt $(srcdir)/common.opt
     14 lang_specs_files=@lang_specs_files@
     15 lang_tree_files=@lang_tree_files@
     16 target_cpu_default=@target_cpu_default@
     17+with_multilib_list=@with_multilib_list@
     18 OBJC_BOEHM_GC=@objc_boehm_gc@
     19 extra_modes_file=@extra_modes_file@
     20 extra_opt_files=@extra_opt_files@
     21diff --git a/gcc/config.gcc b/gcc/config.gcc
     22index cb08a5c..7bded02 100644
     23--- a/gcc/config.gcc
     24+++ b/gcc/config.gcc
     25@@ -1072,7 +1072,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
     26        case ${target} in
     27        arm*-*-eabi*)
     28          tm_file="$tm_file newlib-stdint.h"
     29-         tmake_file="${tmake_file} arm/t-bpabi"
     30+         tmake_file="${tmake_file} arm/t-bpabi arm/t-mlibs"
     31          use_gcc_stdint=wrap
     32          ;;
     33        arm*-*-rtems*)
     34@@ -3684,42 +3684,6 @@ case "${target}" in
     35                        exit 1
     36                fi
     37 
     38-               # Add extra multilibs
     39-               if test "x$with_multilib_list" != x; then
     40-                       arm_multilibs=`echo $with_multilib_list | sed -e 's/,/ /g'`
     41-                       for arm_multilib in ${arm_multilibs}; do
     42-                               case ${arm_multilib} in
     43-                               aprofile)
     44-                               # Note that arm/t-aprofile is a
     45-                               # stand-alone make file fragment to be
     46-                               # used only with itself.  We do not
     47-                               # specifically use the
     48-                               # TM_MULTILIB_OPTION framework because
     49-                               # this shorthand is more
     50-                               # pragmatic. Additionally it is only
     51-                               # designed to work without any
     52-                               # with-cpu, with-arch with-mode
     53-                               # with-fpu or with-float options.
     54-                                       if test "x$with_arch" != x \
     55-                                           || test "x$with_cpu" != x \
     56-                                           || test "x$with_float" != x \
     57-                                           || test "x$with_fpu" != x \
     58-                                           || test "x$with_mode" != x ; then
     59-                                           echo "Error: You cannot use any of --with-arch/cpu/fpu/float/mode with --with-multilib-list=aprofile" 1>&2
     60-                                           exit 1
     61-                                       fi
     62-                                       tmake_file="${tmake_file} arm/t-aprofile"
     63-                                       break
     64-                                       ;;
     65-                               default)
     66-                                       ;;
     67-                               *)
     68-                                       echo "Error: --with-multilib-list=${with_multilib_list} not supported." 1>&2
     69-                                       exit 1
     70-                                       ;;
     71-                               esac
     72-                       done
     73-               fi
     74                ;;
     75 
     76        fr*-*-*linux*)
     77diff --git a/gcc/config/arm/t-mlibs b/gcc/config/arm/t-mlibs
     78new file mode 100644
     79index 0000000..5720cf7
     80--- /dev/null
     81+++ b/gcc/config/arm/t-mlibs
     82@@ -0,0 +1,89 @@
     83+# A set of predefined MULTILIB which can be used for different ARM targets.
     84+# Via the configure option --with-multilib-list, user can customize the
     85+# final MULTILIB implementation.
     86+
     87+comma := ,
     88+space :=
     89+space +=
     90+
     91+MULTILIB_OPTIONS   = mthumb/marm
     92+MULTILIB_DIRNAMES  = thumb arm
     93+MULTILIB_OPTIONS  += march=armv6s-m/march=armv7-m/march=armv7e-m/march=armv7
     94+MULTILIB_DIRNAMES += armv6-m armv7-m armv7e-m armv7-ar
     95+MULTILIB_OPTIONS  += mfloat-abi=softfp/mfloat-abi=hard
     96+MULTILIB_DIRNAMES += softfp fpu
     97+MULTILIB_OPTIONS  += mfpu=fpv4-sp-d16/mfpu=vfpv3-d16
     98+MULTILIB_DIRNAMES += fpv4-sp-d16 vfpv3-d16
     99+
     100+MULTILIB_MATCHES   = march?armv6s-m=mcpu?cortex-m0
     101+MULTILIB_MATCHES  += march?armv6s-m=mcpu?cortex-m0plus
     102+MULTILIB_MATCHES  += march?armv6s-m=mcpu?cortex-m1
     103+MULTILIB_MATCHES  += march?armv6s-m=march?armv6-m
     104+MULTILIB_MATCHES  += march?armv7-m=mcpu?cortex-m3
     105+MULTILIB_MATCHES  += march?armv7e-m=mcpu?cortex-m4
     106+MULTILIB_MATCHES  += march?armv7e-m=mcpu?cortex-m7
     107+MULTILIB_MATCHES  += march?armv7=march?armv7-r
     108+MULTILIB_MATCHES  += march?armv7=march?armv7-a
     109+MULTILIB_MATCHES  += march?armv7=mcpu?cortex-r4
     110+MULTILIB_MATCHES  += march?armv7=mcpu?cortex-r4f
     111+MULTILIB_MATCHES  += march?armv7=mcpu?cortex-r5
     112+MULTILIB_MATCHES  += march?armv7=mcpu?cortex-r7
     113+MULTILIB_MATCHES  += march?armv7=mcpu?cortex-a5
     114+MULTILIB_MATCHES  += march?armv7=mcpu?cortex-a7
     115+MULTILIB_MATCHES  += march?armv7=mcpu?cortex-a8
     116+MULTILIB_MATCHES  += march?armv7=mcpu?cortex-a9
     117+MULTILIB_MATCHES  += march?armv7=mcpu?cortex-a15
     118+MULTILIB_MATCHES  += mfpu?fpv4-sp-d16=mfpu?fpv5-sp-d16
     119+MULTILIB_MATCHES  += mfpu?fpv4-sp-d16=mfpu?fpv5-d16
     120+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?vfpv3
     121+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?vfpv3-fp16
     122+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?vfpv3-d16-fp16
     123+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?vfpv3xd
     124+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?vfpv3xd-fp16
     125+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?vfpv4
     126+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?vfpv4-d16
     127+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?neon
     128+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?neon-fp16
     129+MULTILIB_MATCHES  += mfpu?vfpv3-d16=mfpu?neon-vfpv4
     130+
     131+MULTILIB_EXCEPTIONS =
     132+MULTILIB_REUSE =
     133+
     134+MULTILIB_REQUIRED  = mthumb
     135+MULTILIB_REQUIRED += marm
     136+MULTILIB_REQUIRED += mfloat-abi=hard
     137+
     138+MULTILIB_OSDIRNAMES  = mthumb=!thumb
     139+MULTILIB_OSDIRNAMES += marm=!arm
     140+MULTILIB_OSDIRNAMES += mfloat-abi.hard=!fpu
     141+
     142+ifneq (,$(findstring armv6-m,$(subst $(comma),$(space),$(with_multilib_list))))
     143+MULTILIB_REQUIRED   += mthumb/march=armv6s-m
     144+MULTILIB_OSDIRNAMES += mthumb/march.armv6s-m=!armv6-m
     145+endif
     146+
     147+ifneq (,$(findstring armv7-m,$(subst $(comma),$(space),$(with_multilib_list))))
     148+MULTILIB_REQUIRED   += mthumb/march=armv7-m
     149+MULTILIB_OSDIRNAMES += mthumb/march.armv7-m=!armv7-m
     150+endif
     151+
     152+ifneq (,$(findstring armv7e-m,$(subst $(comma),$(space),$(with_multilib_list))))
     153+MULTILIB_REQUIRED   += mthumb/march=armv7e-m
     154+MULTILIB_REQUIRED   += mthumb/march=armv7e-m/mfloat-abi=softfp/mfpu=fpv4-sp-d16
     155+MULTILIB_REQUIRED   += mthumb/march=armv7e-m/mfloat-abi=hard/mfpu=fpv4-sp-d16
     156+MULTILIB_OSDIRNAMES += mthumb/march.armv7e-m=!armv7e-m
     157+MULTILIB_OSDIRNAMES += mthumb/march.armv7e-m/mfloat-abi.hard/mfpu.fpv4-sp-d16=!armv7e-m/fpu
     158+MULTILIB_OSDIRNAMES += mthumb/march.armv7e-m/mfloat-abi.softfp/mfpu.fpv4-sp-d16=!armv7e-m/softfp
     159+endif
     160+
     161+ifneq (,$(filter armv7 armv7-r armv7-a,$(subst $(comma),$(space),$(with_multilib_list))))
     162+MULTILIB_REQUIRED   += mthumb/march=armv7
     163+MULTILIB_REQUIRED   += mthumb/march=armv7/mfloat-abi=softfp/mfpu=vfpv3-d16
     164+MULTILIB_REQUIRED   += mthumb/march=armv7/mfloat-abi=hard/mfpu=vfpv3-d16
     165+MULTILIB_OSDIRNAMES += mthumb/march.armv7=!armv7-ar/thumb
     166+MULTILIB_OSDIRNAMES += mthumb/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16=!armv7-ar/thumb/fpu
     167+MULTILIB_OSDIRNAMES += mthumb/march.armv7/mfloat-abi.softfp/mfpu.vfpv3-d16=!armv7-ar/thumb/softfp
     168+MULTILIB_REUSE      += mthumb/march.armv7=marm/march.armv7
     169+MULTILIB_REUSE      += mthumb/march.armv7/mfloat-abi.softfp/mfpu.vfpv3-d16=marm/march.armv7/mfloat-abi.softfp/mfpu.vfpv3-d16
     170+MULTILIB_REUSE      += mthumb/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16=marm/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16
     171+endif
     172diff --git a/gcc/configure b/gcc/configure
     173index 9523773..24952e3 100755
     174--- a/gcc/configure
     175+++ b/gcc/configure
     176@@ -763,6 +763,7 @@ SET_MAKE
     177 accel_dir_suffix
     178 real_target_noncanonical
     179 enable_as_accelerator
     180+with_multilib_list
     181 REPORT_BUGS_TEXI
     182 REPORT_BUGS_TO
     183 PKGVERSION
     184@@ -7462,6 +7463,7 @@ else
     185 fi
     186 
     187 
     188+
     189 # -------------------------
     190 # Checks for other programs
     191 # -------------------------
     192diff --git a/gcc/configure.ac b/gcc/configure.ac
     193index 68b0ee8..f8a1097 100644
     194--- a/gcc/configure.ac
     195+++ b/gcc/configure.ac
     196@@ -925,6 +925,7 @@ AC_ARG_WITH(multilib-list,
     197 [AS_HELP_STRING([--with-multilib-list], [select multilibs (AArch64, SH and x86-64 only)])],
     198 :,
     199 with_multilib_list=default)
     200+AC_SUBST(with_multilib_list)
     201 
     202 # -------------------------
     203 # Checks for other programs