--- trunk/core/gcc/gcc-9.1.0-r1.smage2	2019/07/16 21:44:09	32909
+++ trunk/core/gcc/gcc-9.1.0-r1.smage2	2019/07/24 06:25:12	32912
@@ -28,7 +28,7 @@
 # linux-libc-headers -> binutils -> libc -> gcc -> binutils -> gcc -> libc
 #
 # dropped java/gcj beginning with year 2017
-MyLanguages=c,c++,ada,fortran,go,objc,obj-c++,lto
+MyLanguages=c,c++,fortran,go,objc,obj-c++,lto
 
 # 1=bootstrap the whole gcc suite, using bootstrap-lean method
 # 0=no bootstrap, use this only for quick builds to test something but never for release
@@ -161,8 +161,8 @@
 	ADA_DEPEND="${COMMON_DEPEND}"
 	if [[ ${ADA_BOOTSTRAP} = 1 ]]
 	then
-		GNAT_BIN_x86="gnatboot-4.3-i686.tar.bz2"
-		GNAT_BIN_x86_64="gnatboot-4.3-amd64.tar.bz2"
+		GNAT_BIN_x86="gnatboot-7.2-i686.tar.xz"
+		GNAT_BIN_x86_64="gnatboot-7.2-amd64.tar.xz"
 		GNAT_BIN="$(eval echo \$GNAT_BIN_${ARCH/i*86/x86})"
 		GNAT_BIN_SRCDIR="${BUILDDIR}/gnat"
 		SRC_URI+=( mirror://${_BASENAME}/${GNAT_BIN_x86} )
@@ -773,7 +773,7 @@
 		then
 			# export binary gnat pathes
 			export PATH="${GNAT_BIN_SRCDIR}/usr/bin:${PATH}"
-			export CC="${GNAT_BIN_SRCDIR}/usr/bin/gnatgcc"
+			export CC="${GNAT_BIN_SRCDIR}/usr/bin/gcc"
 			# CPATH is supposed to be applied for any language, thus
 			# superseding either of C/CPLUS/OBJC_INCLUDE_PATHs
 			export CPATH="${GNAT_BIN_SRCDIR}/usr/lib/include"
@@ -856,6 +856,8 @@
 	# see: http://allanmcrae.com/2015/06/the-case-of-gcc-5-1-and-the-two-c-abis/
 #	myconf+=" --with-default-libstdcxx-abi=gcc4-compatible"
 
+	myconf+=" --enable-multilib"
+
 	# gcc >= 4.3 has now configure flags for uri and version - yeah!
 	AR=ar \
 	../configure \
@@ -1466,14 +1468,13 @@
 		minstallexec gcc/jvgenmain /usr/$(mlibdir)/gcc/${CHOST}/${PVER}/ || die
 
 		# remove libraries and files already included elsewhere
-		mmake -C ${CHOST}/libjava DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die
+		uninstall_gcc_library "libjava" || die
 		mdelete /usr/$(mlibdir)/libgcj_bc.so\* || die
 		if [[ $(mlibdir) != lib ]]
 		then
 			# with >= gcc-6.1 this one only applies when libjava was a mulitlib build
 			if [[ -d ${CHOST}/32/libjava ]]
 			then
-				mmake -C ${CHOST}/32/libjava DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die
 				mdelete /usr/lib/libgcj_bc.so\* || die
 			fi
 		fi
@@ -1586,7 +1587,9 @@
 then
 	src_install_libgfortran-common()
 	{
+		install_gcc_library "libquadmath"
 		install_gcc_library "libgfortran"
+		uninstall_gcc_library "libquadmath"
 	}
 
 	src_install_libgfortran()
@@ -1683,13 +1686,8 @@
 		minstallexec gcc/go1 /usr/$(mlibdir)/gcc/${CHOST}/${PVER}/ || die
 
 		# remove libraries already included elsewhere
-		mmake -C ${CHOST}/libgo DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die
-		mmake -C ${CHOST}/libatomic DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die
-		if [[ $(mlibdir) != lib ]]
-		then
-			mmake -C ${CHOST}/32/libgo DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die
-			mmake -C ${CHOST}/32/libatomic DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die
-		fi
+		uninstall_gcc_library "libgo" || die
+		uninstall_gcc_library "libatomic" || die
 
 		# versionize all bins and symlink them
 		versionize_all_bins || die