Re: [Update] devel/avr/gcc: 5.4.0 -> 8.4.0

On Thu, Dec 03, 2020 at 02:44:22PM +0100, Manuel Giraud wrote:
> Hi,
>
> Here is an update of avr/gcc. I was able to build current qmk_firmware
> (https://qmk.fm/) for my keyboard (with 5.4.0, it was not building since
> august 2019).

Taking this diff, here is an update to 8.5.0. Tested with ethersex.de for a
644PU which does not work with the current avr-gcc.

Also compile tested:
devel/arduino
devel/avr/gdb
devel/avr/libc (and ethersex runs this)
devel/simulavr

Comments? OKs?

-m

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/avr/gcc/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile 9 Jan 2021 21:41:16 -0000 1.36
+++ Makefile 5 Aug 2021 05:51:54 -0000
@@ -2,12 +2,9 @@

COMMENT= Atmel AVR 8-bit RISC microcontrollers' XGCC #'

-V= 5.4.0
-REVISION= 3
+V= 8.5.0
DISTNAME = gcc-$V
PKGNAME= avr-gcc-${V}
-SHARED_LIBS += cc1plugin 0.0 # 0.0
-SHARED_LIBS += cc1 0.0 # 0.0

# GPLv3
PERMIT_PACKAGE= Yes
@@ -17,7 +14,7 @@ WANTLIB= c gmp mpfr ${COMPILER_LIBCXX}
COMPILER = base-clang ports-gcc base-gcc

MASTER_SITES= ${MASTER_SITE_GCC:=releases/gcc-$(V)/}
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
DIST_SUBDIR= gcc

.if ${MACHINE_ARCH} == "powerpc64"
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/avr/gcc/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 7 Sep 2018 20:11:08 -0000 1.7
+++ distinfo 5 Aug 2021 05:51:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (gcc/gcc-5.4.0.tar.bz2) = YI33bewtNN5lWCSdivTL7iHs7dvLWA1mb3paWDyjMDo=
-SIZE (gcc/gcc-5.4.0.tar.bz2) = 95661481
+SHA256 (gcc/gcc-8.5.0.tar.xz) = 0wiEGlEbuDCmEAOXsAQtskzhH2Qtq26m7kSELlMl7VA=
+SIZE (gcc/gcc-8.5.0.tar.xz) = 63841008
Index: patches/patch-contrib_texi2pod_pl
===================================================================
RCS file: patches/patch-contrib_texi2pod_pl
diff -N patches/patch-contrib_texi2pod_pl
--- patches/patch-contrib_texi2pod_pl 16 Apr 2019 15:35:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-contrib_texi2pod_pl,v 1.1 2019/04/16 15:35:30 naddy Exp $
-
-Index: contrib/texi2pod.pl
---- contrib/texi2pod.pl.orig
-+++ contrib/texi2pod.pl
-@@ -316,7 +316,7 @@ while(<$inf>) {
- @columns = ();
- for $column (split (/\s*\@tab\s*/, $1)) {
- # @strong{...} is used a @headitem work-alike
-- $column =~ s/^\@strong{(.*)}$/$1/;
-+ $column =~ s/^\@strong\{(.*)\}$/$1/;
- push @columns, $column;
- }
- $_ = "\n=item ".join (" : ", @columns)."\n";
Index: patches/patch-gcc_auto-profile_c
===================================================================
RCS file: patches/patch-gcc_auto-profile_c
diff -N patches/patch-gcc_auto-profile_c
--- patches/patch-gcc_auto-profile_c 13 Sep 2018 11:13:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-gcc_auto-profile_c,v 1.1 2018/09/13 11:13:00 jasper Exp $
-
-fix build with libc++
-https://svnweb.freebsd.org/ports/head/devel/avr-gcc/files/patch-libc%2B%2B?revision=435893&view=markup
-
-Index: gcc/auto-profile.c
---- gcc/auto-profile.c.orig
-+++ gcc/auto-profile.c
-@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
-
- #include "config.h"
--#include "system.h"
--
--#include <string.h>
- #include <map>
- #include <set>
-+#include "system.h"
-
- #include "coretypes.h"
- #include "hash-set.h"
Index: patches/patch-gcc_graphite-isl-ast-to-gimple_c
===================================================================
RCS file: patches/patch-gcc_graphite-isl-ast-to-gimple_c
diff -N patches/patch-gcc_graphite-isl-ast-to-gimple_c
--- patches/patch-gcc_graphite-isl-ast-to-gimple_c 13 Sep 2018 11:13:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-gcc_graphite-isl-ast-to-gimple_c,v 1.1 2018/09/13 11:13:00 jasper Exp $
-
-fix build with libc++
-https://svnweb.freebsd.org/ports/head/devel/avr-gcc/files/patch-libc%2B%2B?revision=435893&view=markup
-
-Index: gcc/graphite-isl-ast-to-gimple.c
---- gcc/graphite-isl-ast-to-gimple.c.orig
-+++ gcc/graphite-isl-ast-to-gimple.c
-@@ -38,6 +38,7 @@ extern "C" {
-