<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/76c3b45d27eb9f8a7a4c178d3ba9e3b642cda5ae">https://github.com/macports/macports-ports/commit/76c3b45d27eb9f8a7a4c178d3ba9e3b642cda5ae</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 76c3b45d27eb9f8a7a4c178d3ba9e3b642cda5ae
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Fri Apr 13 20:27:32 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> arm-none-eabi-gcc: update to gcc 7.3.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/55213
</span>---
cross/arm-none-eabi-gcc/Portfile | 12 +--
.../patch-enable-with-multilib-list-for-arm.diff | 96 +++++++++++++---------
2 files changed, 57 insertions(+), 51 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/arm-none-eabi-gcc/Portfile b/cross/arm-none-eabi-gcc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 951f553..cf8959a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/arm-none-eabi-gcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/arm-none-eabi-gcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,20 +4,12 @@ PortSystem 1.0
</span> PortGroup crossgcc 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-crossgcc.setup arm-none-eabi 5.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-crossgcc.setup_libc newlib 2.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossgcc.setup arm-none-eabi 7.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossgcc.setup_libc newlib 3.0.0
</span>
revision 3
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums gcc-${version}.tar.bz2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7ae3413ca7e90bb21e65e637c02ddf2b675b45f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- newlib-${crossgcc.libc_version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 be1f1960bce564130a0cf9598e388fcc437169dc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 fc2beafe309701e02da3d2dff737236f67c0de4d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-enable-with-multilib-list-for-arm.diff
patch.pre_args -p1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/arm-none-eabi-gcc/files/patch-enable-with-multilib-list-for-arm.diff b/cross/arm-none-eabi-gcc/files/patch-enable-with-multilib-list-for-arm.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cbb388b..4d17a14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/arm-none-eabi-gcc/files/patch-enable-with-multilib-list-for-arm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/arm-none-eabi-gcc/files/patch-enable-with-multilib-list-for-arm.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span> Upstream: https://projects.archlinux.org/svntogit/community.git/tree/trunk/enable-with-multilib-list-for-arm.patch?h=packages/arm-none-eabi-gcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-commit 605db6de62e8144a1b8f721c05f40d879f70625b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 71587241301d28b68bbe2f41c5eb2856053c750c
</span> Author: Anatol Pomozov <anatol.pomozov@gmail.com>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri Jan 30 06:23:17 2015 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue May 9 21:19:27 2017 -0700
</span>
ARM patch https://gcc.gnu.org/ml/gcc-patches/2012-05/msg00083/enable-with-multilib-list-for-arm.patch
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4ab7405..6e1ea2c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f675e073ecc..cced5329b47 100644
</span> --- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -535,6 +535,7 @@ lang_opt_files=@lang_opt_files@ $(srcdir)/c-family/c.opt $(srcdir)/common.opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -558,6 +558,7 @@ lang_opt_files=@lang_opt_files@ $(srcdir)/c-family/c.opt $(srcdir)/common.opt
</span> lang_specs_files=@lang_specs_files@
lang_tree_files=@lang_tree_files@
target_cpu_default=@target_cpu_default@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,10 +19,10 @@ index 4ab7405..6e1ea2c 100644
</span> extra_modes_file=@extra_modes_file@
extra_opt_files=@extra_opt_files@
diff --git a/gcc/config.gcc b/gcc/config.gcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index cb08a5c..7bded02 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b8bb4d65825..713e35b62af 100644
</span> --- a/gcc/config.gcc
+++ b/gcc/config.gcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1072,7 +1072,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1140,7 +1140,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems* | arm*-*-fuchsia*)
</span> case ${target} in
arm*-*-eabi*)
tm_file="$tm_file newlib-stdint.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,53 +30,67 @@ index cb08a5c..7bded02 100644
</span> + tmake_file="${tmake_file} arm/t-bpabi arm/t-mlibs"
use_gcc_stdint=wrap
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- arm*-*-rtems*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3684,42 +3684,6 @@ case "${target}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arm*-*-fuchsia*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3787,56 +3787,6 @@ case "${target}" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Switch \"--with-tune\" may not be used with switch \"--with-cpu\"" 1>&2
</span> exit 1
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - # Add extra multilibs
- if test "x$with_multilib_list" != x; then
- arm_multilibs=`echo $with_multilib_list | sed -e 's/,/ /g'`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- for arm_multilib in ${arm_multilibs}; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ${arm_multilib} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- aprofile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case ${arm_multilibs} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- aprofile)
</span> - # Note that arm/t-aprofile is a
- # stand-alone make file fragment to be
- # used only with itself. We do not
- # specifically use the
- # TM_MULTILIB_OPTION framework because
- # this shorthand is more
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- # pragmatic. Additionally it is only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # designed to work without any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # with-cpu, with-arch with-mode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # with-fpu or with-float options.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$with_arch" != x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || test "x$with_cpu" != x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || test "x$with_float" != x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || test "x$with_fpu" != x \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || test "x$with_mode" != x ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "Error: You cannot use any of --with-arch/cpu/fpu/float/mode with --with-multilib-list=aprofile" 1>&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tmake_file="${tmake_file} arm/t-aprofile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- default)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "Error: --with-multilib-list=${with_multilib_list} not supported." 1>&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # pragmatic.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmake_profile_file="arm/t-aprofile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rmprofile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Note that arm/t-rmprofile is a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # stand-alone make file fragment to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # used only with itself. We do not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # specifically use the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # TM_MULTILIB_OPTION framework because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # this shorthand is more
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # pragmatic.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmake_profile_file="arm/t-rmprofile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- default)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "Error: --with-multilib-list=${with_multilib_list} not supported." 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x${tmake_profile_file}" != x ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # arm/t-aprofile and arm/t-rmprofile are only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # designed to work without any with-cpu,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # with-arch, with-mode, with-fpu or with-float
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$with_arch" != x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- || test "x$with_cpu" != x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- || test "x$with_float" != x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- || test "x$with_fpu" != x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- || test "x$with_mode" != x ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "Error: You cannot use any of --with-arch/cpu/fpu/float/mode with --with-multilib-list=${with_multilib_list}" 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmake_file="${tmake_file} ${tmake_profile_file}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span> - fi
;;
fr*-*-*linux*)
diff --git a/gcc/config/arm/t-mlibs b/gcc/config/arm/t-mlibs
new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..5720cf7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 00000000000..5720cf7503d
</span> --- /dev/null
+++ b/gcc/config/arm/t-mlibs
@@ -0,0 +1,89 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,10 +184,10 @@ index 0000000..5720cf7
</span> +MULTILIB_REUSE += mthumb/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16=marm/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16
+endif
diff --git a/gcc/configure b/gcc/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9523773..24952e3 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ea73b151a4e..c609f25e50c 100755
</span> --- a/gcc/configure
+++ b/gcc/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -763,6 +763,7 @@ SET_MAKE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -772,6 +772,7 @@ SET_MAKE
</span> accel_dir_suffix
real_target_noncanonical
enable_as_accelerator
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,7 +195,7 @@ index 9523773..24952e3 100755
</span> REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7462,6 +7463,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7763,6 +7764,7 @@ else
</span> fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,10 +204,10 @@ index 9523773..24952e3 100755
</span> # Checks for other programs
# -------------------------
diff --git a/gcc/configure.ac b/gcc/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 68b0ee8..f8a1097 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9d4c792a33f..abd988eb113 100644
</span> --- a/gcc/configure.ac
+++ b/gcc/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -925,6 +925,7 @@ AC_ARG_WITH(multilib-list,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1007,6 +1007,7 @@ AC_ARG_WITH(multilib-list,
</span> [AS_HELP_STRING([--with-multilib-list], [select multilibs (AArch64, SH and x86-64 only)])],
:,
with_multilib_list=default)
</pre><pre style='margin:0'>
</pre>