diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile
index 8d5722103f1c..7f0dd7389a05 100644
--- a/lang/gnat12/Makefile
+++ b/lang/gnat12/Makefile
@@ -1,138 +1,138 @@
 PORTNAME=	gnat12
 PORTVERSION=	12.2.0
 PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}:gcc	\
 		LOCAL/thierry:gnat
 MASTER_SITE_SUBDIR=releases/gcc-${PORTVERSION}
 DISTFILES=	gcc-${PORTVERSION}.tar.xz:gcc
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	GNAT Ada compiler
 WWW=		https://www.adacore.com/community
 
 LICENSE=	GPLv2 GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libgmp.so:math/gmp	\
 		libmpc.so:math/mpc	\
 		libisl.so:devel/isl	\
 		libmpfr.so:math/mpfr
 
 USES=		bison gettext-runtime gmake iconv libtool localbase tar:xz
 USE_BINUTILS=	yes
 BINARY_ALIAS=	make=${GMAKE}
 
 OPTIONS_DEFINE=	ASSETS
 OPTIONS_RADIO=	BOOTSTRAP
 OPTIONS_RADIO_BOOTSTRAP=	GCC6AUX	PREVASSET
 OPTIONS_DEFAULT=GCC6AUX
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	ASSETS
 .endif
 OPTIONS_SUB=	yes
 ASSETS_DESC=	Build an asset for future bootstrap on the target platform
 GCC6AUX_DESC=	Bootstrap from lang/gcc6-aux
 PREVASSET_DESC=	Bootstrap from the previous asset (if available)
 
 GCC6AUX_BUILD_DEPENDS=	gcc6-aux>0:lang/gcc6-aux
 PREVASSET_DISTFILES+=	${PREV_ASSET_FILE}.tar.xz:gnat
 
 GCC6AUX_VARS=	PATHAUX=${LOCALBASE}/gcc6-aux/bin
 PREVASSET_VARS=	PATHAUX=${WRKDIR}/${PREV_ASSET_FILE}/bin
 ASSETS_VARS=	PKGMESSAGE=${WRKDIR}/pkg-message
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 WRKSRC=		${WRKDIR}/gcc-${PORTVERSION}
 PKG_PREFIX=	${PREFIX}/${PORTNAME}
 FULLPATH=	/sbin:/bin:/usr/sbin:/usr/bin:${PATHAUX}:${PREFIX}/bin:${LOCALBASE}/bin
 TARGLIB=	${PKG_PREFIX}/lib/gcc${GCCVER}
 GNU_CONFIGURE_PREFIX=	${PKG_PREFIX}
 GNU_CONFIGURE_MANPREFIX=${PKG_PREFIX}
 MANPREFIX=	${PKG_PREFIX}
 CONFIGURE_ENV+=	PATH=${FULLPATH}	\
 		CC=${PATHAUX}/gcc	\
 		CXX=${PATHAUX}/g++
 CONFIGURE_ARGS=	--enable-languages="c,ada"	\
 		--with-pkgversion="${OPSYS} Ports Collection"	\
 		--enable-gnu-indirect-function	\
 		--with-as=${LOCALBASE}/bin/as	\
 		--with-ld=${LOCALBASE}/bin/ld	\
 		--enable-threads=posix	\
 		--disable-libquadmath	\
 		--enable-host-shared	\
 		--disable-libmudflap	\
 		--with-system-zlib	\
 		--disable-libgomp	\
 		--disable-libssp	\
 		--enable-libada		\
 		--without-zstd
 CONFIGURE_TARGET=	${GARCH}-portbld-${PLATFORM}
 
 MAKE_ENV+=	PATH=${FULLPATH}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	${TARGLIB}
 
 GNATMAKE=	${PATHAUX}/gnatmake
 GNATBING=	${PATHAUX}/gnatbind
 
 GCCVER=		${PORTVERSION:R:R}
 
 PLATFORM=	${OPSYS:tl}${OSREL}
 GARCH=		${ARCH:S/amd64/x86_64/}
 OS_LABEL4VERS=	[${OPSYS}${GARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}]
 REVFILE=	${WRKSRC}/gcc/REVISION
 PHASEFILE=	${WRKSRC}/gcc/DEV-PHASE
 ASSET_FILE=	gnat-${GARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION}
 PREV_ASSET_VER?=	${PORTVERSION}
 PREV_ASSET_REV?=	_2
 PREV_ASSET_GCC=	${PREV_ASSET_VER:R:R}
 PREV_ASSET_OSREL?=	${OSREL:R}
 PREV_ASSET_FILE=gnat-${GARCH}-${OPSYS:tl}.${PREV_ASSET_OSREL}-${PREV_ASSET_VER}${PREV_ASSET_REV}
 
 PLIST_SUB=	CONFTRGT=${CONFIGURE_TARGET} VER=${PORTVERSION}	\
 		ASSET_FILE=${ASSET_FILE}
 # add-plist-info does not honor GNU_CONFIGURE_PREFIX => remove INFO files
 INFOS=		cpp cppinternals gcc gccinstall gccint gnat_rm gnat_ugn	\
 		gnat-style libitm
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == i386
+.if ${ARCH} == i386 || ${ARCH} == aarch64
 LIB_DIR_32=	""
 PLIST_SUB+=	64BITS="@comment "
 .else
 LIB_DIR_32=	"" 32
 PLIST_SUB+=	64BITS=""
 .endif
 
 pre-configure:
 	${ECHO} "-=> GNAT ${OS_LABEL4VERS}" > ${REVFILE}
 	${ECHO} "release" > ${PHASEFILE}
 
 post-install-ASSETS-on:
 	${MKDIR} ${WRKDIR}/${ASSET_FILE} ${STAGEDIR}${DATADIR}/assets
 	${CP} -Rp ${STAGEDIR}${PKG_PREFIX}/* ${WRKDIR}/${ASSET_FILE}
 	(cd ${WRKDIR} &&	\
 		${TAR} cfJ ${STAGEDIR}${DATADIR}/assets/${ASSET_FILE}.tar.xz ${ASSET_FILE})
 
 post-stage:
 	${RM} -rf ${STAGEDIR}${PKG_PREFIX}/share/info
 .for d in ${LIB_DIR_32}
 .  for l in libgnarl-${GCCVER} libgnat-${GCCVER}
 	${STRIP_CMD}	\
 		${STAGEDIR}${PKG_PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}/${d}/adalib/${l}.so
 .  endfor
 	${STRIP_CMD} ${STAGEDIR}${PKG_PREFIX}/lib${d}/libgcc_s.so.1
 .endfor
 
 post-stage-ASSETS-on:
 	@${ECHO_CMD} "The file ${DATADIR}/assets/${ASSET_FILE}.tar.xz has been created"	\
 		> ${PKGMESSAGE}
 	@${ECHO_CMD} "You may want to copy it under ${DISTDIR} to use the option PREVASSET next time."	\
 		>> ${PKGMESSAGE}
 	@${ECHO_CMD} "(and adjust distinfo)"	\
 		>> ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gnat12/distinfo b/lang/gnat12/distinfo
index ff628774f71c..10b5ca54cf41 100644
--- a/lang/gnat12/distinfo
+++ b/lang/gnat12/distinfo
@@ -1,9 +1,11 @@
-TIMESTAMP = 167146829
+TIMESTAMP = 1671535092
 SHA256 (gcc-12.2.0.tar.xz) = e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
 SIZE (gcc-12.2.0.tar.xz) = 84645292
 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.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
 SIZE (gnat-x86_64-freebsd.14-12.2.0_2.tar.xz) = 89050524