gcc: Remove multilib standalones configs

Standalone multilibs are only needed when building a PetaLinux specific
toolchain.  So remove this from the general bbappends.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

8 files changed, 0 insertions, 230 deletions

diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-12/additional-microblaze-multilibs.patch b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-12/additional-microblaze-multilibs.patch
deleted file mode 100644
index 3d520d0f..00000000
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-12/additional-microblaze-multilibs.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Change the multilib settings to match the expectations of Vitis and related.
-
-The multilib list is as follows:
-
-.;
-le;@mlittle-endian
-bs;@mxl-barrel-shift
-p;@mxl-pattern-compare
-m;@mno-xl-soft-mul
-fpd;@mhard-float
-m/fpd;@mno-xl-soft-mul@mhard-float
-p/m;@mxl-pattern-compare@mno-xl-soft-mul
-p/fpd;@mxl-pattern-compare@mhard-float
-p/m/fpd;@mxl-pattern-compare@mno-xl-soft-mul@mhard-float
-bs/p;@mxl-barrel-shift@mxl-pattern-compare
-bs/m;@mxl-barrel-shift@mno-xl-soft-mul
-bs/fpd;@mxl-barrel-shift@mhard-float
-bs/m/fpd;@mxl-barrel-shift@mno-xl-soft-mul@mhard-float
-bs/p/m;@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul
-bs/p/fpd;@mxl-barrel-shift@mxl-pattern-compare@mhard-float
-bs/p/m/fpd;@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul@mhard-float
-le/m64;@mlittle-endian@m64
-le/bs;@mlittle-endian@mxl-barrel-shift
-le/p;@mlittle-endian@mxl-pattern-compare
-le/m;@mlittle-endian@mno-xl-soft-mul
-le/fpd;@mlittle-endian@mhard-float
-le/m/fpd;@mlittle-endian@mno-xl-soft-mul@mhard-float
-le/p/m;@mlittle-endian@mxl-pattern-compare@mno-xl-soft-mul
-le/p/fpd;@mlittle-endian@mxl-pattern-compare@mhard-float
-le/p/m/fpd;@mlittle-endian@mxl-pattern-compare@mno-xl-soft-mul@mhard-float
-le/bs/p;@mlittle-endian@mxl-barrel-shift@mxl-pattern-compare
-le/bs/m;@mlittle-endian@mxl-barrel-shift@mno-xl-soft-mul
-le/bs/fpd;@mlittle-endian@mxl-barrel-shift@mhard-float
-le/bs/m/fpd;@mlittle-endian@mxl-barrel-shift@mno-xl-soft-mul@mhard-float
-le/bs/p/m;@mlittle-endian@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul
-le/bs/p/fpd;@mlittle-endian@mxl-barrel-shift@mxl-pattern-compare@mhard-float
-le/bs/p/m/fpd;@mlittle-endian@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul@mhard-float
-le/m64/bs;@mlittle-endian@m64@mxl-barrel-shift
-le/m64/p;@mlittle-endian@m64@mxl-pattern-compare
-le/m64/m;@mlittle-endian@m64@mno-xl-soft-mul
-le/m64/fpd;@mlittle-endian@m64@mhard-float
-le/m64/m/fpd;@mlittle-endian@m64@mno-xl-soft-mul@mhard-float
-le/m64/p/m;@mlittle-endian@m64@mxl-pattern-compare@mno-xl-soft-mul
-le/m64/p/fpd;@mlittle-endian@m64@mxl-pattern-compare@mhard-float
-le/m64/p/m/fpd;@mlittle-endian@m64@mxl-pattern-compare@mno-xl-soft-mul@mhard-float
-le/m64/bs/p;@mlittle-endian@m64@mxl-barrel-shift@mxl-pattern-compare
-le/m64/bs/m;@mlittle-endian@m64@mxl-barrel-shift@mno-xl-soft-mul
-le/m64/bs/fpd;@mlittle-endian@m64@mxl-barrel-shift@mhard-float
-le/m64/bs/m/fpd;@mlittle-endian@m64@mxl-barrel-shift@mno-xl-soft-mul@mhard-float
-le/m64/bs/p/m;@mlittle-endian@m64@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul
-le/m64/bs/p/fpd;@mlittle-endian@m64@mxl-barrel-shift@mxl-pattern-compare@mhard-float
-le/m64/bs/p/m/fpd;@mlittle-endian@m64@mxl-barrel-shift@mxl-pattern-compare@mno-xl-soft-mul@mhard-float
-
-As part of this the order of the multilibs was changes from upstream to make
-it easier to avoid big-endian m64, which is not supported by the toolchain.
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-
-Index: gcc-9.2.0/gcc/config/microblaze/t-microblaze
-===================================================================
---- gcc-9.2.0.orig/gcc/config/microblaze/t-microblaze
-+++ gcc-9.2.0/gcc/config/microblaze/t-microblaze
-@@ -1,17 +1,11 @@
--MULTILIB_OPTIONS = m64 mxl-barrel-shift mlittle-endian mno-xl-soft-mul mxl-multiply-high
--#MULTILIB_DIRNAMES = m64 bs le m mh
--MULTILIB_DIRNAMES = . . . . .
--MULTILIB_EXCEPTIONS = *m64/mxl-multiply-high mxl-multiply-high
--MULTILIB_EXCEPTIONS += *m64
--MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift
--MULTILIB_EXCEPTIONS += *m64/mno-xl-soft-mul
--MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mno-xl-soft-mul
--MULTILIB_EXCEPTIONS += *m64/mno-xl-soft-mul
--MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mno-xl-soft-mul/mxl-multiply-high
--MULTILIB_EXCEPTIONS += *m64/mno-xl-soft-mul/mxl-multiply-high
-+MULTILIB_OPTIONS = mlittle-endian m64 mxl-barrel-shift mxl-pattern-compare mno-xl-soft-mul mhard-float
-+MULTILIB_DIRNAMES = le m64 bs p m fpd
-+MULTILIB_EXCEPTIONS = mxl-multiply-high
- MULTILIB_EXCEPTIONS += *mxl-barrel-shift/mxl-multiply-high mxl-multiply-high
- MULTILIB_EXCEPTIONS += *mlittle-endian/mxl-multiply-high mxl-multiply-high
--MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift/mlittle-endian/mxl-multiply-high
-+MULTILIB_EXCEPTIONS += *mxl-pattern-compare*/*mxl-multiply-high*
-+# Big endian m64 is not supported
-+MULTILIB_EXCEPTIONS += m64*
- 
- # Extra files
- microblaze-c.o: $(srcdir)/config/microblaze/microblaze-c.c \
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
index b4fffe6a..449db177 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
@@ -1,13 +1,6 @@
 require gcc-configure-xilinx-standalone.inc
 require gcc-xilinx-standalone.inc
 
-# We want to use the stock multilib configs, when available
-EXTRACONFFUNCS:xilinx-standalone = ""
-
-EXTRA_OECONF:append:xilinx-standalone = " \
-        --enable-multilib \
-"
-
 # Temporary hack to build gcc cross canadian for tclibc-newlib as --with-sysroot=/not/exist
 # has been removed from TARGET_OS for elf and eabi in gcc-cross-canadian.inc
 
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend
index 43d6be73..69782d71 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross_%.bbappend
@@ -1,6 +1,2 @@
 require gcc-configure-xilinx-standalone.inc
 require gcc-xilinx-standalone.inc
-
-# We want to use the stock multilib configs, when available
-EXTRACONFFUNCS:xilinx-standalone = ""
-
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
index cbf43008..3a7d1395 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
@@ -16,16 +16,6 @@ EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \
         --with-arch=armv8-a \
         "
 
-# Both arm and armv7r/armv8r overrides are set w/ cortex r5
-# So only set rmprofile if armv*r is defined.
-ARM_PROFILE = "aprofile"
-ARM_PROFILE:armv7r = "rmprofile"
-ARM_PROFILE:armv8r = "rmprofile"
-
-EXTRA_OECONF:append:xilinx-standalone:arm:class-target = " \
-        --with-multilib-list=${ARM_PROFILE} \
-        "
-
 EXTRA_OECONF:append:xilinx-standalone:armv7r:class-target = " \
         --disable-tls \
         --disable-decimal-float \
@@ -48,30 +38,6 @@ RUNTIMETARGET:xilinx-standalone:class-target = "libstdc++-v3"
 do_install:append:xilinx-standalone:class-target() {
         # Fixup what gcc-runtime normally would do, we don't want linux directories!
         rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
-
-        # The multilibs have different headers, so stop combining them!
-        if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
-                rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
-        fi
-
-        # link the C++ header into the place that multilib gcc expects
-        # C++ compiler looks at usr/include/c++/version/canonical-arch/mlib
-        if [ "${TARGET_SYS_MULTILIB_ORIGINAL}" != "" -a "${TARGET_SYS_MULTILIB_ORIGINAL}" != "${TARGET_SYS}" ]; then
-                mlib=${BASE_LIB:tune-${DEFAULTTUNE}}
-                mlib=${mlib##lib/}
-
-                link_name=${D}${includedir}/c++/${BINV}/${TARGET_SYS_MULTILIB_ORIGINAL}/${mlib}
-                target=${D}${includedir}/c++/${BINV}/${TARGET_SYS}
-
-                echo mkdir -p $link_name
-                mkdir -p $link_name
-                for each in bits ext ; do
-                        relpath=$(python3 -c "import os.path; print(os.path.relpath('$target/$each', '$(dirname $link_name/$each)'))")
-
-                        echo ln -s $relpath $link_name/$each
-                        ln -s $relpath $link_name/$each
-                done
-        fi
 }
 
 FILES:${PN}-dbg:append:xilinx-standalone:class-target = "\
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_12.%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_12.%.bbappend
index c0ccc3c3..0d824324 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_12.%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_12.%.bbappend
@@ -1,15 +1 @@
 COMPATIBLE_HOST = "${HOST_SYS}"
-
-# Add MicroBlaze Patches (only when using MicroBlaze)
-FILESEXTRAPATHS:append:microblaze:xilinx-standalone := ":${THISDIR}/gcc-12"
-SRC_URI:append:microblaze:xilinx-standalone = " \
-        file://additional-microblaze-multilibs.patch \
-"
-
-CHECK_FOR_MICROBLAZE:microblaze = "1"
-
-python() {
-    if d.getVar('CHECK_FOR_MICROBLAZE') == '1':
-        if 'xilinx-microblaze' not in d.getVar('BBFILE_COLLECTIONS').split():
-            bb.fatal('You must include the meta-microblaze layer to build for this configuration.')
-}
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
index ca14529c..2faf7a4b 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
@@ -12,15 +12,6 @@ EXTRA_OECONF:append:xilinx-standalone:aarch64 = " \
         --with-arch=armv8-a \
         "
 
-# Both arm and armv*r overrides are set w/ cortex r5
-# So only set rmprofile if armv*r is defined.
-ARM_PROFILE = "aprofile"
-ARM_PROFILE:armv7r = "rmprofile"
-ARM_PROFILE:armv8r = "rmprofile"
-EXTRA_OECONF:append:xilinx-standalone:arm = " \
-        --with-multilib-list=${ARM_PROFILE} \
-        "
-
 EXTRA_OECONF:append:xilinx-standalone:armv7r = " \
         --disable-tls \
         --disable-decimal-float \
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert-head.sh b/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert-head.sh
deleted file mode 100755
index b59dff1e..00000000
--- a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert-head.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/bash
-
-# Call using:
-#../microblaze/sysroots/x86_64-oesdk-linux/usr/bin/microblaze-xilinx-elf/microblaze-xilinx-elf-gcc -print-multi-lib | mb-convert-head.sh
-
-# Then copy the output into the special microblaze-tc BSP
-
-sed -e 's,;, ,' |
-  while read mlib args ; do
-    if [ $mlib = '.' ]; then
-       continue
-    fi
-    multilib="libmb$(echo $mlib | sed -e 's,/,,g')"
-
-    echo 'MULTILIBS += "multilib:'${multilib}'"'
-  done
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh b/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh
deleted file mode 100755
index ab689444..00000000
--- a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/bash
-
-# Call using:
-#../microblaze/sysroots/x86_64-oesdk-linux/usr/bin/microblaze-xilinx-elf/microblaze-xilinx-elf-gcc -print-multi-lib | mb-convert.sh
-
-# Then copy the output into the special microblaze-tc BSP
-
-mlib_to_feature() {
-  feature_base="microblaze"
-  feature_endian=" bigendian"
-  feature_barrel=""
-  feature_pattern=""
-  feature_multiply=""
-  feature_multiplyhigh=""
-  feature_sixtyfour=""
-  feature_math=""
-  while read feature ; do
-     case $feature in
-       le) feature_endian="";;
-       bs) feature_barrel=" barrel-shift";;
-       p)  feature_pattern=" pattern-compare";;
-       m)  if [ -z ${feature_multiplyhigh} ]; then feature_multiply=" multiply-low" ; fi ;;
-       mh) feature_multiply="" ; feature_multiplyhigh=" multiply-high";;
-       m64) feature_sixtyfour=" 64-bit";;
-       fpd) feature_math=" fpu-hard";;
-       *)   echo "UNKNOWN $feature";;
-     esac
-  done
-  echo "${feature_base}${feature_sixtyfour}${feature_endian}${feature_barrel}${feature_pattern}${feature_multiply}${feature_multiplyhigh}${feature_math}"
-}
-
-sed -e 's,;, ,' |
-  while read mlib args ; do
-    if [ $mlib = '.' ]; then
-      echo '# Base configuration'
-      echo '# CFLAGS:'
-      echo 'DEFAULTTUNE = "microblaze"'
-      echo
-      echo 'AVAILTUNES += "microblaze"'
-      echo 'BASE_LIB:tune-microblaze = "lib"'
-      echo 'TUNE_FEATURES:tune-microblaze = "microblaze bigendian"'
-      echo 'PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}"'
-      continue
-    fi
-
-    cflags=$(echo $args | sed -e 's,@, -,g')
-    multilib="libmb$(echo $mlib | sed -e 's,/,,g')"
-    tune="microblaze$(echo $mlib | sed -e 's,m64,64,' -e 's,/,,g')"
-    features=$(echo $mlib | sed -e 's,/, ,g' | xargs -n 1 echo | mlib_to_feature)
-    echo
-    echo
-    echo "# $mlib"
-    echo "# CFLAGS:${cflags}"
-    echo "DEFAULTTUNE:virtclass-multilib-$multilib = \"$tune\""
-    echo
-    echo "AVAILTUNES += \"$tune\""
-    echo "BASE_LIB:tune-$tune = \"lib/$mlib\""
-    echo "TUNE_FEATURES:tune-$tune = \"${features}\""
-    echo "PACKAGE_EXTRA_ARCHS:tune-$tune = \"\${TUNE_PKGARCH}\""
-  done