devel/avr-gcc: Update to GCC 11.2

Also include the specs file for recent AVR-Dx MCUs (e.g. AVR128DA48
etc.), so the compiler can handle these, in addition to the builtin
MCU types. These files come straight from the Microchip device pack.

5 files changed, 76 insertions, 12 deletions

diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 455f1e58085a..930e79a5c493 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gcc
-PORTVERSION=	10.3.0
+PORTVERSION=	11.2.0
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX=	avr-
@@ -25,7 +25,7 @@ RUN_DEPENDS=	avr-as:devel/binutils@avr \
 USES=		bison compiler:c++11-lang cpe gmake iconv libtool localbase \
 		makeinfo perl5 tar:xz
 CPE_VENDOR=	gnu
-USE_CXXSTD=	gnu++03
+USE_CXXSTD=	gnu++11
 USE_LDCONFIG=	${PREFIX}/lib/gcci/avr/${SUFFIX}
 USE_PERL5=	build
 
@@ -73,9 +73,10 @@ post-configure:
 	${MKDIR} ${WRKSRC}/gcc/include
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gcc/avr/${PORTVERSION}/liblto_plugin.so.0 \
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gcc/avr/${PORTVERSION}/liblto_plugin.so \
 		${STAGEDIR}${PREFIX}/lib/libcc1.so.0.0.0 \
 		${STAGEDIR}${PREFIX}/lib/gcc/avr/${PORTVERSION}/plugin/libcc1plugin.so.0.0.0 \
 		${STAGEDIR}${PREFIX}/lib/gcc/avr/${PORTVERSION}/plugin/libcp1plugin.so.0.0.0
+	tar -C ${STAGEDIR}${PREFIX} -xj -f ${FILESDIR}/specs-avr-dx.tar.bz2
 
 .include <bsd.port.post.mk>
diff --git a/devel/avr-gcc/distinfo b/devel/avr-gcc/distinfo
index 4496f6e864cc..e2c050a0ad52 100644
--- a/devel/avr-gcc/distinfo
+++ b/devel/avr-gcc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644700172
-SHA256 (gcc-10.3.0.tar.xz) = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
-SIZE (gcc-10.3.0.tar.xz) = 76692288
+TIMESTAMP = 1645127981
+SHA256 (gcc-11.2.0.tar.xz) = d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b
+SIZE (gcc-11.2.0.tar.xz) = 80888824
diff --git a/devel/avr-gcc/files/patch-libgcov.h b/devel/avr-gcc/files/patch-libgcov.h
new file mode 100644
index 000000000000..91419497132b
--- /dev/null
+++ b/devel/avr-gcc/files/patch-libgcov.h
@@ -0,0 +1,11 @@
+--- libgcc/libgcov.h~	2021-07-28 08:55:08.812308622 +0200
++++ libgcc/libgcov.h	2022-02-18 23:18:28.532448000 +0100
+@@ -45,6 +45,8 @@
+ #include "libgcc_tm.h"
+ #include "gcov.h"
+ 
++#undef HAVE_SYS_MMAN_H // AVR environment doesn't have it
++
+ #if HAVE_SYS_MMAN_H
+ #include <sys/mman.h>
+ #endif
diff --git a/devel/avr-gcc/files/specs-avr-dx.tar.bz2 b/devel/avr-gcc/files/specs-avr-dx.tar.bz2
new file mode 100644
index 000000000000..6b86d3b0d2a4
--- /dev/null
+++ b/devel/avr-gcc/files/specs-avr-dx.tar.bz2
diff --git a/devel/avr-gcc/pkg-plist b/devel/avr-gcc/pkg-plist
index 32e08696a889..b63288207a0a 100644
--- a/devel/avr-gcc/pkg-plist
+++ b/devel/avr-gcc/pkg-plist
@@ -421,6 +421,40 @@ lib/gcc/avr/%%VERSION%%/device-specs/specs-avrxmega5
 lib/gcc/avr/%%VERSION%%/device-specs/specs-avrxmega6
 lib/gcc/avr/%%VERSION%%/device-specs/specs-avrxmega7
 lib/gcc/avr/%%VERSION%%/device-specs/specs-m3000
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64dd32
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr16dd32
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32dd14
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr128da48
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64dd14
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32dd32
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr128da32
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr16dd14
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr128da64
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr128db28
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64dd28
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr128db48
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr16dd28
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr128db32
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr128db64
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr128da28
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32dd28
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64db32
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32dd20
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64da28
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32db48
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64db64
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64dd20
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr16dd20
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32db32
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64db48
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32da28
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64da32
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64db28
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32da48
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64da64
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32da32
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr64da48
+lib/gcc/avr/%%VERSION%%/device-specs/specs-avr32db28
 lib/gcc/avr/%%VERSION%%/double64/libgcc.a
 lib/gcc/avr/%%VERSION%%/double64/libgcov.a
 lib/gcc/avr/%%VERSION%%/include-fixed/README
@@ -461,6 +495,7 @@ lib/gcc/avr/%%VERSION%%/plugin/include/alloc-pool.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ansidecl.h
 lib/gcc/avr/%%VERSION%%/plugin/include/array-traits.h
 lib/gcc/avr/%%VERSION%%/plugin/include/asan.h
+lib/gcc/avr/%%VERSION%%/plugin/include/attr-fnspec.h
 lib/gcc/avr/%%VERSION%%/plugin/include/attribs.h
 lib/gcc/avr/%%VERSION%%/plugin/include/auto-host.h
 lib/gcc/avr/%%VERSION%%/plugin/include/auto-profile.h
@@ -589,6 +624,7 @@ lib/gcc/avr/%%VERSION%%/plugin/include/genrtl.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gensupport.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ggc-internal.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ggc.h
+lib/gcc/avr/%%VERSION%%/plugin/include/gimple-array-bounds.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimple-builder.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimple-expr.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimple-fold.h
@@ -597,6 +633,10 @@ lib/gcc/avr/%%VERSION%%/plugin/include/gimple-low.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimple-match.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimple-predict.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimple-pretty-print.h
+lib/gcc/avr/%%VERSION%%/plugin/include/gimple-range-cache.h
+lib/gcc/avr/%%VERSION%%/plugin/include/gimple-range-edge.h
+lib/gcc/avr/%%VERSION%%/plugin/include/gimple-range-gori.h
+lib/gcc/avr/%%VERSION%%/plugin/include/gimple-range.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimple-ssa-evrp-analyze.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimple-ssa-warn-restrict.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimple-ssa.h
@@ -607,6 +647,7 @@ lib/gcc/avr/%%VERSION%%/plugin/include/gimple.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimplify-me.h
 lib/gcc/avr/%%VERSION%%/plugin/include/gimplify.h
 lib/gcc/avr/%%VERSION%%/plugin/include/glimits.h
+lib/gcc/avr/%%VERSION%%/plugin/include/gomp-constants.h
 lib/gcc/avr/%%VERSION%%/plugin/include/graph.h
 lib/gcc/avr/%%VERSION%%/plugin/include/graphds.h
 lib/gcc/avr/%%VERSION%%/plugin/include/graphite.h
@@ -628,9 +669,6 @@ lib/gcc/avr/%%VERSION%%/plugin/include/highlev-plugin-common.h
 lib/gcc/avr/%%VERSION%%/plugin/include/hooks.h
 lib/gcc/avr/%%VERSION%%/plugin/include/hosthooks-def.h
 lib/gcc/avr/%%VERSION%%/plugin/include/hosthooks.h
-lib/gcc/avr/%%VERSION%%/plugin/include/hsa-brig-format.h
-lib/gcc/avr/%%VERSION%%/plugin/include/hsa-builtins.def
-lib/gcc/avr/%%VERSION%%/plugin/include/hsa-common.h
 lib/gcc/avr/%%VERSION%%/plugin/include/hw-doloop.h
 lib/gcc/avr/%%VERSION%%/plugin/include/hwint.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ifcvt.h
@@ -641,6 +679,7 @@ lib/gcc/avr/%%VERSION%%/plugin/include/insn-addr.h
 lib/gcc/avr/%%VERSION%%/plugin/include/insn-attr-common.h
 lib/gcc/avr/%%VERSION%%/plugin/include/insn-attr.h
 lib/gcc/avr/%%VERSION%%/plugin/include/insn-codes.h
+lib/gcc/avr/%%VERSION%%/plugin/include/insn-config.h
 lib/gcc/avr/%%VERSION%%/plugin/include/insn-constants.h
 lib/gcc/avr/%%VERSION%%/plugin/include/insn-flags.h
 lib/gcc/avr/%%VERSION%%/plugin/include/insn-modes-inline.h
@@ -654,6 +693,8 @@ lib/gcc/avr/%%VERSION%%/plugin/include/ipa-fnsummary.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ipa-icf-gimple.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ipa-icf.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ipa-inline.h
+lib/gcc/avr/%%VERSION%%/plugin/include/ipa-modref-tree.h
+lib/gcc/avr/%%VERSION%%/plugin/include/ipa-modref.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ipa-param-manipulation.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ipa-predicate.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ipa-prop.h
@@ -663,6 +704,7 @@ lib/gcc/avr/%%VERSION%%/plugin/include/ipa-utils.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ira-int.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ira.h
 lib/gcc/avr/%%VERSION%%/plugin/include/is-a.h
+lib/gcc/avr/%%VERSION%%/plugin/include/iterator-utils.h
 lib/gcc/avr/%%VERSION%%/plugin/include/json.h
 lib/gcc/avr/%%VERSION%%/plugin/include/langhooks-def.h
 lib/gcc/avr/%%VERSION%%/plugin/include/langhooks.h
@@ -687,12 +729,13 @@ lib/gcc/avr/%%VERSION%%/plugin/include/mem-stats.h
 lib/gcc/avr/%%VERSION%%/plugin/include/memmodel.h
 lib/gcc/avr/%%VERSION%%/plugin/include/memory-block.h
 lib/gcc/avr/%%VERSION%%/plugin/include/mode-classes.def
+lib/gcc/avr/%%VERSION%%/plugin/include/mux-utils.h
 lib/gcc/avr/%%VERSION%%/plugin/include/objc/objc-tree.def
+lib/gcc/avr/%%VERSION%%/plugin/include/obstack-utils.h
 lib/gcc/avr/%%VERSION%%/plugin/include/obstack.h
 lib/gcc/avr/%%VERSION%%/plugin/include/omp-builtins.def
 lib/gcc/avr/%%VERSION%%/plugin/include/omp-expand.h
 lib/gcc/avr/%%VERSION%%/plugin/include/omp-general.h
-lib/gcc/avr/%%VERSION%%/plugin/include/omp-grid.h
 lib/gcc/avr/%%VERSION%%/plugin/include/omp-low.h
 lib/gcc/avr/%%VERSION%%/plugin/include/omp-offload.h
 lib/gcc/avr/%%VERSION%%/plugin/include/omp-simd-clone.h
@@ -743,8 +786,10 @@ lib/gcc/avr/%%VERSION%%/plugin/include/reload.h
 lib/gcc/avr/%%VERSION%%/plugin/include/resource.h
 lib/gcc/avr/%%VERSION%%/plugin/include/rtl-error.h
 lib/gcc/avr/%%VERSION%%/plugin/include/rtl-iter.h
+lib/gcc/avr/%%VERSION%%/plugin/include/rtl-ssa.h
 lib/gcc/avr/%%VERSION%%/plugin/include/rtl.def
 lib/gcc/avr/%%VERSION%%/plugin/include/rtl.h
+lib/gcc/avr/%%VERSION%%/plugin/include/rtlanal.h
 lib/gcc/avr/%%VERSION%%/plugin/include/rtlhash.h
 lib/gcc/avr/%%VERSION%%/plugin/include/rtlhooks-def.h
 lib/gcc/avr/%%VERSION%%/plugin/include/rtx-vector-builder.h
@@ -766,6 +811,7 @@ lib/gcc/avr/%%VERSION%%/plugin/include/signop.h
 lib/gcc/avr/%%VERSION%%/plugin/include/sparseset.h
 lib/gcc/avr/%%VERSION%%/plugin/include/spellcheck-tree.h
 lib/gcc/avr/%%VERSION%%/plugin/include/spellcheck.h
+lib/gcc/avr/%%VERSION%%/plugin/include/splay-tree-utils.h
 lib/gcc/avr/%%VERSION%%/plugin/include/splay-tree.h
 lib/gcc/avr/%%VERSION%%/plugin/include/sreal.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ssa-iterators.h
@@ -778,6 +824,8 @@ lib/gcc/avr/%%VERSION%%/plugin/include/streamer-hooks.h
 lib/gcc/avr/%%VERSION%%/plugin/include/stringpool.h
 lib/gcc/avr/%%VERSION%%/plugin/include/substring-locations.h
 lib/gcc/avr/%%VERSION%%/plugin/include/symbol-summary.h
+lib/gcc/avr/%%VERSION%%/plugin/include/symtab-clones.h
+lib/gcc/avr/%%VERSION%%/plugin/include/symtab-thunks.h
 lib/gcc/avr/%%VERSION%%/plugin/include/symtab.h
 lib/gcc/avr/%%VERSION%%/plugin/include/sync-builtins.def
 lib/gcc/avr/%%VERSION%%/plugin/include/system.h
@@ -823,6 +871,7 @@ lib/gcc/avr/%%VERSION%%/plugin/include/tree-pretty-print.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-scalar-evolution.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-sra.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-address.h
+lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-alias-compare.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-alias.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-ccp.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-coalesce.h
@@ -834,8 +883,10 @@ lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-loop-ivopts.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-loop-manip.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-loop-niter.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-loop.h
+lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-math-opts.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-operands.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-propagate.h
+lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-reassoc.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-sccvn.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-scopedtables.h
 lib/gcc/avr/%%VERSION%%/plugin/include/tree-ssa-strlen.h
@@ -861,6 +912,8 @@ lib/gcc/avr/%%VERSION%%/plugin/include/typed-splay-tree.h
 lib/gcc/avr/%%VERSION%%/plugin/include/ubsan.h
 lib/gcc/avr/%%VERSION%%/plugin/include/valtrack.h
 lib/gcc/avr/%%VERSION%%/plugin/include/value-prof.h
+lib/gcc/avr/%%VERSION%%/plugin/include/value-query.h
+lib/gcc/avr/%%VERSION%%/plugin/include/value-range-equiv.h
 lib/gcc/avr/%%VERSION%%/plugin/include/value-range.h
 lib/gcc/avr/%%VERSION%%/plugin/include/varasm.h
 lib/gcc/avr/%%VERSION%%/plugin/include/vec-perm-indices.h
@@ -893,13 +946,12 @@ lib/libcc1.so.0.0.0
 libexec/gcc/avr/%%VERSION%%/cc1
 libexec/gcc/avr/%%VERSION%%/cc1plus
 libexec/gcc/avr/%%VERSION%%/collect2
+libexec/gcc/avr/%%VERSION%%/g++-mapper-server
 libexec/gcc/avr/%%VERSION%%/install-tools/fixinc.sh
 libexec/gcc/avr/%%VERSION%%/install-tools/fixincl
 libexec/gcc/avr/%%VERSION%%/install-tools/mkheaders
 libexec/gcc/avr/%%VERSION%%/install-tools/mkinstalldirs
 libexec/gcc/avr/%%VERSION%%/liblto_plugin.so
-libexec/gcc/avr/%%VERSION%%/liblto_plugin.so.0
-libexec/gcc/avr/%%VERSION%%/liblto_plugin.so.0.0.0
 libexec/gcc/avr/%%VERSION%%/lto-wrapper
 libexec/gcc/avr/%%VERSION%%/lto1
 libexec/gcc/avr/%%VERSION%%/plugin/gengtype