lang/gnat12: fix plist for aarch64 and add assets

Add assets for FreeBSD-12 / amd64 and FreeBSD-13 / aarch64

3 files changed, 162 insertions, 135 deletions

diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile
index ace641064c31..dda0d34820b4 100644
--- a/lang/gnat12/Makefile
+++ b/lang/gnat12/Makefile
@@ -106,6 +106,11 @@ PLIST_SUB+=	64BITS="@comment "
 LIB_DIR_32=	"" 32
 PLIST_SUB+=	64BITS=""
 .endif
+.if ${ARCH} == aarch64
+PLIST_SUB+=	ARM="" NOARM="@comment "
+.else
+PLIST_SUB+=	ARM="@comment " NOARM=""
+.endif
 
 pre-configure:
 	${FIND} ${WRKSRC}/gcc/config -name "*freebsd.h" | ${XARGS}	\
diff --git a/lang/gnat12/distinfo b/lang/gnat12/distinfo
index 10b5ca54cf41..c2aa82bebaef 100644
--- a/lang/gnat12/distinfo
+++ b/lang/gnat12/distinfo
@@ -1,10 +1,14 @@
-TIMESTAMP = 1671535092
+TIMESTAMP = 1672048596
 SHA256 (gcc-12.2.0.tar.xz) = e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
 SIZE (gcc-12.2.0.tar.xz) = 84645292
+SHA256 (gnat-aarch64-freebsd.13-12.2.0_2.tar.xz) = 93d625979ffdaf4a6a320e92cca902c1298773e8e57a77987af5f06ed8f84b4d
+SIZE (gnat-aarch64-freebsd.13-12.2.0_2.tar.xz) = 62352064
 SHA256 (gnat-i386-freebsd.13-12.2.0_2.tar.xz) = 77a7d3cfb8e4b7cb19de6eb85706baec2b62f86be759548a7c876fd4e81bc42a
 SIZE (gnat-i386-freebsd.13-12.2.0_2.tar.xz) = 71342768
 SHA256 (gnat-i386-freebsd.14-12.2.0_2.tar.xz) = ef5d5d17b32b4c9c4115c59d1061a1f82334f336bd12f424ad8ad9673f5c63fd
 SIZE (gnat-i386-freebsd.14-12.2.0_2.tar.xz) = 71488992
+SHA256 (gnat-x86_64-freebsd.12-12.2.0_2.tar.xz) = e0c183fa3ba870572d8fbf9fd6be78795c40a921c91fef1879e5dc5add410ab8
+SIZE (gnat-x86_64-freebsd.12-12.2.0_2.tar.xz) = 89126688
 SHA256 (gnat-x86_64-freebsd.13-12.2.0_2.tar.xz) = 4b476ac56bc6c044d411d4fe0ebebe0059fc4021158f7191c5f8685d344d2d0a
 SIZE (gnat-x86_64-freebsd.13-12.2.0_2.tar.xz) = 89935208
 SHA256 (gnat-x86_64-freebsd.14-12.2.0_2.tar.xz) = 882c8463bc5c6b685df9bc95b85dd4f1e006fe280b13a4ff39d8a9fd7315e56b
diff --git a/lang/gnat12/pkg-plist b/lang/gnat12/pkg-plist
index 40d2eb1e712b..5064beef0e12 100644
--- a/lang/gnat12/pkg-plist
+++ b/lang/gnat12/pkg-plist
@@ -3227,6 +3227,24 @@ gnat12/include/c++/%%VER%%/%%CONFTRGT%%/ext/opt_random.h
 %%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/32/libgcc.a
 %%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/32/libgcc_eh.a
 %%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/32/libgcov.a
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/crtfastmath.o
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/arm_acle.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/arm_bf16.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/arm_fp16.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/arm_neon.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/arm_sve.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64-arches.def
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64-cores.def
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64-elf.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64-errata.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64-freebsd.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64-fusion-pairs.def
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64-opts.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64-protos.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64-tuning-flags.def
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/aarch64.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/aarch64/biarchlp64.h
+%%ARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/arm/aarch-common-protos.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/ada_target_properties
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/a-assert.adb
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/a-assert.ads
@@ -3984,8 +4002,8 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-spogwa.ads
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-sptabo.ads
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-sptain.ads
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-sptavs.ads
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-sse.ads
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-ssvety.ads
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-sse.ads
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-ssvety.ads
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-sthcso.adb
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-stheme.adb
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/g-strhas.ads
@@ -4303,9 +4321,9 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-memory.adb
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-memory.ads
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mmap.adb
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mmap.ads
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mmauni.ads
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mmosin.adb
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mmosin.ads
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mmauni.ads
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mmosin.adb
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mmosin.ads
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mudido.adb
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-mudido.ads
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adainclude/s-multip.adb
@@ -5219,8 +5237,8 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-spogwa.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-sptabo.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-sptain.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-sptavs.ali
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-sse.ali
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-ssvety.ali
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-sse.ali
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-ssvety.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-strhas.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-string.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/g-strspl.ali
@@ -5323,7 +5341,7 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-dlmopr.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-dmotpr.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-dourea.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-dsaser.ali
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-dwalin.ali
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-dwalin.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-elaall.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-excdeb.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-except.ali
@@ -5418,12 +5436,12 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-mantis.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-mastop.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-memcop.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-memory.ali
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-mmap.ali
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-mmauni.ali
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-mmosin.ali
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-mmap.ali
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-mmauni.ali
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-mmosin.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-mudido.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-multip.ali
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-objrea.ali
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-objrea.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-os_lib.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-oscons.ali
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/adalib/s-osinte.ali
@@ -5688,92 +5706,92 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include-fixed/sys/types.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include-fixed/syslimits.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include-fixed/unistd.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include-fixed/wchar.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/adxintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/ammintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/amxbf16intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/amxint8intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/amxtileintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx2intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx5124fmapsintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx5124vnniwintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512bf16intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512bf16vlintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512bitalgintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512bwintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512cdintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512dqintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512erintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512fintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512fp16intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512fp16vlintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512ifmaintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512ifmavlintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512pfintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vbmi2intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vbmi2vlintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vbmiintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vbmivlintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vlbwintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vldqintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vlintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vnniintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vnnivlintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vp2intersectintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vp2intersectvlintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vpopcntdqintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vpopcntdqvlintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avxintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avxvnniintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/bmi2intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/bmiintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/bmmintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cet.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cetintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cldemoteintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/clflushoptintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/clwbintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/clzerointrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cpuid.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cross-stdarg.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/emmintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/enqcmdintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/f16cintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/adxintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/ammintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/amxbf16intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/amxint8intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/amxtileintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx2intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx5124fmapsintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx5124vnniwintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512bf16intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512bf16vlintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512bitalgintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512bwintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512cdintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512dqintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512erintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512fintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512fp16intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512fp16vlintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512ifmaintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512ifmavlintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512pfintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vbmi2intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vbmi2vlintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vbmiintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vbmivlintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vlbwintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vldqintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vlintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vnniintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vnnivlintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vp2intersectintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vp2intersectvlintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vpopcntdqintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avx512vpopcntdqvlintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avxintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/avxvnniintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/bmi2intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/bmiintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/bmmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cet.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cetintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cldemoteintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/clflushoptintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/clwbintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/clzerointrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cpuid.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/cross-stdarg.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/emmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/enqcmdintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/f16cintrin.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/float.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/fma4intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/fmaintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/fxsrintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/fma4intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/fmaintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/fxsrintrin.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/gcov.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/gfniintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/hresetintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/ia32intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/immintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/gfniintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/hresetintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/ia32intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/immintrin.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/iso646.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/keylockerintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/lwpintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/lzcntintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mm3dnow.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mm_malloc.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mmintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/movdirintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mwaitintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mwaitxintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/nmmintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/pconfigintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/pkuintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/pmmintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/popcntintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/prfchwintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/rdseedintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/rtmintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/asan_interface.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/common_interface_defs.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/hwasan_interface.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/lsan_interface.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/tsan_interface.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/serializeintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sgxintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/shaintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/smmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/keylockerintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/lwpintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/lzcntintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mm3dnow.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mm_malloc.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/movdirintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mwaitintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/mwaitxintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/nmmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/pconfigintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/pkuintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/pmmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/popcntintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/prfchwintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/rdseedintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/rtmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/asan_interface.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/common_interface_defs.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/hwasan_interface.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/lsan_interface.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sanitizer/tsan_interface.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/serializeintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/sgxintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/shaintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/smmintrin.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/stdalign.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/stdarg.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/stdatomic.h
@@ -5783,27 +5801,27 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/stdfix.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/stdint-gcc.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/stdint.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/stdnoreturn.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/tbmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/tbmintrin.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/tgmath.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/tmmintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/tsxldtrkintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/uintrintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/tmmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/tsxldtrkintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/uintrintrin.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/unwind.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/vaesintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/vaesintrin.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/varargs.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/vpclmulqdqintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/waitpkgintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/wbnoinvdintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/wmmintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/x86gprintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/x86intrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xmmintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xopintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xsavecintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xsaveintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xsaveoptintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xsavesintrin.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xtestintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/vpclmulqdqintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/waitpkgintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/wbnoinvdintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/wmmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/x86gprintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/x86intrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xmmintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xopintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xsavecintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xsaveintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xsaveoptintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xsavesintrin.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/include/xtestintrin.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/install-tools/fixinc_list
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/install-tools/gsyslimits.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/install-tools/include/README
@@ -5861,7 +5879,7 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/collect-utils.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/collect2-aix.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/collect2.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/color-macros.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/common/config/i386/i386-cpuinfo.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/common/config/i386/i386-cpuinfo.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/conditions.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/dbxelf.h
@@ -5869,20 +5887,20 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/elfos.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/freebsd-spec.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/freebsd-stdint.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/freebsd.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/att.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/att.h
 %%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/biarch64.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/freebsd.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/freebsd.h
 %%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/freebsd64.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-isa.def
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-opts.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-protos.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/stringop.def
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/unix.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-isa.def
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-opts.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386-protos.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/i386.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/stringop.def
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/unix.h
 %%64BITS%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/x86-64.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/x86-tune.def
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/i386/x86-tune.def
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/initfini-array.h
-gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/vxworks-dummy.h
+%%NOARM%%gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/config/vxworks-dummy.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/configargs.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/context.h
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/include/convert.h
@@ -6282,11 +6300,11 @@ gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/libcc1plugin.so.0.0.0
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/libcp1plugin.so
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/libcp1plugin.so.0
 gnat12/lib/gcc/%%CONFTRGT%%/%%VER%%/plugin/libcp1plugin.so.0.0.0
-gnat12/lib/libasan.a
-gnat12/lib/libasan.so
-gnat12/lib/libasan.so.8
-gnat12/lib/libasan.so.8.0.0
-gnat12/lib/libasan_preinit.o
+%%NOARM%%gnat12/lib/libasan.a
+%%NOARM%%gnat12/lib/libasan.so
+%%NOARM%%gnat12/lib/libasan.so.8
+%%NOARM%%gnat12/lib/libasan.so.8.0.0
+%%NOARM%%gnat12/lib/libasan_preinit.o
 gnat12/lib/libatomic.a
 gnat12/lib/libatomic.so
 gnat12/lib/libatomic.so.1
@@ -6301,7 +6319,7 @@ gnat12/lib/libitm.so
 gnat12/lib/libitm.so.1
 gnat12/lib/libitm.so.1.0.0
 gnat12/lib/libitm.spec
-gnat12/lib/libsanitizer.spec
+%%NOARM%%gnat12/lib/libsanitizer.spec
 gnat12/lib/libstdc++.a
 gnat12/lib/libstdc++.so
 gnat12/lib/libstdc++.so.6
@@ -6309,10 +6327,10 @@ gnat12/lib/libstdc++.so.6.0.30
 gnat12/lib/libstdc++.so.6.0.30-gdb.py
 gnat12/lib/libstdc++fs.a
 gnat12/lib/libsupc++.a
-gnat12/lib/libubsan.a
-gnat12/lib/libubsan.so
-gnat12/lib/libubsan.so.1
-gnat12/lib/libubsan.so.1.0.0
+%%NOARM%%gnat12/lib/libubsan.a
+%%NOARM%%gnat12/lib/libubsan.so
+%%NOARM%%gnat12/lib/libubsan.so.1
+%%NOARM%%gnat12/lib/libubsan.so.1.0.0
 %%64BITS%%gnat12/lib32/libasan.a
 %%64BITS%%gnat12/lib32/libasan.so
 %%64BITS%%gnat12/lib32/libasan.so.8