Browse Source

dubhe: gcc: Update GCC with B extension

Updated the GCC to the RISC-V GCC version which supports full B v1.0
extension for RISC-V. The recipe also includes the default build parameters
for RISC-V when building gcc.

Signed-off-by: Jun Yuan Tan <junyuan.tan@starfivetech.com>
Jun Yuan Tan 2 years ago
parent
commit
37abe350e1
92 changed files with 10102 additions and 0 deletions
  1. 143 0
      recipes-devtools/gcc/gcc-11.1.inc
  2. 113 0
      recipes-devtools/gcc/gcc-common.inc
  3. 122 0
      recipes-devtools/gcc/gcc-configure-common.inc
  4. 188 0
      recipes-devtools/gcc/gcc-cross-canadian.inc
  5. 4 0
      recipes-devtools/gcc/gcc-cross-canadian_11.1.bb
  6. 162 0
      recipes-devtools/gcc/gcc-cross.inc
  7. 4 0
      recipes-devtools/gcc/gcc-cross_11.1.bb
  8. 12 0
      recipes-devtools/gcc/gcc-crosssdk.inc
  9. 4 0
      recipes-devtools/gcc/gcc-crosssdk_11.1.bb
  10. 235 0
      recipes-devtools/gcc/gcc-multilib-config.inc
  11. 318 0
      recipes-devtools/gcc/gcc-runtime.inc
  12. 2 0
      recipes-devtools/gcc/gcc-runtime_11.1.bb
  13. 118 0
      recipes-devtools/gcc/gcc-sanitizers.inc
  14. 7 0
      recipes-devtools/gcc/gcc-sanitizers_11.1.bb
  15. 11 0
      recipes-devtools/gcc/gcc-shared-source.inc
  16. 39 0
      recipes-devtools/gcc/gcc-source.inc
  17. 6 0
      recipes-devtools/gcc/gcc-source_11.1.bb
  18. 260 0
      recipes-devtools/gcc/gcc-target.inc
  19. 107 0
      recipes-devtools/gcc/gcc-testsuite.inc
  20. 96 0
      recipes-devtools/gcc/gcc/0001-Upstream-Status-Backport.patch
  21. 25 0
      recipes-devtools/gcc/gcc/0001-Yocto-patch-for-arch-canonicalize-to-use-python3.patch
  22. 39 0
      recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
  23. 73 0
      recipes-devtools/gcc/gcc/0001-testuite-Check-pthread-for-omp-module-testing.patch
  24. 31 0
      recipes-devtools/gcc/gcc/0002-Fix-a-test-failure-in-g-.dg-modules-omp-1_c.C.patch
  25. 226 0
      recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch
  26. 70 0
      recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
  27. 39 0
      recipes-devtools/gcc/gcc/0003-testuite-Check-pthread-for-omp-module-testing.patch
  28. 116 0
      recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch
  29. 180 0
      recipes-devtools/gcc/gcc/0004-varasm-Two-SECTION_RETAIN-fixes-PR100130.patch
  30. 122 0
      recipes-devtools/gcc/gcc/0005-optional-libstdc.patch
  31. 142 0
      recipes-devtools/gcc/gcc/0005-testsuite-Add-fchecking-to-dg-ice-tests.patch
  32. 35 0
      recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch
  33. 25 0
      recipes-devtools/gcc/gcc/0006-testsuite-Add-ilp32-to-g-.dg-warn-Warray-bounds-20.C.patch
  34. 92 0
      recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
  35. 131 0
      recipes-devtools/gcc/gcc/0007-merge-from-riscv-gcc-10.2.0-to-support-bitmanip.patch
  36. 43 0
      recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch
  37. 1542 0
      recipes-devtools/gcc/gcc/0008-merge-from-riscv-gcc-10.2.0-to-support-bitmanip.patch
  38. 53 0
      recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch
  39. 45 0
      recipes-devtools/gcc/gcc/0009-update-B-version-from-0.93-to-0.94.patch
  40. 54 0
      recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch
  41. 253 0
      recipes-devtools/gcc/gcc/0010-Merge-B-instruction-from-0p94-to-1.0.patch
  42. 243 0
      recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
  43. 77 0
      recipes-devtools/gcc/gcc/0011-remove-b-flag-and-use-zba_zbb_zbc_zbs-instead.patch
  44. 42 0
      recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch
  45. 32 0
      recipes-devtools/gcc/gcc/0012-replace-x_riscv_bitmanip_subext-with-x_riscv_bitmani.patch
  46. 110 0
      recipes-devtools/gcc/gcc/0013-Disable-sdt.patch
  47. 24 0
      recipes-devtools/gcc/gcc/0013-remove-b-gcc-options.patch
  48. 31 0
      recipes-devtools/gcc/gcc/0014-fix-incorrect-subext-name.patch
  49. 39 0
      recipes-devtools/gcc/gcc/0014-libtool.patch
  50. 127 0
      recipes-devtools/gcc/gcc/0015-add-builtin-orc.b-clmul-clmulr-clmulh.patch
  51. 40 0
      recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
  52. 99 0
      recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch
  53. 545 0
      recipes-devtools/gcc/gcc/0016-merge-sifve-change-for-bitmanip.patch
  54. 28 0
      recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
  55. 208 0
      recipes-devtools/gcc/gcc/0017-Implement-instruction-patterns-for-ZBA-extension.patch
  56. 119 0
      recipes-devtools/gcc/gcc/0018-Cost-model-for-zba-extension.patch
  57. 50 0
      recipes-devtools/gcc/gcc/0018-export-CPP.patch
  58. 57 0
      recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch
  59. 274 0
      recipes-devtools/gcc/gcc/0019-Implement-instruction-patterns-for-ZBB-extension.patch
  60. 48 0
      recipes-devtools/gcc/gcc/0020-Cost-model-for-zbb-extension.patch
  61. 35 0
      recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch
  62. 26 0
      recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
  63. 108 0
      recipes-devtools/gcc/gcc/0021-Use-li-and-rori-to-load-constants.patch
  64. 297 0
      recipes-devtools/gcc/gcc/0022-Implement-instruction-patterns-for-ZBS-extension.patch
  65. 25 0
      recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch
  66. 88 0
      recipes-devtools/gcc/gcc/0023-Cost-model-for-ZBS-extension.patch
  67. 51 0
      recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch
  68. 31 0
      recipes-devtools/gcc/gcc/0024-RISC-V-costs-handle-BSWAP.patch
  69. 349 0
      recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch
  70. 54 0
      recipes-devtools/gcc/gcc/0025-RISC-V-costs-support-shift-and-add-in-strength-reduc.patch
  71. 99 0
      recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch
  72. 134 0
      recipes-devtools/gcc/gcc/0026-Fix-various-_FOR_BUILD-and-related-variables.patch
  73. 35 0
      recipes-devtools/gcc/gcc/0026-RISC-V-bitmanip-fix-constant-loading-for-1ULL-31-in-.patch
  74. 25 0
      recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch
  75. 84 0
      recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
  76. 26 0
      recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
  77. 88 0
      recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch
  78. 57 0
      recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch
  79. 255 0
      recipes-devtools/gcc/gcc/0032-Fix-for-testsuite-failure.patch
  80. 39 0
      recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch
  81. 83 0
      recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
  82. 182 0
      recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch
  83. 26 0
      recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch
  84. 42 0
      recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch
  85. 14 0
      recipes-devtools/gcc/gcc_11.1.bb
  86. 160 0
      recipes-devtools/gcc/libgcc-common.inc
  87. 60 0
      recipes-devtools/gcc/libgcc-initial.inc
  88. 5 0
      recipes-devtools/gcc/libgcc-initial_11.1.bb
  89. 53 0
      recipes-devtools/gcc/libgcc.inc
  90. 5 0
      recipes-devtools/gcc/libgcc_11.1.bb
  91. 83 0
      recipes-devtools/gcc/libgfortran.inc
  92. 3 0
      recipes-devtools/gcc/libgfortran_11.1.bb

+ 143 - 0
recipes-devtools/gcc/gcc-11.1.inc

@@ -0,0 +1,143 @@
+require gcc-common.inc
+
+# Third digit in PV should be incremented after a minor release
+
+PV = "11.1.0"
+
+# BINV should be incremented to a revision after a minor gcc release
+
+BINV = "11.1.0"
+
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
+
+DEPENDS =+ "mpfr gmp libmpc zlib flex-native"
+NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native flex-native"
+
+LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
+
+LIC_FILES_CHKSUM = "\
+    file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+    file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
+    file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+    file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8 \
+"
+
+#RELEASE ?= "5b2ac9b40c325e9209c0bd55955db84aad4a0cc5"
+#BASEURI ?= "https://github.com/gcc-mirror/gcc/archive/${RELEASE}.zip;downloadfilename=gcc-${PV}-${RELEASE}.zip"
+BASEURI ?= "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.xz \
+           "
+SRC_URI = "\
+           ${BASEURI} \
+           file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+           file://0002-gcc-poison-system-directories.patch \
+           file://0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
+           file://0004-64-bit-multilib-hack.patch \
+           file://0005-optional-libstdc.patch \
+           file://0006-COLLECT_GCC_OPTIONS.patch \
+           file://0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch \
+           file://0008-fortran-cross-compile-hack.patch \
+           file://0009-cpp-honor-sysroot.patch \
+           file://0010-MIPS64-Default-to-N64-ABI.patch \
+           file://0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch \
+           file://0012-gcc-Fix-argument-list-too-long-error.patch \
+           file://0013-Disable-sdt.patch \
+           file://0014-libtool.patch \
+           file://0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \
+           file://0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch \
+           file://0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch \
+           file://0018-export-CPP.patch \
+           file://0019-Ensure-target-gcc-headers-can-be-included.patch \
+           file://0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch \
+           file://0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
+           file://0022-aarch64-Add-support-for-musl-ldso.patch \
+           file://0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
+           file://0024-handle-sysroot-support-for-nativesdk-gcc.patch \
+           file://0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch \
+           file://0026-Fix-various-_FOR_BUILD-and-related-variables.patch \
+           file://0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch \
+           file://0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch \
+           file://0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch \
+           file://0030-sync-gcc-stddef.h-with-musl.patch \
+           file://0031-fix-segmentation-fault-in-precompiled-header-generat.patch \
+           file://0032-Fix-for-testsuite-failure.patch \
+           file://0033-Re-introduce-spe-commandline-options.patch \
+           file://0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch \
+           file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
+           file://0036-mingw32-Enable-operation_not_supported.patch \
+           file://0037-libatomic-Do-not-enforce-march-on-aarch64.patch \
+           file://0001-testuite-Check-pthread-for-omp-module-testing.patch \
+           file://0002-Fix-a-test-failure-in-g-.dg-modules-omp-1_c.C.patch \
+           file://0003-testuite-Check-pthread-for-omp-module-testing.patch \
+           file://0004-varasm-Two-SECTION_RETAIN-fixes-PR100130.patch \
+           file://0006-testsuite-Add-ilp32-to-g-.dg-warn-Warray-bounds-20.C.patch \
+           file://0007-merge-from-riscv-gcc-10.2.0-to-support-bitmanip.patch \
+           file://0008-merge-from-riscv-gcc-10.2.0-to-support-bitmanip.patch \
+           file://0009-update-B-version-from-0.93-to-0.94.patch \
+           file://0010-Merge-B-instruction-from-0p94-to-1.0.patch \
+           file://0011-remove-b-flag-and-use-zba_zbb_zbc_zbs-instead.patch \
+           file://0012-replace-x_riscv_bitmanip_subext-with-x_riscv_bitmani.patch \
+           file://0013-remove-b-gcc-options.patch \
+           file://0014-fix-incorrect-subext-name.patch \
+           file://0015-add-builtin-orc.b-clmul-clmulr-clmulh.patch \
+           file://0016-merge-sifve-change-for-bitmanip.patch \
+           file://0017-Implement-instruction-patterns-for-ZBA-extension.patch \
+           file://0018-Cost-model-for-zba-extension.patch \
+           file://0019-Implement-instruction-patterns-for-ZBB-extension.patch \
+           file://0020-Cost-model-for-zbb-extension.patch \
+           file://0021-Use-li-and-rori-to-load-constants.patch \
+           file://0022-Implement-instruction-patterns-for-ZBS-extension.patch \
+           file://0023-Cost-model-for-ZBS-extension.patch \
+           file://0024-RISC-V-costs-handle-BSWAP.patch \
+           file://0025-RISC-V-costs-support-shift-and-add-in-strength-reduc.patch \
+           file://0026-RISC-V-bitmanip-fix-constant-loading-for-1ULL-31-in-.patch \
+           file://0001-Yocto-patch-for-arch-canonicalize-to-use-python3.patch \
+"
+SRC_URI[sha256sum] = "4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf"
+
+S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
+
+# For dev release snapshotting
+#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${RELEASE}"
+#B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
+
+# Language Overrides
+FORTRAN = ""
+JAVA = ""
+
+SSP ?= "--disable-libssp"
+SSP:mingw32 = "--enable-libssp"
+
+EXTRA_OECONF_BASE = "\
+    ${SSP} \
+    --enable-libitm \
+    --enable-lto \
+    --disable-bootstrap \
+    --with-system-zlib \
+    ${@'--with-linker-hash-style=${LINKER_HASH_STYLE}' if '${LINKER_HASH_STYLE}' else ''} \
+    --enable-linker-build-id \
+    --with-ppl=no \
+    --with-cloog=no \
+    --enable-checking=release \
+    --enable-cheaders=c_global \
+    --without-isl \
+"
+
+EXTRA_OECONF_INITIAL = "\
+    --disable-libgomp \
+    --disable-libitm \
+    --disable-libquadmath \
+    --with-system-zlib \
+    --disable-lto \
+    --disable-plugin \
+    --enable-linker-build-id \
+    --enable-decimal-float=no \
+    --without-isl \
+    --disable-libssp \
+"
+
+EXTRA_OECONF_PATHS = "\
+    --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"

+ 113 - 0
recipes-devtools/gcc/gcc-common.inc

@@ -0,0 +1,113 @@
+SUMMARY = "GNU cc and gcc C compilers"
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+DESCRIPTION = "The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Ada, Go, and D, as well as libraries for these languages (libstdc++,...). GCC was originally written as the compiler for the GNU operating system."
+SECTION = "devel"
+LICENSE = "GPL"
+
+NATIVEDEPS = ""
+
+CVE_PRODUCT = "gcc"
+
+inherit autotools gettext texinfo
+
+BPN = "gcc"
+COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc:do_gcc_stash_builddir"
+COMPILERDEP:class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir"
+
+python extract_stashed_builddir () {
+    src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}")
+    dest = d.getVar("B")
+    oe.path.copyhardlinktree(src, dest)
+    staging_processfixme([src + "/fixmepath"], dest, d.getVar("RECIPE_SYSROOT"), d.getVar("RECIPE_SYSROOT_NATIVE"), d)
+}
+
+def get_gcc_float_setting(bb, d):
+    if d.getVar('ARMPKGSFX_EABI') == "hf" and d.getVar('TRANSLATED_TARGET_ARCH') == "arm":
+        return "--with-float=hard"
+    if d.getVar('TARGET_FPU') in [ 'soft' ]:
+        return "--with-float=soft"
+    if d.getVar('TARGET_FPU') in [ 'ppc-efd' ]:
+        return "--enable-e500_double"
+    return ""
+
+get_gcc_float_setting[vardepvalue] = "${@get_gcc_float_setting(bb, d)}"
+
+def get_gcc_mips_plt_setting(bb, d):
+    if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'mips', 'mipsel' ] and bb.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d):
+        return "--with-mips-plt"
+    return ""
+
+def get_gcc_ppc_plt_settings(bb, d):
+    if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'powerpc', 'powerpc64' ] and not bb.utils.contains('DISTRO_FEATURES', 'bssplt', True, False, d):
+        return "--enable-secureplt"
+    return ""
+
+def get_gcc_multiarch_setting(bb, d):
+    target_arch = d.getVar('TRANSLATED_TARGET_ARCH')
+    multiarch_options = {
+        "i586":    "--enable-targets=all",
+        "i686":    "--enable-targets=all",
+        "powerpc": "--enable-targets=powerpc64",
+        "powerpc64le": "--enable-targets=powerpcle",
+        "mips":    "--enable-targets=all",
+        "sparc":   "--enable-targets=all",
+    }
+
+    if bb.utils.contains('DISTRO_FEATURES', 'multiarch', True, False, d):
+        if target_arch in multiarch_options :
+            return multiarch_options[target_arch]
+    return ""
+
+# this is used by the multilib setup of gcc
+def get_tune_parameters(tune, d):
+    availtunes = d.getVar('AVAILTUNES')
+    if tune not in availtunes.split():
+        bb.error('The tune: %s is not one of the available tunes: %s' % (tune or None, availtunes))
+
+    localdata = bb.data.createCopy(d)
+    override = ':tune-' + tune
+    localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) + override)
+
+    retdict = {}
+    retdict['tune'] = tune
+    retdict['ccargs'] = localdata.getVar('TUNE_CCARGS')
+    retdict['features'] = localdata.getVar('TUNE_FEATURES')
+    # BASELIB is used by the multilib code to change library paths
+    retdict['baselib'] = localdata.getVar('BASE_LIB') or localdata.getVar('BASELIB')
+    retdict['arch'] = localdata.getVar('TUNE_ARCH')
+    retdict['abiextension'] = localdata.getVar('ABIEXTENSION')
+    retdict['target_fpu'] = localdata.getVar('TARGET_FPU')
+    retdict['pkgarch'] = localdata.getVar('TUNE_PKGARCH')
+    retdict['package_extra_archs'] = localdata.getVar('PACKAGE_EXTRA_ARCHS')
+    return retdict
+
+get_tune_parameters[vardepsexclude] = "AVAILTUNES TUNE_CCARGS OVERRIDES TUNE_FEATURES BASE_LIB BASELIB TUNE_ARCH ABIEXTENSION TARGET_FPU TUNE_PKGARCH PACKAGE_EXTRA_ARCHS"
+
+DEBIANNAME:${MLPREFIX}libgcc = "libgcc1"
+
+MIRRORS =+ "\
+${GNU_MIRROR}/gcc    ftp://gcc.gnu.org/pub/gcc/releases/ \n \
+${GNU_MIRROR}/gcc	ftp://gd.tuwien.ac.at/gnu/gcc/ \n \
+${GNU_MIRROR}/gcc	http://mirrors.rcn.net/pub/sourceware/gcc/releases/ \n \
+${GNU_MIRROR}/gcc   http://gcc.get-software.com/releases/ \n \
+${GNU_MIRROR}/gcc	http://gcc.get-software.com/releases/ \n \
+"
+#
+# Set some default values
+#
+gcclibdir = "${libdir}/gcc"
+BINV = "${PV}"
+#S = "${WORKDIR}/gcc-${PV}"
+S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
+
+B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
+
+target_includedir ?= "${includedir}"
+target_libdir ?= "${libdir}"
+target_base_libdir ?= "${base_libdir}"
+target_prefix ?= "${prefix}"
+
+# We need to ensure that for the shared work directory, the do_patch signatures match
+# The real WORKDIR location isn't a dependency for the shared workdir.
+src_patches[vardepsexclude] = "WORKDIR"
+should_apply[vardepsexclude] += "PN"

+ 122 - 0
recipes-devtools/gcc/gcc-configure-common.inc

@@ -0,0 +1,122 @@
+require gcc-multilib-config.inc
+require gcc-shared-source.inc
+#
+# Build the list of lanaguages to build.
+#
+# These can be overridden by the version specific .inc file.
+
+# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
+FORTRAN ?= ",f77"
+LANGUAGES ?= "c,c++${FORTRAN}"
+
+EXTRA_OECONF_BASE ?= ""
+EXTRA_OECONF_PATHS ?= ""
+
+GCCMULTILIB ?= "--disable-multilib"
+GCCTHREADS ?= "posix"
+
+GCCPIE ??= ""
+
+SYMVERS_CONF ?= "--enable-symvers=gnu"
+
+EXTRA_OECONF = "\
+    ${@['--enable-clocale=generic', ''][d.getVar('USE_NLS') != 'no']} \
+    --with-gnu-ld \
+    --enable-shared \
+    --enable-languages=${LANGUAGES} \
+    --enable-threads=${GCCTHREADS} \
+    ${GCCMULTILIB} \
+    ${GCCPIE} \
+    --enable-c99 \
+    --enable-long-long \
+    ${SYMVERS_CONF} \
+    --enable-libstdcxx-pch \
+    --program-prefix=${TARGET_PREFIX} \
+    --without-local-prefix \
+    --disable-install-libiberty \
+    ${EXTRA_OECONF_BASE} \
+    ${EXTRA_OECONF_GCC_FLOAT} \
+    ${EXTRA_OECONF_PATHS} \
+    ${@get_gcc_mips_plt_setting(bb, d)} \
+    ${@get_gcc_ppc_plt_settings(bb, d)} \
+    ${@get_gcc_multiarch_setting(bb, d)} \
+"
+
+# glibc version is a minimum controlling whether features are enabled. 
+# Doesn't need to track glibc exactly
+EXTRA_OECONF:append:libc-glibc = " --with-glibc-version=2.28 "
+
+# Set this here since GCC configure won't auto-detect and enable
+# initfini-arry when cross compiling.
+EXTRA_OECONF:append = " --enable-initfini-array"
+
+export gcc_cv_collect2_libs = 'none required'
+# We need to set gcc_cv_collect2_libs else there is cross-compilation badness
+# in the config.log files (which might not get generated until do_compile
+# hence being missed by the insane do_configure check).
+
+EXTRA_OECONF:append:linux = " --enable-__cxa_atexit"
+
+EXTRA_OECONF:append:mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64"
+EXTRA_OECONF:append:mipsisa32r6el = " --with-abi=32 --with-arch=mips32r6"
+EXTRA_OECONF:append:mipsisa32r6 = " --with-abi=32 --with-arch=mips32r6"
+EXTRA_OECONF:append:mipsisa64r6el = " --with-abi=64 --with-arch-64=mips64r6"
+EXTRA_OECONF:append:mipsisa64r6 = " --with-abi=64 --with-arch-64=mips64r6"
+
+EXTRA_OECONF_GCC_FLOAT ??= ""
+CPPFLAGS = ""
+
+SYSTEMHEADERS = "${target_includedir}"
+SYSTEMLIBS = "${target_base_libdir}/"
+SYSTEMLIBS1 = "${target_libdir}/"
+
+do_configure:prepend () {
+	# teach gcc to find correct target includedir when checking libc ssp support
+	mkdir -p ${B}/gcc
+	echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
+	cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new
+	cat >>${B}/gcc/defaults.h.new <<_EOF
+#define NATIVE_SYSTEM_HEADER_DIR "${SYSTEMHEADERS}"
+#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}"
+#define STANDARD_STARTFILE_PREFIX_2 "${SYSTEMLIBS1}"
+#define SYSTEMLIBS_DIR "${SYSTEMLIBS}"
+#endif /* ! GCC_DEFAULTS_H */
+_EOF
+	mv ${B}/gcc/defaults.h.new ${B}/gcc/defaults.h
+}
+
+do_configure () {
+	# Setup these vars for cross building only
+	# ... because foo_FOR_TARGET apparently gets misinterpreted inside the
+	# gcc build stuff when the build is producing a cross compiler - i.e.
+	# when the 'current' target is the 'host' system, and the host is not
+	# the target (because the build is actually making a cross compiler!)
+	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
+		export CC_FOR_TARGET="${CC}"
+		export GCC_FOR_TARGET="${CC}"
+		export CXX_FOR_TARGET="${CXX}"
+		export AS_FOR_TARGET="${HOST_PREFIX}as"
+		export LD_FOR_TARGET="${HOST_PREFIX}ld"
+		export NM_FOR_TARGET="${HOST_PREFIX}nm"
+		export AR_FOR_TARGET="${HOST_PREFIX}ar"
+		export GFORTRAN_FOR_TARGET="gfortran"
+		export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
+	fi
+	export CC_FOR_BUILD="${BUILD_CC}"
+	export CXX_FOR_BUILD="${BUILD_CXX}"
+	export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+	export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
+	export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
+	export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
+	export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}"
+	export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}"
+	export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
+	export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
+
+
+	oe_runconf
+}
+

+ 188 - 0
recipes-devtools/gcc/gcc-cross-canadian.inc

@@ -0,0 +1,188 @@
+inherit cross-canadian
+
+SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)"
+PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+
+DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc"
+
+GCCMULTILIB = "--enable-multilib"
+
+require gcc-configure-common.inc
+
+EXTRA_OECONF_PATHS = "\
+    --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
+    --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+# We have to point gcc at a sysroot but we don't need to rebuild if this changes
+# e.g. we switch between different machines with different tunes.
+EXTRA_OECONF_PATHS[vardepsexclude] = "TUNE_PKGARCH"
+TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
+get_gcc_float_setting[vardepvalue] = ""
+
+#
+# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
+# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.
+#
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export DLLTOOL_FOR_TARGET = "${TARGET_PREFIX}dlltool"
+export CC_FOR_TARGET = "${TARGET_PREFIX}gcc"
+export CXX_FOR_TARGET = "${TARGET_PREFIX}g++"
+export GCC_FOR_TARGET = "${TARGET_PREFIX}gcc"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export LIPO_FOR_TARGET = "${TARGET_PREFIX}lipo"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export OBJDUMP_FOR_TARGET = "${TARGET_PREFIX}objdump"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+export STRIP_FOR_TARGET = "${TARGET_PREFIX}strip"
+export WINDRES_FOR_TARGET = "${TARGET_PREFIX}windres"
+
+#
+# We need to override this and make sure the compiler can find staging
+#
+export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET}"
+
+do_configure () {
+	export CC_FOR_BUILD="${BUILD_CC}"
+	export CXX_FOR_BUILD="${BUILD_CXX}"
+	export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+	export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
+	export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
+	export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
+	export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}"
+	export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}"
+	export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
+	export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
+	oe_runconf
+}
+
+do_compile () {
+	oe_runmake all-host configure-target-libgcc
+	(cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc"
+
+FILES:${PN} = "\
+    ${exec_prefix}/bin/* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.* \
+    ${libdir}/bfd-plugins/*.so \
+    ${includedir}/c++/${BINV} \
+    ${prefix}/${TARGET_SYS}/bin/* \
+    ${prefix}/${TARGET_SYS}/lib/* \
+    ${prefix}/${TARGET_SYS}${target_includedir}/* \
+"
+INSANE_SKIP:${PN} += "dev-so"
+
+FILES:${PN}-doc = "\
+    ${infodir} \
+    ${mandir} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
+"
+
+EXEEXT = ""
+
+# Compute how to get from libexecdir to bindir in python (easier than shell)
+BINRELPATH = "${@os.path.relpath(d.expand("${bindir}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}"
+# linker plugin path
+LIBRELPATH = "${@os.path.relpath(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${libdir}/bfd-plugins"))}"
+
+do_install () {
+	( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h-forbuild install-unwind_h )
+	oe_runmake 'DESTDIR=${D}' install-host
+
+	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+	rm -rf ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+
+	# We care about g++ not c++
+	rm -f ${D}${bindir}/*c++
+
+	# We don't care about the gcc-<version> copies
+	rm -f ${D}${bindir}/*gcc-${BINV}*
+
+	# Cleanup empty directories which are not shipped
+	# we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted
+	# ${D}${libdir}/../lib only seems to appear with SDKMACHINE=i686
+	local empty_dirs="${D}${libdir}/../lib ${D}${prefix}/${TARGET_SYS}/lib ${D}${prefix}/${TARGET_SYS} ${D}${includedir}"
+	for i in $empty_dirs; do
+		[ -d $i ] && rmdir --ignore-fail-on-non-empty $i
+	done
+
+	# Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
+	# found.
+	dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
+	install -d $dest
+	suffix=${EXEEXT}
+	for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
+		if [ "$t" = "g77" -o "$t" = "gfortran" ] && [ ! -e ${D}${bindir}/${TARGET_PREFIX}$t$suffix ]; then
+			continue
+		fi
+
+		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t$suffix $dest$t$suffix
+	done
+	t=real-ld
+	ln -sf ${BINRELPATH}/${TARGET_PREFIX}ld$suffix $dest$t$suffix
+
+	# libquadmath headers need to  be available in the gcc libexec dir
+	install -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+	cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+	cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+
+	# install LTO linker plugins where binutils tools can find it
+	install -d ${D}${libdir}/bfd-plugins
+	ln -sf ${LIBRELPATH}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so
+
+	chown -R root:root ${D}
+
+	cross_canadian_bindirlinks
+
+	for i in linux ${CANADIANEXTRAOS}
+	do
+		for v in ${CANADIANEXTRAVENDOR}
+		do
+			d=${D}${bindir}/../${TARGET_ARCH}$v-$i
+			install -d $d
+			for j in ${TARGET_PREFIX}gcc${EXEEXT} ${TARGET_PREFIX}g++${EXEEXT}
+			do
+				p=${TARGET_ARCH}$v-$i-`echo $j | sed -e s,${TARGET_PREFIX},,`
+				case $i in
+				*musl*)
+					rm -rf $d/$p
+					echo "#!/usr/bin/env sh" > $d/$p
+					echo "exec \`dirname \$0\`/../${TARGET_SYS}/$j -mmusl \$@" >> $d/$p
+					chmod 0755 $d/$p
+					;;
+				*)
+					;;
+				esac
+			done
+		done
+	done
+}
+
+ELFUTILS = "nativesdk-elfutils"
+DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
+RDEPENDS:${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
+
+SYSTEMHEADERS = "${target_includedir}/"
+SYSTEMLIBS = "${target_base_libdir}/"
+SYSTEMLIBS1 = "${target_libdir}/"
+
+EXTRA_OECONF += "--enable-poison-system-directories"
+EXTRA_OECONF:remove:elf = "--with-sysroot=/not/exist"
+EXTRA_OECONF:remove:eabi = "--with-sysroot=/not/exist"
+EXTRA_OECONF:append:elf = " --without-headers --with-newlib"
+EXTRA_OECONF:append:eabi = " --without-headers --with-newlib"
+# gcc 4.7 needs -isystem
+export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET} -isystem=${target_includedir}"

+ 4 - 0
recipes-devtools/gcc/gcc-cross-canadian_11.1.bb

@@ -0,0 +1,4 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-cross-canadian.inc
+
+EXTRA_OECONF:append:riscv64 = " --with-arch=rv64gc_zba_zbb_zbc_zbs CFLAGS_FOR_TARGET="-O2 -mcmodel=medany" CXXFLAGS_FOR_TARGET="-O2 -mcmodel=medany""

+ 162 - 0
recipes-devtools/gcc/gcc-cross.inc

@@ -0,0 +1,162 @@
+inherit cross
+
+INHIBIT_DEFAULT_DEPS = "1"
+EXTRADEPENDS = ""
+DEPENDS = "virtual/${TARGET_PREFIX}binutils ${EXTRADEPENDS} ${NATIVEDEPS}"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+python () {
+    if d.getVar("TARGET_OS").startswith("linux"):
+        d.setVar("EXTRADEPENDS", "linux-libc-headers")
+}
+
+PN = "gcc-cross-${TARGET_ARCH}"
+
+# Ignore how TARGET_ARCH is computed.
+TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}"
+
+require gcc-configure-common.inc
+
+# While we want the 'gnu' hash style, we explicitly set it to sysv here to
+# ensure that any recipe which doesn't obey our LDFLAGS (which also set it to
+# gnu) will hit a QA failure.
+LINKER_HASH_STYLE ?= "sysv"
+
+EXTRA_OECONF += "--enable-poison-system-directories=error"
+EXTRA_OECONF:append:sh4 = " \
+    --with-multilib-list= \
+    --enable-incomplete-targets \
+"
+
+EXTRA_OECONF += "\
+    --with-system-zlib \
+"
+
+EXTRA_OECONF:append:libc-baremetal = " --without-headers"
+EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix"
+EXTRA_OECONF:remove:libc-newlib = "--enable-threads=posix"
+
+EXTRA_OECONF_PATHS = "\
+    --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
+
+
+do_configure:prepend () {
+	install -d ${RECIPE_SYSROOT}${target_includedir}
+	touch ${RECIPE_SYSROOT}${target_includedir}/limits.h
+}
+
+do_compile () {
+	export CC="${BUILD_CC}"
+	export AR_FOR_TARGET="${TARGET_SYS}-ar"
+	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
+	export LD_FOR_TARGET="${TARGET_SYS}-ld"
+	export NM_FOR_TARGET="${TARGET_SYS}-nm"
+	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+	export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}"
+	export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}"
+	export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
+	export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
+
+	# Prevent native/host sysroot path from being used in configargs.h header,
+	# as it will be rewritten when used by other sysroots preventing support
+	# for gcc plugins
+	oe_runmake configure-gcc
+	sed -i 's@${STAGING_DIR_TARGET}@/host@g' ${B}/gcc/configargs.h
+	sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/configargs.h
+
+	# Prevent sysroot/workdir paths from being used in checksum-options.
+	# checksum-options is used to generate a checksum which is embedded into
+	# the output binary.
+	oe_runmake TARGET-gcc=checksum-options all-gcc
+	sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options
+	sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/checksum-options
+
+	oe_runmake all-host configure-target-libgcc
+	(cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
+}
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+# Compute how to get from libexecdir to bindir in python (easier than shell)
+BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}"
+# linker plugin path
+LIBRELPATH = "${@os.path.relpath(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/bfd-plugins"))}"
+
+do_install () {
+	( cd ${B}/${TARGET_SYS}/libgcc; oe_runmake 'DESTDIR=${D}' install-unwind_h-forbuild install-unwind_h )
+	oe_runmake 'DESTDIR=${D}' install-host
+
+	install -d ${D}${target_base_libdir}
+	install -d ${D}${target_libdir}
+
+	# Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77
+	# gfortran is fully backwards compatible. This is a safe and practical solution.
+	if [ -n "${@d.getVar('FORTRAN')}" ]; then
+		ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}g77 || true
+		fortsymlinks="g77 gfortran"
+	fi
+
+	# Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
+	# found. These need to be relative paths so they work in different locations.
+	dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
+	install -d $dest
+	for t in ar as ld ld.bfd ld.gold nm objcopy objdump ranlib strip gcc cpp $fortsymlinks; do
+		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
+		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
+	done
+
+	# Remove things we don't need but keep share/java
+	for d in info man share/doc share/locale share/man share/info; do
+		rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/$d
+	done
+
+	# libquadmath headers need to  be available in the gcc libexec dir
+	install -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+	cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+	cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+
+	find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f
+
+	# install LTO linker plugins where binutils tools can find it
+	install -d ${D}${libdir}/bfd-plugins
+	ln -sf ${LIBRELPATH}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so
+}
+
+do_package[noexec] = "1"
+do_packagedata[noexec] = "1"
+do_package_write_ipk[noexec] = "1"
+do_package_write_rpm[noexec] = "1"
+do_package_write_deb[noexec] = "1"
+
+inherit chrpath
+
+python gcc_stash_builddir_fixrpaths() {
+    # rewrite rpaths, breaking hardlinks as required
+    process_dir("/", d.getVar("BUILDDIRSTASH"), d, break_hardlinks = True)
+}
+
+BUILDDIRSTASH = "${WORKDIR}/stashed-builddir/build"
+do_gcc_stash_builddir[dirs] = "${B}"
+do_gcc_stash_builddir[cleandirs] = "${BUILDDIRSTASH}"
+do_gcc_stash_builddir[postfuncs] += "gcc_stash_builddir_fixrpaths"
+do_gcc_stash_builddir () {
+	dest=${BUILDDIRSTASH}
+	hardlinkdir . $dest
+	# Makefile does move-if-change which can end up with 'timestamp' as file contents so break links to those files
+	rm $dest/gcc/include/*.h
+	cp gcc/include/*.h $dest/gcc/include/
+}
+addtask do_gcc_stash_builddir after do_compile before do_install
+SSTATETASKS += "do_gcc_stash_builddir"
+do_gcc_stash_builddir[sstate-inputdirs] = "${BUILDDIRSTASH}"
+do_gcc_stash_builddir[sstate-outputdirs] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}"
+do_gcc_stash_builddir[sstate-fixmedir] = "${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}"
+
+python do_gcc_stash_builddir_setscene () {
+    sstate_setscene(d)
+}
+addtask do_gcc_stash_builddir_setscene

+ 4 - 0
recipes-devtools/gcc/gcc-cross_11.1.bb

@@ -0,0 +1,4 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-cross.inc
+
+EXTRA_OECONF:append:riscv64 = " --with-arch=rv64gc_zba_zbb_zbc_zbs CFLAGS_FOR_TARGET="-O2 -mcmodel=medany" CXXFLAGS_FOR_TARGET="-O2 -mcmodel=medany""

+ 12 - 0
recipes-devtools/gcc/gcc-crosssdk.inc

@@ -0,0 +1,12 @@
+inherit crosssdk
+
+PN = "gcc-crosssdk-${SDK_SYS}"
+
+SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
+SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
+SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
+
+GCCMULTILIB = "--disable-multilib"
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native ${NATIVEDEPS}"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk"

+ 4 - 0
recipes-devtools/gcc/gcc-crosssdk_11.1.bb

@@ -0,0 +1,4 @@
+require recipes-devtools/gcc/gcc-cross_${PV}.bb
+require gcc-crosssdk.inc
+
+EXTRA_OECONF:append:riscv64 = " --with-arch=rv64gc_zba_zbb_zbc_zbs CFLAGS_FOR_TARGET="-O2 -mcmodel=medany" CXXFLAGS_FOR_TARGET="-O2 -mcmodel=medany""

+ 235 - 0
recipes-devtools/gcc/gcc-multilib-config.inc

@@ -0,0 +1,235 @@
+# following code modifies these definitions in the gcc config
+#    MULTILIB_OPTIONS
+#    MULTILIB_DIRNAMES
+#    MULTILIB_OSDIRNAMES
+#    GLIBC_DYNAMIC_LINKER32
+#    GLIBC_DYNAMIC_LINKER64
+#    GLIBC_DYNAMIC_LINKERX32
+#    GLIBC_DYNAMIC_LINKERN32
+#  For more information on use of these variables look at these files in the gcc source code
+#    gcc/config/i386/t-linux64
+#    gcc/config/mips/t-linux64
+#    gcc/config/rs6000/t-linux64
+#    gcc/config/i386/linux64.h
+#    gcc/config/mips/linux64.h
+#    gcc/config/rs6000/linux64.h
+
+MULTILIB_OPTION_WHITELIST ??= "-m32 -m64 -mx32 -mabi=n32 -mabi=32 -mabi=64" 
+
+python gcc_multilib_setup() {
+    import re
+    import shutil
+    import glob
+
+    srcdir = d.getVar('S')
+    builddir = d.getVar('B')
+    src_conf_dir = '%s/gcc/config' % srcdir
+    build_conf_dir = '%s/gcc/config' % builddir
+
+    bb.utils.remove(build_conf_dir, True)
+    ml_globs = ('%s/*/t-linux64' % src_conf_dir,
+                '%s/*/linux64.h' % src_conf_dir,
+                '%s/aarch64/t-aarch64' % src_conf_dir,
+                '%s/aarch64/aarch64.h' % src_conf_dir,
+                '%s/aarch64/aarch64-cores.def' % src_conf_dir,
+                '%s/*/linux.h' % src_conf_dir,
+                '%s/linux.h' % src_conf_dir)
+
+    # copy the target multilib config files to ${B}
+    for ml_glob in ml_globs:
+        for fn in glob.glob(ml_glob):
+            rel_path = os.path.relpath(fn, src_conf_dir)
+            parent_dir = os.path.dirname(rel_path)
+            bb.utils.mkdirhier('%s/%s' % (build_conf_dir, parent_dir))
+            bb.utils.copyfile(fn, '%s/%s' % (build_conf_dir, rel_path))
+
+    pn = d.getVar('PN')
+    multilibs = (d.getVar('MULTILIB_VARIANTS') or '').split()
+    if not multilibs and pn != "nativesdk-gcc":
+        return
+
+    mlprefix = d.getVar('MLPREFIX')
+
+    if ('%sgcc' % mlprefix) != pn and (not pn.startswith('gcc-cross-canadian')) and pn != "nativesdk-gcc":
+        return
+
+
+    def write_config(root, files, options, dirnames, osdirnames):
+        for ml_conf_file in files:
+            with open(root + '/' + ml_conf_file, 'r') as f:
+                filelines = f.readlines()
+                # recreate multilib configuration variables
+                substs = [
+                    (r'^(\s*(MULTILIB_OPTIONS\s*=).*)$', r'\2 %s' % '/'.join(options)),
+                    (r'^(\s*MULTILIB_OPTIONS\s*\+=.*)$', ''),
+                    (r'^(\s*(MULTILIB_DIRNAMES\s*=).*)$', r'\2 %s' % ' '.join(dirnames)),
+                    (r'^(\s*MULTILIB_DIRNAMES\s*\+=.*)$', ''),
+                    (r'^(\s*(MULTILIB_OSDIRNAMES\s*=).*)$', r'\2 %s' % ' '.join(osdirnames)),
+                    (r'^(\s*MULTILIB_OSDIRNAMES\s*\+=.*)$', ''),
+                ]
+
+                for (i, line) in enumerate(filelines):
+                    for subst in substs:
+                        line = re.sub(subst[0], subst[1], line)
+                    filelines[i] = line
+
+                with open(root + '/' + ml_conf_file, 'w') as f:
+                    f.write(''.join(filelines))
+
+    def write_headers(root, files, libdir32, libdir64, libdirx32, libdirn32):
+        def wrap_libdir(libdir):
+            if libdir.find('SYSTEMLIBS_DIR') != -1:
+                return '"%r"'
+            else:
+                return '"/%s/"' % libdir
+
+        for ml_conf_file in files:
+            fn = root + '/' + ml_conf_file
+            if not os.path.exists(fn):
+                continue
+            with open(fn, 'r') as f:
+                filelines = f.readlines()
+
+                # replace lines like
+                # #define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
+                # by
+                # #define GLIBC_DYNAMIC_LINKER32 "/lib/" "ld-linux.so.2"
+                # this is needed to put the correct dynamic loader path in the generated binaries
+                substs = [
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir32) + r'\3'),
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\"\S+\")$',
+                        r'\1' + wrap_libdir(libdir64) + r'\3'),
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*\"\S+\"\s*)(\S+)(\s*\"\S+\"\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir64) + r'\3' + wrap_libdir(libdir64) + r'\5'),
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKERX32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdirx32) + r'\3'),
+                    (r'^(#define\s*GLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdirn32) + r'\3'),
+                    (r'^(#define\s*UCLIBC_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir32) + r'\3'),
+                    (r'^(#define\s*UCLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir64) + r'\3'),
+                    (r'^(#define\s*UCLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdirn32) + r'\3'),
+                    (r'^(#define\s*UCLIBC_DYNAMIC_LINKER\b\s*)(\S+)(\s*\".*\")$',
+                        r'\1' + wrap_libdir(libdir32) + r'\3'),
+                ]
+
+                for (i, line) in enumerate(filelines):
+                    for subst in substs:
+                        line = re.sub(subst[0], subst[1], line)
+                    filelines[i] = line
+
+                with open(root + '/' + ml_conf_file, 'w') as f:
+                    f.write(''.join(filelines))
+
+
+    gcc_target_config_files = {
+        'x86_64'    : ['gcc/config/i386/t-linux64'],
+        'i586'      : ['gcc/config/i386/t-linux64'],
+        'i686'      : ['gcc/config/i386/t-linux64'],
+        'mips'      : ['gcc/config/mips/t-linux64'],
+        'mips64'    : ['gcc/config/mips/t-linux64'],
+        'powerpc'   : ['gcc/config/rs6000/t-linux64'],
+        'powerpc64' : ['gcc/config/rs6000/t-linux64'],
+        'aarch64'   : ['gcc/config/aarch64/t-aarch64'],
+        'arm'       : ['gcc/config/aarch64/t-aarch64'],
+    }
+
+    gcc_header_config_files = {
+        'x86_64'    : ['gcc/config/i386/linux64.h'],
+        'i586'      : ['gcc/config/i386/linux64.h'],
+        'i686'      : ['gcc/config/i386/linux64.h'],
+        'mips'      : ['gcc/config/mips/linux.h', 'gcc/config/mips/linux64.h'],
+        'mips64'    : ['gcc/config/mips/linux.h', 'gcc/config/mips/linux64.h'],
+        'powerpc'   : ['gcc/config/rs6000/linux64.h'],
+        'powerpc64' : ['gcc/config/rs6000/linux64.h'],
+        'aarch64'   : ['gcc/config/aarch64/aarch64.h'],
+        'arm'       : ['gcc/config/aarch64/aarch64.h'],
+    }
+
+    libdir32 = 'SYSTEMLIBS_DIR'
+    libdir64 = 'SYSTEMLIBS_DIR'
+    libdirx32 = 'SYSTEMLIBS_DIR'
+    libdirn32 = 'SYSTEMLIBS_DIR'
+
+
+    target_arch = (d.getVar('TARGET_ARCH_MULTILIB_ORIGINAL') if mlprefix
+                    else d.getVar('TARGET_ARCH'))
+    if pn == "nativesdk-gcc":
+        header_config_files = gcc_header_config_files[d.getVar("SDK_ARCH")]
+        write_headers(builddir, header_config_files, libdir32, libdir64, libdirx32, libdirn32)
+        return
+
+    if target_arch not in gcc_target_config_files:
+        bb.warn('gcc multilib setup is not supported for TARGET_ARCH=' + target_arch)
+        return
+
+    target_config_files = gcc_target_config_files[target_arch]
+    header_config_files = gcc_header_config_files[target_arch]
+
+    ml_list = ['DEFAULTTUNE_MULTILIB_ORIGINAL' if mlprefix else 'DEFAULTTUNE']
+    mltunes = [('DEFAULTTUNE:virtclass-multilib-%s' % ml) for ml in multilibs]
+    if mlprefix:
+        mlindex = 0
+        for ml in multilibs:
+            if mlprefix == ml + '-':
+                break
+            mlindex += 1
+
+        ml_list.extend(mltunes[:mlindex] + ['DEFAULTTUNE'] + mltunes[(mlindex + 1):])
+    else:
+        ml_list.extend(mltunes)
+
+    options = []
+    dirnames = []
+    osdirnames = []
+    optsets = []
+
+    for ml in ml_list:
+        tune = d.getVar(ml)
+        if not tune:
+            bb.warn("%s doesn't have a corresponding tune. Skipping..." % ml)
+            continue
+        tune_parameters = get_tune_parameters(tune, d)
+
+        tune_baselib = tune_parameters['baselib']
+        if not tune_baselib:
+            bb.warn("Tune %s doesn't have a baselib set. Skipping..." % tune)
+            continue
+
+        if tune_baselib == 'lib64':
+            libdir64 = tune_baselib
+        elif tune_baselib == 'libx32':
+            libdirx32 = tune_baselib
+        elif tune_baselib == 'lib32':
+            libdirn32 = tune_baselib
+        elif tune_baselib == 'lib':
+            libdir32 = tune_baselib
+        else:
+            bb.error('Unknown libdir (%s) of the tune : %s' % (tune_baselib, tune))
+
+        # take out '-' mcpu='s and march='s from parameters
+        opts = []
+        whitelist = (d.getVar("MULTILIB_OPTION_WHITELIST") or "").split()
+        for i in d.expand(tune_parameters['ccargs']).split():
+            if i in whitelist:
+                # Need to strip '-' from option
+                opts.append(i[1:])
+        options.append(" ".join(opts))
+
+        if tune_baselib == 'lib':
+            dirnames.append('32')  # /lib => 32bit lib
+        else:
+            dirnames.append(tune_baselib.replace('lib', ''))
+        osdirnames.append('../' + tune_baselib)
+
+    write_config(builddir, target_config_files, options, dirnames, osdirnames)
+    write_headers(builddir, header_config_files, libdir32, libdir64, libdirx32, libdirn32)
+}
+
+gcc_multilib_setup[cleandirs] = "${B}/gcc/config"
+gcc_multilib_setup[vardepsexclude] = "SDK_ARCH"
+
+EXTRACONFFUNCS += "gcc_multilib_setup"

+ 318 - 0
recipes-devtools/gcc/gcc-runtime.inc

@@ -0,0 +1,318 @@
+require gcc-configure-common.inc
+
+SUMMARY = "Runtime libraries from GCC"
+
+# Over-ride the LICENSE set by gcc-${PV}.inc to remove "& GPLv3"
+# All gcc-runtime packages are now covered by the runtime exception.
+LICENSE = "GPL-3.0-with-GCC-exception"
+
+CXXFLAGS:remove = "-fvisibility-inlines-hidden"
+
+EXTRA_OECONF_PATHS = "\
+    --with-gxx-include-dir=${includedir}/c++/${BINV} \
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu"
+EXTRA_OECONF:append = " --cache-file=${B}/config.cache"
+EXTRA_OECONF:append:libc-newlib = " --with-newlib"
+
+# Disable ifuncs for libatomic on arm conflicts -march/-mcpu
+EXTRA_OECONF:append:arm = " libat_cv_have_ifunc=no "
+EXTRA_OECONF:append:armeb = " libat_cv_have_ifunc=no "
+
+DISABLE_STATIC:class-nativesdk ?= ""
+
+# Newlib does not support symbol versioning on libsdtcc++
+SYMVERS_CONF:libc-newlib = ""
+
+# Building with thumb enabled on armv6t fails
+ARM_INSTRUCTION_SET:armv6 = "arm"
+
+RUNTIMELIBITM = "libitm"
+RUNTIMELIBITM:arc = ""
+RUNTIMELIBITM:mipsarch = ""
+RUNTIMELIBITM:nios2 = ""
+RUNTIMELIBITM:microblaze = ""
+RUNTIMELIBITM:riscv32 = ""
+RUNTIMELIBITM:riscv64 = ""
+RUNTIMELIBSSP ?= ""
+RUNTIMELIBSSP:mingw32 ?= "libssp"
+
+RUNTIMETARGET = "${RUNTIMELIBSSP} libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \
+    ${@bb.utils.contains_any('FORTRAN', [',fortran',',f77'], 'libquadmath', '', d)} \
+"
+# Only build libstdc++ for newlib
+RUNTIMETARGET:libc-newlib = "libstdc++-v3"
+
+# libiberty
+# libgfortran needs separate recipe due to libquadmath dependency
+
+# Relative path to be repaced into debug info
+REL_S = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
+
+DEBUG_PREFIX_MAP:class-target = " \
+   -fdebug-prefix-map=${WORKDIR}/recipe-sysroot= \
+   -fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \
+   -fdebug-prefix-map=${S}=${REL_S} \
+   -fdebug-prefix-map=${S}/include=${REL_S}/libstdc++-v3/../include \
+   -fdebug-prefix-map=${S}/libiberty=${REL_S}/libstdc++-v3/../libiberty \
+   -fdebug-prefix-map=${S}/libgcc=${REL_S}/libstdc++-v3/../libgcc \
+   -fdebug-prefix-map=${B}=${REL_S} \
+   -ffile-prefix-map=${B}/${HOST_SYS}/libstdc++-v3/include=${includedir}/c++/${BINV} \
+   "
+
+do_configure () {
+	export CXX="${CXX} -nostdinc++ -nostdlib++"
+	for d in libgcc ${RUNTIMETARGET}; do
+		echo "Configuring $d"
+		rm -rf ${B}/${TARGET_SYS}/$d/
+		mkdir -p ${B}/${TARGET_SYS}/$d/
+		cd ${B}/${TARGET_SYS}/$d/
+		chmod a+x ${S}/$d/configure
+		relpath=${@os.path.relpath("${S}/$d", "${B}/${TARGET_SYS}/$d")}
+		$relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+		if [ "$d" = "libgcc" ]; then
+			(cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
+		fi
+	done
+}
+EXTRACONFFUNCS += "extract_stashed_builddir"
+do_configure[depends] += "${COMPILERDEP}"
+
+do_compile () {
+	for d in libgcc ${RUNTIMETARGET}; do
+		cd ${B}/${TARGET_SYS}/$d/
+		oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/
+	done
+}
+
+do_install () {
+	for d in ${RUNTIMETARGET}; do
+		cd ${B}/${TARGET_SYS}/$d/
+		oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/ install
+	done
+	if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include ]; then
+		install -d ${D}${libdir}/${TARGET_SYS}/${BINV}/include 
+		mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include
+		rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include
+	fi
+	rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir
+	rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir
+	rm -rf ${D}${infodir}/libquadmath.info ${D}${infodir}/dir
+	if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then
+		rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+	fi
+	if [ -d ${D}${infodir} ]; then
+		rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
+	fi
+}
+
+do_install:append:class-target () {
+	if [ "${TARGET_OS}" = "linux-gnuspe" ]; then
+		ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+	fi
+
+	if [ "${TARGET_OS}" = "linux-gnun32" ]; then
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
+		else
+			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+		fi
+	elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
+		else
+			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+		fi
+	elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+		mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
+		ln -s ../${TARGET_SYS}/bits ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
+		ln -s ../${TARGET_SYS}/ext ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
+	fi
+
+	if [ "${TARGET_ARCH}" == "x86_64" -a "${MULTILIB_VARIANTS}" != "" ];then
+		ln -sf ../${X86ARCH32}${TARGET_VENDOR}-${TARGET_OS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}/32
+	fi
+
+	if [ "${TCLIBC}" != "glibc" ]; then
+		case "${TARGET_OS}" in
+			"linux-musl" | "linux-*spe") extra_target_os="linux";;
+			"linux-musleabi") extra_target_os="linux-gnueabi";;
+			*) extra_target_os="linux";;
+		esac
+		ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os
+	fi
+	chown -R root:root ${D}
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc virtual/${MLPREFIX}libc"
+PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
+
+BBCLASSEXTEND = "nativesdk"
+
+PACKAGES = "\
+    ${PN}-dbg \
+    libstdc++ \
+    libstdc++-precompile-dev \
+    libstdc++-dev \
+    libstdc++-staticdev \
+    libg2c \
+    libg2c-dev \
+    libssp \
+    libssp-dev \
+    libssp-staticdev \
+    libquadmath \
+    libquadmath-dev \
+    libquadmath-staticdev \
+    libgomp \
+    libgomp-dev \
+    libgomp-staticdev \
+    libatomic \
+    libatomic-dev \
+    libatomic-staticdev \
+    libitm \
+    libitm-dev \
+    libitm-staticdev \
+"
+# The base package doesn't exist, so we clear the recommends.
+RRECOMMENDS:${PN}-dbg = ""
+
+# include python debugging scripts
+FILES:${PN}-dbg += "\
+    ${libdir}/libstdc++.*-gdb.py \
+    ${datadir}/gcc-${BINV}/python/libstdcxx \
+"
+
+FILES:libg2c = "${target_libdir}/libg2c.so.*"
+SUMMARY:libg2c = "Companion runtime library for g77"
+FILES:libg2c-dev = "\
+    ${libdir}/libg2c.so \
+    ${libdir}/libg2c.a \
+    ${libdir}/libfrtbegin.a \
+"
+SUMMARY:libg2c-dev = "Companion runtime library for g77 - development files"
+
+FILES:libstdc++ = "${libdir}/libstdc++.so.*"
+SUMMARY:libstdc++ = "GNU standard C++ library"
+FILES:libstdc++-dev = "\
+    ${includedir}/c++/ \
+    ${libdir}/libstdc++.so \
+    ${libdir}/libstdc++*.la \
+    ${libdir}/libsupc++.la \
+"
+SUMMARY:libstdc++-dev = "GNU standard C++ library - development files"
+FILES:libstdc++-staticdev = "\
+    ${libdir}/libstdc++*.a \
+    ${libdir}/libsupc++.a \
+"
+SUMMARY:libstdc++-staticdev = "GNU standard C++ library - static development files"
+
+FILES:libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
+SUMMARY:libstdc++-precompile-dev = "GNU standard C++ library - precompiled header files"
+
+FILES:libssp = "${libdir}/libssp.so.*"
+SUMMARY:libssp = "GNU stack smashing protection library"
+FILES:libssp-dev = "\
+    ${libdir}/libssp*.so \
+    ${libdir}/libssp*_nonshared.a \
+    ${libdir}/libssp*.la \
+    ${libdir}/${TARGET_SYS}/${BINV}/include/ssp \
+"
+SUMMARY:libssp-dev = "GNU stack smashing protection library - development files"
+FILES:libssp-staticdev = "${libdir}/libssp*.a"
+SUMMARY:libssp-staticdev = "GNU stack smashing protection library - static development files"
+
+FILES:libquadmath = "${libdir}/libquadmath*.so.*"
+SUMMARY:libquadmath = "GNU quad-precision math library"
+FILES:libquadmath-dev = "\
+    ${libdir}/${TARGET_SYS}/${BINV}/include/quadmath* \
+    ${libdir}/libquadmath*.so \
+    ${libdir}/libquadmath.la \
+"
+SUMMARY:libquadmath-dev = "GNU quad-precision math library - development files"
+FILES:libquadmath-staticdev = "${libdir}/libquadmath.a"
+SUMMARY:libquadmath-staticdev = "GNU quad-precision math library - static development files"
+
+FILES:libgomp = "${libdir}/libgomp*${SOLIBS}"
+SUMMARY:libgomp = "GNU OpenMP parallel programming library"
+FILES:libgomp-dev = "\
+    ${libdir}/libgomp*${SOLIBSDEV} \
+    ${libdir}/libgomp*.la \
+    ${libdir}/libgomp.spec \
+    ${libdir}/${TARGET_SYS}/${BINV}/include/acc_prof.h \
+    ${libdir}/${TARGET_SYS}/${BINV}/include/omp.h \
+    ${libdir}/${TARGET_SYS}/${BINV}/include/openacc.h \
+"
+SUMMARY:libgomp-dev = "GNU OpenMP parallel programming library - development files"
+FILES:libgomp-staticdev = "${libdir}/libgomp*.a"
+SUMMARY:libgomp-staticdev = "GNU OpenMP parallel programming library - static development files"
+
+FILES:libatomic = "${libdir}/libatomic.so.*"
+SUMMARY:libatomic = "GNU C++11 atomics support library"
+FILES:libatomic-dev = "\
+    ${libdir}/libatomic.so \
+    ${libdir}/libatomic.la \
+"
+SUMMARY:libatomic-dev = "GNU C++11 atomics support library - development files"
+FILES:libatomic-staticdev = "${libdir}/libatomic.a"
+SUMMARY:libatomic-staticdev = "GNU C++11 atomics support library - static development files"
+
+FILES:libitm = "${libdir}/libitm.so.*"
+SUMMARY:libitm = "GNU transactional memory support library"
+FILES:libitm-dev = "\
+    ${libdir}/libitm.so \
+    ${libdir}/libitm.la \
+    ${libdir}/libitm.spec \
+"
+SUMMARY:libitm-dev = "GNU transactional memory support library - development files"
+FILES:libitm-staticdev = "${libdir}/libitm.a"
+SUMMARY:libitm-staticdev = "GNU transactional memory support library - static development files"
+
+require gcc-testsuite.inc
+
+EXTRA_OEMAKE:prepend:task-check = "${PARALLEL_MAKE} "
+
+MAKE_CHECK_TARGETS ??= "check-gcc ${@" ".join("check-target-" + i for i in d.getVar("RUNTIMETARGET").split())}"
+# prettyprinters and xmethods require gdb tooling
+MAKE_CHECK_IGNORE ??= "prettyprinters.exp xmethods.exp"
+MAKE_CHECK_RUNTESTFLAGS ??= "${MAKE_CHECK_BOARDARGS} --ignore '${MAKE_CHECK_IGNORE}'"
+
+# specific host and target dependencies required for test suite running
+do_check[depends] += "dejagnu-native:do_populate_sysroot expect-native:do_populate_sysroot"
+do_check[depends] += "virtual/libc:do_populate_sysroot"
+# only depend on qemu if targeting linux user execution
+do_check[depends] += "${@'qemu-native:do_populate_sysroot' if "user" in d.getVar('TOOLCHAIN_TEST_TARGET') else ''}"
+# extend the recipe sysroot to include the built libraries (for qemu usermode)
+do_check[prefuncs] += "extend_recipe_sysroot"
+do_check[prefuncs] += "check_prepare"
+do_check[dirs] = "${WORKDIR}/dejagnu ${B}"
+do_check[nostamp] = "1"
+do_check() {
+    export DEJAGNU="${WORKDIR}/dejagnu/site.exp"
+
+    # HACK: this works around the configure setting CXX with -nostd* args
+    sed -i 's/-nostdinc++ -nostdlib++//g' $(find ${B} -name testsuite_flags | head -1)
+
+    if [ "${TOOLCHAIN_TEST_TARGET}" = "user" ]; then
+        # qemu user has issues allocating large amounts of memory
+        export G_SLICE=always-malloc
+        # no test should need more that 10G of memory, this prevents tests like pthread7-rope from leaking memory
+        ulimit -m 4194304
+        ulimit -v 10485760
+    fi
+
+    oe_runmake -i ${MAKE_CHECK_TARGETS} RUNTESTFLAGS="${MAKE_CHECK_RUNTESTFLAGS}"
+}
+addtask check after do_compile do_populate_sysroot
+

+ 2 - 0
recipes-devtools/gcc/gcc-runtime_11.1.bb

@@ -0,0 +1,2 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-runtime.inc

+ 118 - 0
recipes-devtools/gcc/gcc-sanitizers.inc

@@ -0,0 +1,118 @@
+require gcc-configure-common.inc
+
+LICENSE = "NCSA | MIT"
+
+LIC_FILES_CHKSUM = "\
+    file://libsanitizer/LICENSE.TXT;md5=0249c37748936faf5b1efd5789587909 \
+"
+
+EXTRA_OECONF_PATHS = "\
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+do_configure () {
+    rm -rf ${B}/${TARGET_SYS}/libsanitizer/
+    mkdir -p ${B}/${TARGET_SYS}/libsanitizer/
+    cd ${B}/${TARGET_SYS}/libsanitizer/
+    chmod a+x ${S}/libsanitizer/configure
+    relpath=${@os.path.relpath("${S}/libsanitizer", "${B}/${TARGET_SYS}/libsanitizer")}
+    $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+    # Easiest way to stop bad RPATHs getting into the library since we have a
+    # broken libtool here
+    sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${B}/${TARGET_SYS}/libsanitizer/libtool
+    # Link to the sysroot's libstdc++ instead of one gcc thinks it just built
+    sed -i -e '/LIBSTDCXX_RAW_CXX_\(CXXFLAGS\|LDFLAGS\)\s*=/d' ${B}/${TARGET_SYS}/libsanitizer/*/Makefile
+}
+EXTRACONFFUNCS += "extract_stashed_builddir"
+do_configure[depends] += "${COMPILERDEP}"
+
+do_compile () {
+    cd ${B}/${TARGET_SYS}/libsanitizer/
+    oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/libsanitizer/
+}
+
+do_install () {
+    cd ${B}/${TARGET_SYS}/libsanitizer/
+    oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/libsanitizer/ install
+    if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include ]; then
+	install -d ${D}${libdir}/${TARGET_SYS}/${BINV}/include
+	mv ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/* ${D}${libdir}/${TARGET_SYS}/${BINV}/include
+	rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include
+    fi
+    if [ -d ${D}${infodir} ]; then
+        rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
+    fi
+    chown -R root:root ${D}
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+ALLOW_EMPTY:${PN} = "1"
+DEPENDS = "virtual/crypt gcc-runtime virtual/${TARGET_PREFIX}gcc"
+
+# used to fix ../../../../../../../../../work-shared/gcc-8.3.0-r0/gcc-8.3.0/libsanitizer/libbacktrace/../../libbacktrace/elf.c:772:21: error: 'st.st_mode' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+DEBUG_OPTIMIZATION:append = " -Wno-error"
+
+BBCLASSEXTEND = "nativesdk"
+
+PACKAGES = "${PN} ${PN}-dbg"
+PACKAGES += "libasan libubsan liblsan libtsan"
+PACKAGES += "libasan-dev libubsan-dev liblsan-dev libtsan-dev"
+PACKAGES += "libasan-staticdev libubsan-staticdev liblsan-staticdev libtsan-staticdev"
+
+RDEPENDS:libasan += "libstdc++"
+RDEPENDS:libubsan += "libstdc++"
+RDEPENDS:liblsan += "libstdc++"
+RDEPENDS:libtsan += "libstdc++"
+RDEPENDS:libasan-dev += "${PN}"
+RDEPENDS:libubsan-dev += "${PN}"
+RDEPENDS:liblsan-dev += "${PN}"
+RDEPENDS:libtsan-dev += "${PN}"
+RRECOMMENDS:${PN} += "libasan libubsan"
+RRECOMMENDS:${PN}:append:x86 = " liblsan"
+RRECOMMENDS:${PN}:append:x86-64 = " liblsan libtsan"
+RRECOMMENDS:${PN}:append:powerpc64 = " liblsan libtsan"
+RRECOMMENDS:${PN}:append:aarch64 = " liblsan libtsan"
+
+do_package_write_ipk[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
+do_package_write_deb[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
+do_package_write_rpm[depends] += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs:do_packagedata"
+
+# Only x86, powerpc, sparc, s390, arm, and aarch64 are supported
+COMPATIBLE_HOST = '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64).*-linux'
+# musl is currently broken entirely
+COMPATIBLE_HOST:libc-musl = 'null'
+
+FILES:libasan += "${libdir}/libasan.so.* ${libdir}/libhwasan.so.*"
+FILES:libasan-dev += "\
+    ${libdir}/libasan_preinit.o \
+    ${libdir}/libasan.so \
+    ${libdir}/libhwasan.so \
+    ${libdir}/libasan.la \
+"
+FILES:libasan-staticdev += "${libdir}/libasan.a"
+
+FILES:libubsan += "${libdir}/libubsan.so.*"
+FILES:libubsan-dev += "\
+    ${libdir}/libubsan.so \
+    ${libdir}/libubsan.la \
+"
+FILES:libubsan-staticdev += "${libdir}/libubsan.a"
+
+FILES:liblsan += "${libdir}/liblsan.so.*"
+FILES:liblsan-dev += "\
+    ${libdir}/liblsan.so \
+    ${libdir}/liblsan.la \
+    ${libdir}/liblsan_preinit.o \
+"
+FILES:liblsan-staticdev += "${libdir}/liblsan.a"
+
+FILES:libtsan += "${libdir}/libtsan.so.*"
+FILES:libtsan-dev += "\
+    ${libdir}/libtsan.so \
+    ${libdir}/libtsan.la \
+    ${libdir}/libtsan_*.o \
+"
+FILES:libtsan-staticdev += "${libdir}/libtsan.a"
+
+FILES:${PN} = "${libdir}/*.spec ${libdir}/${TARGET_SYS}/${BINV}/include/sanitizer/*.h"

+ 7 - 0
recipes-devtools/gcc/gcc-sanitizers_11.1.bb

@@ -0,0 +1,7 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-sanitizers.inc
+
+# Building with thumb enabled on armv4t armv5t fails with
+# sanitizer_linux.s:5749: Error: lo register required -- `ldr ip,[sp],#8'
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"

+ 11 - 0
recipes-devtools/gcc/gcc-shared-source.inc

@@ -0,0 +1,11 @@
+do_fetch() {
+	:
+}
+do_fetch[noexec] = "1"
+deltask do_unpack
+deltask do_patch
+
+SRC_URI = ""
+
+do_configure[depends] += "gcc-source-${PV}:do_preconfigure"
+do_populate_lic[depends] += "gcc-source-${PV}:do_unpack"

+ 39 - 0
recipes-devtools/gcc/gcc-source.inc

@@ -0,0 +1,39 @@
+deltask do_configure 
+deltask do_compile 
+deltask do_install 
+deltask do_populate_sysroot
+deltask do_populate_lic 
+RM_WORK_EXCLUDE += "${PN}"
+
+inherit nopackages
+
+PN = "gcc-source-${PV}"
+WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}"
+SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:"
+
+STAMP = "${STAMPS_DIR}/work-shared/gcc-${PV}-${PR}"
+STAMPCLEAN = "${STAMPS_DIR}/work-shared/gcc-${PV}-*"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = ""
+PACKAGES = ""
+
+
+# This needs to be Python to avoid lots of shell variables becoming dependencies.
+python do_preconfigure () {
+    import subprocess
+    cmd = d.expand('cd ${S} && PATH=${PATH} gnu-configize')
+    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+    # See 0044-gengtypes.patch, we need to regenerate this file
+    bb.utils.remove(d.expand("${S}/gcc/gengtype-lex.c"))
+    cmd = d.expand("sed -i 's/BUILD_INFO=info/BUILD_INFO=/' ${S}/gcc/configure")
+    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+
+    # Easiest way to stop bad RPATHs getting into the library since we have a
+    # broken libtool here (breaks cross-canadian and target at least)
+    cmd = d.expand("sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${S}/libcc1/configure")
+    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+}
+addtask do_preconfigure after do_patch
+do_preconfigure[depends] += "gnu-config-native:do_populate_sysroot autoconf-native:do_populate_sysroot"
+

+ 6 - 0
recipes-devtools/gcc/gcc-source_11.1.bb

@@ -0,0 +1,6 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require recipes-devtools/gcc/gcc-source.inc
+
+EXCLUDE_FROM_WORLD = "1"
+
+EXTRA_OECONF:append:riscv64 = " --with-arch=rv64gc_zba_zbb_zbc_zbs CFLAGS_FOR_TARGET="-O2 -mcmodel=medany" CXXFLAGS_FOR_TARGET="-O2 -mcmodel=medany""

+ 260 - 0
recipes-devtools/gcc/gcc-target.inc

@@ -0,0 +1,260 @@
+GCCMULTILIB = "--enable-multilib"
+require gcc-configure-common.inc
+
+EXTRA_OECONF_PATHS = "\
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+EXTRA_OECONF:append:linuxstdbase = " --enable-clocale=gnu"
+
+# Configure gcc running on the target to default to an architecture which will
+# be compatible with that of gcc-runtime (which is cross compiled to be target
+# specific). For example, for ARM, ARMv6+ adds atomic instructions that may
+# affect the ABI in the gcc-runtime libs. Since we can't rely on gcc on the
+# target to always be passed -march etc, its built-in default needs to be safe.
+
+ARMFPARCHEXT ?= ""
+
+EXTRA_OECONF:append:armv6:class-target = " --with-arch=armv6${ARMFPARCHEXT}"
+EXTRA_OECONF:append:armv7a:class-target = " --with-arch=armv7-a${ARMFPARCHEXT}"
+EXTRA_OECONF:append:armv7ve:class-target = " --with-arch=armv7ve${ARMFPARCHEXT}"
+EXTRA_OECONF:append:arc:class-target = " --with-cpu=${TUNE_PKGARCH}"
+EXTRA_OECONF:append:x86-64:class-target = " --with-arch=native"
+
+# libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is
+# set in subdir gcc, so subdir libcc1 can't use it, export it here to
+# fix the problem.
+export gcc_cv_objdump = "${TARGET_PREFIX}objdump"
+
+EXTRA_OECONF_GCC_FLOAT = "${@get_gcc_float_setting(bb, d)}"
+
+PACKAGES = "\
+    ${PN} ${PN}-plugins ${PN}-symlinks \
+    g++ g++-symlinks \
+    cpp cpp-symlinks \
+    g77 g77-symlinks \
+    gfortran gfortran-symlinks \
+    gcov gcov-symlinks \
+    ${PN}-doc \
+    ${PN}-dev \
+    ${PN}-dbg \
+"
+
+FILES:${PN} = "\
+    ${bindir}/${TARGET_PREFIX}gcc* \
+    ${bindir}/${TARGET_PREFIX}lto* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/g++-mapper-server \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto*${SOLIBSDEV} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
+    ${libdir}/bfd-plugins/*.so \
+"
+INSANE_SKIP:${PN} += "dev-so"
+RRECOMMENDS:${PN} += "\
+    libssp \
+    libssp-dev \
+"
+RDEPENDS:${PN} += "cpp"
+
+FILES:${PN}-dev = "\
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/plugin/gengtype \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/gtype.state \
+"
+FILES:${PN}-symlinks = "\
+    ${bindir}/cc \
+    ${bindir}/gcc \
+    ${bindir}/gccbug \
+"
+
+FILES:${PN}-plugins = "\
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \
+"
+ALLOW_EMPTY:${PN}-plugins = "1"
+
+FILES:g77 = "\
+    ${bindir}/${TARGET_PREFIX}g77 \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
+"
+FILES:g77-symlinks = "\
+    ${bindir}/g77 \
+    ${bindir}/f77 \
+"
+RRECOMMENDS:g77 = "\
+    libg2c \
+    libg2c-dev \
+"
+
+FILES:gfortran = "\
+    ${bindir}/${TARGET_PREFIX}gfortran \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951 \
+"
+RRECOMMENDS:gfortran = "\
+    libquadmath \
+    libquadmath-dev \
+"
+FILES:gfortran-symlinks = "\
+    ${bindir}/gfortran \
+    ${bindir}/f95"
+
+FILES:cpp = "\
+    ${bindir}/${TARGET_PREFIX}cpp* \
+    ${base_libdir}/cpp \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
+FILES:cpp-symlinks = "${bindir}/cpp"
+
+FILES:gcov = "${bindir}/${TARGET_PREFIX}gcov* \
+    ${bindir}/${TARGET_PREFIX}gcov-tool* \
+"
+FILES:gcov-symlinks = "${bindir}/gcov \
+    ${bindir}/gcov-tool \
+"
+
+FILES:g++ = "\
+    ${bindir}/${TARGET_PREFIX}g++* \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
+"
+FILES:g++-symlinks = "\
+    ${bindir}/c++ \
+    ${bindir}/g++ \
+"
+RRECOMMENDS:g++ = "\
+    libstdc++ \
+    libstdc++-dev \
+    libatomic \
+    libatomic-dev \
+"
+
+FILES:${PN}-doc = "\
+    ${infodir} \
+    ${mandir} \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README \
+"
+
+do_compile () {
+	# Prevent full target sysroot path from being used in configargs.h header,
+	# as it will be rewritten when used by other sysroots preventing support
+	# for gcc plugins. Additionally the path is embeddeded into the output
+	# binary, this prevents building a reproducible binary.
+	oe_runmake configure-gcc
+	sed -i 's@${STAGING_DIR_TARGET}@/@g' ${B}/gcc/configargs.h
+	sed -i 's@${STAGING_DIR_HOST}@/@g' ${B}/gcc/configargs.h
+
+	# Prevent sysroot/workdir paths from being used in checksum-options.
+	# checksum-options is used to generate a checksum which is embedded into
+	# the output binary.
+	oe_runmake TARGET-gcc=checksum-options all-gcc
+	sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options
+	sed -i 's@${STAGING_DIR_TARGET}@/@g' ${B}/gcc/checksum-options
+
+	oe_runmake all-host
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install-host
+
+	# Add unwind.h, it comes from libgcc which we don't want to build again
+	install ${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/gcc/${TARGET_SYS}/${BINV}/include/unwind.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/
+
+	# Info dir listing isn't interesting at this point so remove it if it exists.
+	if [ -e "${D}${infodir}/dir" ]; then
+		rm -f ${D}${infodir}/dir
+	fi
+
+	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+	rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
+	rmdir ${D}${includedir}
+	rm -rf ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+
+	# Hack around specs file assumptions
+	test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs
+
+	# Cleanup manpages..
+	rm -rf ${D}${mandir}/man7
+
+	# Don't package details about the build host
+	rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/auto-build.h
+	rm -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/plugin/include/bconfig.h
+
+	cd ${D}${bindir}
+
+	# We care about g++ not c++
+	rm -f *c++*
+
+	# We don't care about the gcc-<version> ones for this
+	rm -f *gcc-?.?*
+
+	# Not sure why we end up with these but we don't want them...
+	rm -f ${TARGET_PREFIX}${TARGET_PREFIX}*
+
+	# Symlinks so we can use these trivially on the target
+	if [ -e ${TARGET_PREFIX}g77 ]; then
+		ln -sf ${TARGET_PREFIX}g77 g77 || true
+		ln -sf g77 f77 || true
+	fi
+	if [ -e ${TARGET_PREFIX}gfortran ]; then
+		ln -sf ${TARGET_PREFIX}gfortran gfortran || true
+		ln -sf gfortran f95 || true
+	fi
+	ln -sf ${TARGET_PREFIX}g++ g++
+	ln -sf ${TARGET_PREFIX}gcc gcc
+	ln -sf ${TARGET_PREFIX}cpp cpp
+	ln -sf ${TARGET_PREFIX}gcov gcov
+	ln -sf ${TARGET_PREFIX}gcov-tool gcov-tool
+	install -d ${D}${base_libdir}
+	ln -sf ${bindir}/${TARGET_PREFIX}cpp ${D}${base_libdir}/cpp
+	ln -sf g++ c++
+	ln -sf gcc cc
+	install -d ${D}${libdir}/bfd-plugins
+	ln -sf ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so
+	chown -R root:root ${D}
+}
+
+do_install:append () {
+        #
+        # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header
+        # files and places the modified files into
+        # {D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed folder. This makes the
+        # build not deterministic. The following code prunes all those headers
+        # except those under include-fixed/linux, *limits.h and README, yielding
+        # the same include-fixed folders no matter what sysroot
+
+        include_fixed="${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed"
+        for f in $(find ${include_fixed} -type f); do
+                case $f in
+                */include-fixed/linux/*)
+                    continue
+                    ;;
+                */include-fixed/*limits.h)
+                    continue
+                    ;;
+                */include-fixed/README)
+                    continue
+                    ;;
+                *)
+                    # remove file and directory if empty
+                    bbdebug 2 "Pruning $f"
+                    rm $f
+                    find $(dirname $f) -maxdepth 0 -empty -exec rmdir {} \;
+                    ;;
+                esac
+        done
+}
+
+# Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross
+# and one from here. These can confuse gcc cross where includes use #include_next
+# and builds track file dependencies (e.g. perl and its makedepends code).
+# For determinism we don't install this ever and rely on the copy from gcc-cross.
+# [YOCTO #7287]
+SYSROOT_DIRS_BLACKLIST += "${libdir}/gcc"

+ 107 - 0
recipes-devtools/gcc/gcc-testsuite.inc

@@ -0,0 +1,107 @@
+inherit qemu
+
+TOOLCHAIN_TEST_TARGET ??= "user"
+TOOLCHAIN_TEST_HOST ??= "localhost"
+TOOLCHAIN_TEST_HOST_USER ??= "root"
+TOOLCHAIN_TEST_HOST_PORT ??= "2222"
+
+MAKE_CHECK_BOARDFLAGS ??= ""
+MAKE_CHECK_BOARDARGS ??= "--target_board=${TOOLCHAIN_TEST_TARGET}${MAKE_CHECK_BOARDFLAGS}"
+
+python () {
+    # Provide the targets compiler args via targets options. This allows dejagnu to
+    # correctly mark incompatible tests as UNSUPPORTED (e.g. needs soft-float
+    # but running on hard-float target).
+    #
+    # These options are called "multilib_flags" within the gcc test suite. Most
+    # architectures handle these options in a sensible way such that tests that
+    # are incompatible with the provided multilib are marked as UNSUPPORTED.
+    #
+    # Note: multilib flags are added to the compile command after the args
+    # provided by any test (through dg-options), CFLAGS_FOR_TARGET is always
+    # added to the compile command before any other args but is not interpted
+    # as options like multilib flags.
+    #
+    # i686, x86-64 and aarch64 are special, since most toolchains built for
+    # these targets don't do multilib the tests do not get correctly marked as
+    # UNSUPPORTED. More importantly the test suite itself does not handle
+    # overriding the multilib flags where it could (like other archs do). As
+    # such do not pass the target compiler args for these targets.
+    args = d.getVar("TUNE_CCARGS").split()
+    if d.getVar("TUNE_ARCH") in ["i686", "x86_64", "aarch64"]:
+        args = []
+    d.setVar("MAKE_CHECK_BOARDFLAGS", ("/" + "/".join(args)) if len(args) != 0 else "")
+}
+
+python check_prepare() {
+    def generate_qemu_linux_user_config(d):
+        content = []
+        content.append('load_generic_config "sim"')
+        content.append('load_base_board_description "basic-sim"')
+        content.append('process_multilib_options ""')
+
+        # qemu args
+        qemu_binary = qemu_target_binary(d)
+        if not qemu_binary:
+            bb.fatal("Missing target qemu linux-user binary")
+
+        args = []
+        # QEMU_OPTIONS is not always valid due to -cross recipe
+        args += ["-r", d.getVar("OLDEST_KERNEL")]
+        # enable all valid instructions, since the test suite itself does not
+        # limit itself to the target cpu options.
+        #   - valid for x86*, powerpc, arm, arm64
+        if qemu_binary.lstrip("qemu-") in ["x86_64", "i386", "ppc", "arm", "aarch64"]:
+            args += ["-cpu", "max"]
+
+        sysroot = d.getVar("RECIPE_SYSROOT")
+        args += ["-L", sysroot]
+        # lib paths are static here instead of using $libdir since this is used by a -cross recipe
+        libpaths = [sysroot + "/usr/lib", sysroot + "/lib"]
+        args += ["-E", "LD_LIBRARY_PATH={0}".format(":".join(libpaths))]
+
+        content.append('set_board_info is_simulator 1')
+        content.append('set_board_info sim "{0}"'.format(qemu_binary))
+        content.append('set_board_info sim,options "{0}"'.format(" ".join(args)))
+
+        # target build/test config
+        content.append('set_board_info target_install {%s}' % d.getVar("TARGET_SYS"))
+        content.append('set_board_info ldscript ""')
+        #content.append('set_board_info needs_status_wrapper 1') # qemu-linux-user return codes work, and abort works fine
+        content.append('set_board_info gcc,stack_size 16834')
+        content.append('set_board_info gdb,nosignals 1')
+        content.append('set_board_info gcc,timeout 60')
+
+        return "\n".join(content)
+
+    def generate_remote_ssh_linux_config(d):
+        content = []
+        content.append('load_generic_config "unix"')
+        content.append('process_multilib_options ""')
+        content.append("set_board_info hostname {0}".format(d.getVar("TOOLCHAIN_TEST_HOST")))
+        content.append("set_board_info username {0}".format(d.getVar("TOOLCHAIN_TEST_HOST_USER")))
+
+        port = d.getVar("TOOLCHAIN_TEST_HOST_PORT")
+        content.append("set_board_info rsh_prog \"/usr/bin/ssh -p {0} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no\"".format(port))
+        content.append("set_board_info rcp_prog \"/usr/bin/scp -P {0} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no\"".format(port))
+
+        return "\n".join(content)
+
+    dejagnudir = d.expand("${WORKDIR}/dejagnu")
+    if not os.path.isdir(dejagnudir):
+        os.makedirs(dejagnudir)
+
+    # write out target qemu board config
+    with open(os.path.join(dejagnudir, "user.exp"), "w") as f:
+        f.write(generate_qemu_linux_user_config(d))
+
+    # write out target ssh board config
+    with open(os.path.join(dejagnudir, "ssh.exp"), "w") as f:
+        f.write(generate_remote_ssh_linux_config(d))
+
+    # generate site.exp to provide boards
+    with open(os.path.join(dejagnudir, "site.exp"), "w") as f:
+        f.write("lappend boards_dir {0}\n".format(dejagnudir))
+        f.write("set CFLAGS_FOR_TARGET \"{0}\"\n".format(d.getVar("TOOLCHAIN_OPTIONS")))
+}
+

+ 96 - 0
recipes-devtools/gcc/gcc/0001-Upstream-Status-Backport.patch

@@ -0,0 +1,96 @@
+From b93236bd8cd749196e787a9d36bcd09e673b3604 Mon Sep 17 00:00:00 2001
+From: Jun Yuan Tan <junyuan.tan@starfivetech.com>
+Date: Mon, 22 Nov 2021 00:13:28 +0800
+Subject: [PATCH 1/1] Upstream-Status: Backport Signed-off-by: Ross Burton
+ <ross.burton@arm.com>
+
+From ad4c21f0f59b52357019148ec94d767aa2acd8f2 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Tue, 1 Jun 2021 11:00:16 +0100
+Subject: [PATCH] libstdc++: Fix installation of python hooks [PR 99453]
+
+When no shared library is installed, the new code to determine the name
+of the -gdb.py file yields an empty string. Use the name of the static
+library in that case.
+
+libstdc++-v3/ChangeLog:
+
+	PR libstdc++/99453
+	* python/Makefile.am: Use archive name for printer hook if no
+	dynamic library name is available.
+	* python/Makefile.in: Regenerate.
+
+(cherry picked from commit 9f7bc160b4a0f27dce248d1226e3ae7104b0e67b)
+
+Signed-off-by: Jun Yuan Tan <junyuan.tan@starfivetech.com>
+---
+ libstdc++-v3/python/Makefile.am | 24 ++++++++----------------
+ libstdc++-v3/python/Makefile.in | 18 ++++++------------
+ 2 files changed, 14 insertions(+), 28 deletions(-)
+
+diff --git a/libstdc++-v3/python/Makefile.am b/libstdc++-v3/python/Makefile.am
+index 01517a2a522..8efefa5725c 100644
+--- a/libstdc++-v3/python/Makefile.am
++++ b/libstdc++-v3/python/Makefile.am
+@@ -44,21 +44,13 @@ gdb.py: hook.in Makefile
+ install-data-local: gdb.py
+ 	@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
+ ## We want to install gdb.py as SOMETHING-gdb.py.  SOMETHING is the
+-## full name of the final library.  We want to ignore symlinks, the
+-## .la file, and any previous -gdb.py file.  This is inherently
+-## fragile, but there does not seem to be a better option, because
+-## libtool hides the real names from us.
+-	@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
+-	  for file in libstdc++.*; do \
+-	    case $$file in \
+-	      *-gdb.py) ;; \
+-	      *.la) ;; \
+-	      *) if test -h $$file; then \
+-	           continue; \
+-	         fi; \
+-	         libname=$$file;; \
+-	    esac; \
+-	  done; \
+-	cd $$here; \
++## full name of the final library.  We use the libtool .la file to get
++## the correct name.
++	@libname=`sed -ne "/^library_names=/{s/.*='//;s/'$$//;s/ .*//;p;}" \
++	          $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \
++	if [ -z "$$libname" ]; then \
++	  libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \
++		  $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \
++	fi; \
+ 	echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \
+ 	$(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py
+diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in
+index c35dbe55961..9904a9197de 100644
+--- a/libstdc++-v3/python/Makefile.in
++++ b/libstdc++-v3/python/Makefile.in
+@@ -607,18 +607,12 @@ gdb.py: hook.in Makefile
+ 
+ install-data-local: gdb.py
+ 	@$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
+-	@here=`pwd`; cd $(DESTDIR)$(toolexeclibdir); \
+-	  for file in libstdc++.*; do \
+-	    case $$file in \
+-	      *-gdb.py) ;; \
+-	      *.la) ;; \
+-	      *) if test -h $$file; then \
+-	           continue; \
+-	         fi; \
+-	         libname=$$file;; \
+-	    esac; \
+-	  done; \
+-	cd $$here; \
++	@libname=`sed -ne "/^library_names=/{s/.*='//;s/'$$//;s/ .*//;p;}" \
++	          $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \
++	if [ -z "$$libname" ]; then \
++	  libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \
++		  $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \
++	fi; \
+ 	echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \
+ 	$(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py
+ 
+-- 
+2.33.1
+

+ 25 - 0
recipes-devtools/gcc/gcc/0001-Yocto-patch-for-arch-canonicalize-to-use-python3.patch

@@ -0,0 +1,25 @@
+From 32ad3862042b90805f402ee4a1615d5e68502c5b Mon Sep 17 00:00:00 2001
+From: Jun Yuan Tan <junyuan.tan@starfivetech.com>
+Date: Fri, 12 Nov 2021 12:38:34 +0800
+Subject: [PATCH 1/2] Yocto patch for arch-canonicalize to use python3
+
+This patch is required for Yocto to build properly
+
+Signed-off-by: Jun Yuan Tan <junyuan.tan@starfivetech.com>
+---
+ gcc/config/riscv/arch-canonicalize | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/config/riscv/arch-canonicalize b/gcc/config/riscv/arch-canonicalize
+index ea95a0693f3..fab933f8af1 100755
+--- a/gcc/config/riscv/arch-canonicalize
++++ b/gcc/config/riscv/arch-canonicalize
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Tool for canonical RISC-V architecture string.
+ # Copyright (C) 2011-2021 Free Software Foundation, Inc.
+-- 
+2.33.1
+

+ 39 - 0
recipes-devtools/gcc/gcc/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch

@@ -0,0 +1,39 @@
+From 368eaf1846733a9920c7cf5bc547a377e7167785 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 08:37:11 +0400
+Subject: [PATCH] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Inappropriate [embedded specific]
+---
+ configure    | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 504f6410274..bcebad264ec 100755
+--- a/configure
++++ b/configure
+@@ -9728,7 +9728,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
+diff --git a/configure.ac b/configure.ac
+index 088e735c5db..1289fe08760 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3240,7 +3240,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in

+ 73 - 0
recipes-devtools/gcc/gcc/0001-testuite-Check-pthread-for-omp-module-testing.patch

@@ -0,0 +1,73 @@
+From c108c54011f6256806d4fe1a653e631fa66dba51 Mon Sep 17 00:00:00 2001
+From: Kito Cheng <kito.cheng@sifive.com>
+Date: Wed, 19 May 2021 18:06:27 +0800
+Subject: [PATCH 01/15] testuite: Check pthread for omp module testing
+
+gcc/testsuite/ChangeLog:
+
+	* g++.dg/modules/omp-1_a.C: Check pthread is available.
+	* g++.dg/modules/omp-1_b.C: Ditto.
+	* g++.dg/modules/omp-1_c.C: Ditto.
+	* g++.dg/modules/omp-2_a.C: Ditto.
+	* g++.dg/modules/omp-2_b.C: Ditto.
+---
+ gcc/testsuite/g++.dg/modules/omp-1_a.C | 1 +
+ gcc/testsuite/g++.dg/modules/omp-1_b.C | 1 +
+ gcc/testsuite/g++.dg/modules/omp-1_c.C | 1 +
+ gcc/testsuite/g++.dg/modules/omp-2_a.C | 1 +
+ gcc/testsuite/g++.dg/modules/omp-2_b.C | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/gcc/testsuite/g++.dg/modules/omp-1_a.C b/gcc/testsuite/g++.dg/modules/omp-1_a.C
+index 722720a0e93..94e1171f03c 100644
+--- a/gcc/testsuite/g++.dg/modules/omp-1_a.C
++++ b/gcc/testsuite/g++.dg/modules/omp-1_a.C
+@@ -1,4 +1,5 @@
+ // { dg-additional-options "-fmodules-ts -fopenmp" }
++// { dg-require-effective-target pthread }
+ 
+ export module foo;
+ // { dg-module-cmi foo }
+diff --git a/gcc/testsuite/g++.dg/modules/omp-1_b.C b/gcc/testsuite/g++.dg/modules/omp-1_b.C
+index f3f5d92e517..09d97e4ac4e 100644
+--- a/gcc/testsuite/g++.dg/modules/omp-1_b.C
++++ b/gcc/testsuite/g++.dg/modules/omp-1_b.C
+@@ -1,4 +1,5 @@
+ // { dg-additional-options "-fmodules-ts -fopenmp" }
++// { dg-require-effective-target pthread }
+ 
+ import foo;
+ 
+diff --git a/gcc/testsuite/g++.dg/modules/omp-1_c.C b/gcc/testsuite/g++.dg/modules/omp-1_c.C
+index f30f6115277..599a5a5d34f 100644
+--- a/gcc/testsuite/g++.dg/modules/omp-1_c.C
++++ b/gcc/testsuite/g++.dg/modules/omp-1_c.C
+@@ -1,4 +1,5 @@
+ // { dg-additional-options "-fmodules-ts" }
++// { dg-require-effective-target pthread }
+ 
+ import foo;
+ 
+diff --git a/gcc/testsuite/g++.dg/modules/omp-2_a.C b/gcc/testsuite/g++.dg/modules/omp-2_a.C
+index d2291b6bbe0..b0d4bbc6e8a 100644
+--- a/gcc/testsuite/g++.dg/modules/omp-2_a.C
++++ b/gcc/testsuite/g++.dg/modules/omp-2_a.C
+@@ -1,4 +1,5 @@
+ // { dg-additional-options "-fmodules-ts -fopenmp" }
++// { dg-require-effective-target pthread }
+ 
+ export module foo;
+ // { dg-module-cmi foo }
+diff --git a/gcc/testsuite/g++.dg/modules/omp-2_b.C b/gcc/testsuite/g++.dg/modules/omp-2_b.C
+index 39f34c70275..aeee4d1561a 100644
+--- a/gcc/testsuite/g++.dg/modules/omp-2_b.C
++++ b/gcc/testsuite/g++.dg/modules/omp-2_b.C
+@@ -1,4 +1,5 @@
+ // { dg-additional-options "-fmodules-ts" }
++// { dg-require-effective-target pthread }
+ 
+ import foo;
+ 
+-- 
+2.33.1
+

+ 31 - 0
recipes-devtools/gcc/gcc/0002-Fix-a-test-failure-in-g-.dg-modules-omp-1_c.C.patch

@@ -0,0 +1,31 @@
+From 9d923e3f7aff2107743bdd70d0cf04b969e1b1a1 Mon Sep 17 00:00:00 2001
+From: Bernd Edlinger <bernd.edlinger@hotmail.de>
+Date: Thu, 20 May 2021 20:19:43 +0200
+Subject: [PATCH 02/15] Fix a test failure in g++.dg/modules/omp-1_c.C
+
+Adjust the line number due to previous commit,
+which added a line for dg-require-effective-target.
+
+2021-05-20  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	* g++.dg/modules/omp-1_c.C: Fix testcase.
+---
+ gcc/testsuite/g++.dg/modules/omp-1_c.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/testsuite/g++.dg/modules/omp-1_c.C b/gcc/testsuite/g++.dg/modules/omp-1_c.C
+index 599a5a5d34f..71a24f6c8ef 100644
+--- a/gcc/testsuite/g++.dg/modules/omp-1_c.C
++++ b/gcc/testsuite/g++.dg/modules/omp-1_c.C
+@@ -3,7 +3,7 @@
+ 
+ import foo;
+ 
+-// { dg-regexp "In module imported at \[^\n]*omp-1_c.C:3:1:\nfoo: error: module contains OpenMP, use '-fopenmp' to enable\n" }
++// { dg-regexp "In module imported at \[^\n]*omp-1_c.C:4:1:\nfoo: error: module contains OpenMP, use '-fopenmp' to enable\n" }
+ // { dg-prune-output "failed to read" }
+ // { dg-prune-output "fatal error:" }
+ // { dg-prune-output "compilation terminated" }
+-- 
+2.33.1
+

+ 226 - 0
recipes-devtools/gcc/gcc/0002-gcc-poison-system-directories.patch

@@ -0,0 +1,226 @@
+From 118c6f054711d437167ff125a88c9236bfc8099c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 8 Mar 2021 16:04:20 -0800
+Subject: [PATCH] gcc: poison-system-directories
+
+Add /sw/include and /opt/include based on the original
+zecke-no-host-includes.patch patch.  The original patch checked for
+/usr/include, /sw/include and /opt/include and then triggered a failure and
+aborted.
+
+Instead, we add the two missing items to the current scan.  If the user
+wants this to be a failure, they can add "-Werror=poison-system-directories".
+
+Upstream-Status: Pending
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/common.opt      |  4 ++++
+ gcc/config.in       | 10 ++++++++++
+ gcc/configure       | 19 +++++++++++++++++++
+ gcc/configure.ac    | 16 ++++++++++++++++
+ gcc/doc/invoke.texi |  9 +++++++++
+ gcc/gcc.c           |  9 +++++++--
+ gcc/incpath.c       | 21 +++++++++++++++++++++
+ 7 files changed, 86 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/common.opt b/gcc/common.opt
+index c75dd36843e..49acbd6ed44 100644
+--- a/gcc/common.opt
++++ b/gcc/common.opt
+@@ -683,6 +683,10 @@ Wreturn-local-addr
+ Common Var(warn_return_local_addr) Init(1) Warning
+ Warn about returning a pointer/reference to a local or temporary variable.
+ 
++Wpoison-system-directories
++Common Var(flag_poison_system_directories) Init(1) Warning
++Warn for -I and -L options using system directories if cross compiling
++
+ Wshadow
+ Common Var(warn_shadow) Warning
+ Warn when one variable shadows another.  Same as -Wshadow=global.
+diff --git a/gcc/config.in b/gcc/config.in
+index 10a13cde586..8848284da41 100644
+--- a/gcc/config.in
++++ b/gcc/config.in
+@@ -218,6 +218,16 @@
+ #endif
+ 
+ 
++/* Define to warn for use of native system header directories */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++#endif
++/* Define to warn for use of native system header directories */
++#ifndef USED_FOR_TARGET
++#undef POISON_BY_DEFAULT
++#endif
++
++
+ /* Define if you want all operations on RTL (the basic data structure of the
+    optimizer and back end) to be checked for dynamic type safety at runtime.
+    This is quite expensive. */
+diff --git a/gcc/configure b/gcc/configure
+index 9bb436ce7bd..3f0734bff11 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -1020,6 +1020,7 @@ enable_maintainer_mode
+ enable_link_mutex
+ enable_link_serialization
+ enable_version_specific_runtime_libs
++enable_poison_system_directories
+ enable_plugin
+ enable_host_shared
+ enable_libquadmath_support
+@@ -1782,6 +1783,8 @@ Optional Features:
+   --enable-version-specific-runtime-libs
+                           specify that runtime libraries should be installed
+                           in a compiler-specific directory
++  --enable-poison-system-directories
++                          warn for use of native system header directories
+   --enable-plugin         enable plugin support
+   --enable-host-shared    build host code as shared libraries
+   --disable-libquadmath-support
+@@ -31325,6 +31328,22 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" != "xno"; then
++
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++if test "$enable_poison_system_directories" = "error"; then
++$as_echo "#define POISON_BY_DEFAULT 1" >>confdefs.h
++fi
++
++fi
++
+ # Substitute configuration variables
+ 
+ 
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index caa611933df..54e21764b3e 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -7123,6 +7123,22 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+                 [specify that runtime libraries should be
+                  installed in a compiler-specific directory])])
+ 
++AC_ARG_ENABLE([poison-system-directories],
++             AS_HELP_STRING([--enable-poison-system-directories],
++                            [warn for use of native system header directories (no/yes/error)]),,
++             [enable_poison_system_directories=no])
++AC_MSG_NOTICE([poisoned directories $enable_poison_system_directories])
++if test "x${enable_poison_system_directories}" != "xno"; then
++  AC_MSG_NOTICE([poisoned directories enabled])
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++           [1],
++           [Define to warn for use of native system header directories])
++  if test $enable_poison_system_directories = "error"; then
++   AC_MSG_NOTICE([poisoned directories are fatal])
++   AC_DEFINE([POISON_BY_DEFAULT], [1], [Define to make poison warnings errors])
++  fi
++fi
++
+ # Substitute configuration variables
+ AC_SUBST(subdirs)
+ AC_SUBST(srcdir)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 7a368959e5e..6659a903bf0 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -369,6 +369,7 @@ Objective-C and Objective-C++ Dialects}.
+ -Wpacked  -Wno-packed-bitfield-compat  -Wpacked-not-aligned  -Wpadded @gol
+ -Wparentheses  -Wno-pedantic-ms-format @gol
+ -Wpointer-arith  -Wno-pointer-compare  -Wno-pointer-to-int-cast @gol
++-Wno-poison-system-directories @gol
+ -Wno-pragmas  -Wno-prio-ctor-dtor  -Wredundant-decls @gol
+ -Wrestrict  -Wno-return-local-addr  -Wreturn-type @gol
+ -Wno-scalar-storage-order  -Wsequence-point @gol
+@@ -7735,6 +7736,14 @@ made up of data only and thus requires no special treatment.  But, for
+ most targets, it is made up of code and thus requires the stack to be
+ made executable in order for the program to work properly.
+ 
++@item -Wno-poison-system-directories
++@opindex Wno-poison-system-directories
++Do not warn for @option{-I} or @option{-L} options using system
++directories such as @file{/usr/include} when cross compiling.  This
++option is intended for use in chroot environments when such
++directories contain the correct headers and libraries for the target
++system rather than the host.
++
+ @item -Wfloat-equal
+ @opindex Wfloat-equal
+ @opindex Wno-float-equal
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 7837553958b..19c75b6e20d 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1152,6 +1152,8 @@ proper position among the other output files.  */
+    "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
+    "%X %{o*} %{e*} %{N} %{n} %{r}\
+     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!r:%{!nostartfiles:%S}}} \
++    %{Wno-poison-system-directories:--no-poison-system-directories} \
++    %{Werror=poison-system-directories:--error-poison-system-directories} \
+     %{static|no-pie|static-pie:} %@{L*} %(mfwrap) %(link_libgcc) " \
+     VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o "" \
+     %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*:%*} 1):\
+@@ -1247,8 +1249,11 @@ static const char *cpp_unique_options =
+ static const char *cpp_options =
+ "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
+  %{f*} %{g*:%{%:debug-level-gt(0):%{g*}\
+- %{!fno-working-directory:-fworking-directory}}} %{O*}\
+- %{undef} %{save-temps*:-fpch-preprocess}";
++ %{!fno-working-directory:-fworking-directory}}} %{O*}"
++#ifdef POISON_BY_DEFAULT
++ " -Werror=poison-system-directories"
++#endif
++ " %{undef} %{save-temps*:-fpch-preprocess}";
+ 
+ /* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al.
+ 
+diff --git a/gcc/incpath.c b/gcc/incpath.c
+index 446d280321d..fbfc0ce03b8 100644
+--- a/gcc/incpath.c
++++ b/gcc/incpath.c
+@@ -26,6 +26,7 @@
+ #include "intl.h"
+ #include "incpath.h"
+ #include "cppdefault.h"
++#include "diagnostic-core.h"
+ 
+ /* Microsoft Windows does not natively support inodes.
+    VMS has non-numeric inodes.  */
+@@ -395,6 +396,26 @@ merge_include_chains (const char *sysroot, cpp_reader *pfile, int verbose)
+ 	}
+       fprintf (stderr, _("End of search list.\n"));
+     }
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (flag_poison_system_directories)
++    {
++       struct cpp_dir *p;
++
++       for (p = heads[INC_QUOTE]; p; p = p->next)
++         {
++          if ((!strncmp (p->name, "/usr/include", 12))
++              || (!strncmp (p->name, "/usr/local/include", 18))
++              || (!strncmp (p->name, "/usr/X11R6/include", 18))
++              || (!strncmp (p->name, "/sw/include", 11))
++              || (!strncmp (p->name, "/opt/include", 12)))
++            warning (OPT_Wpoison_system_directories,
++                     "include location \"%s\" is unsafe for "
++                     "cross-compilation",
++                     p->name);
++         }
++    }
++#endif
+ }
+ 
+ /* Use given -I paths for #include "..." but not #include <...>, and

+ 70 - 0
recipes-devtools/gcc/gcc/0003-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch

@@ -0,0 +1,70 @@
+From 274a27da6fe355c4c49953b3b69c8949d2412c62 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:08:31 +0400
+Subject: [PATCH] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET
+
+Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
+
+This alternative patch is better because it lets you just use CFLAGS_FOR_TARGET to set the compilation flags for libgcc. Since bootstrapped target libraries are never compiled with the native compiler, it makes little sense to use different flags for stage1 and later stages. And it also makes little sense to use a different variable than CFLAGS_FOR_TARGET.
+
+Other changes I had to do include:
+
+- moving the creation of default CFLAGS_FOR_TARGET from Makefile.am to configure.ac, because otherwise the BOOT_CFLAGS are substituted into CFLAGS_FOR_TARGET (which is "-O2 -g $(CFLAGS)") via $(CFLAGS). It is also cleaner this way though.
+
+- passing the right CFLAGS to configure scripts as exported environment variables
+
+I also stopped passing LIBCFLAGS to configure scripts since they are unused in the whole src tree. And I updated the documentation as H-P reminded me to do.
+
+Bootstrapped/regtested i686-pc-linux-gnu, will commit to 4.4 shortly. Ok for 4.3?
+
+Signed-off-by: Paolo Bonzini  <bonzini@gnu.org>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+---
+ configure | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+
+diff --git a/configure b/configure
+index bcebad264ec..86e4ee7c383 100755
+--- a/configure
++++ b/configure
+@@ -8977,6 +8977,38 @@ fi
+ 
+ 
+ 
++# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
++# might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
++# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
++# We want to ensure that TARGET libraries (which we know are built with
++# gcc) are built with "-O2 -g", so include those options when setting
++# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
++if test "x$CFLAGS_FOR_TARGET" = x; then
++  CFLAGS_FOR_TARGET=$CFLAGS
++  case " $CFLAGS " in
++    *" -O2 "*) ;;
++    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
++  esac
++  case " $CFLAGS " in
++    *" -g "* | *" -g3 "*) ;;
++    *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
++  esac
++fi
++
++
++if test "x$CXXFLAGS_FOR_TARGET" = x; then
++  CXXFLAGS_FOR_TARGET=$CXXFLAGS
++  case " $CXXFLAGS " in
++    *" -O2 "*) ;;
++    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
++  esac
++  case " $CXXFLAGS " in
++    *" -g "* | *" -g3 "*) ;;
++    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
++  esac
++fi
++
++
+ # Handle --with-headers=XXX.  If the value is not "yes", the contents of
+ # the named directory are copied to $(tooldir)/sys-include.
+ if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then

+ 39 - 0
recipes-devtools/gcc/gcc/0003-testuite-Check-pthread-for-omp-module-testing.patch

@@ -0,0 +1,39 @@
+From d0a7ad164b60ddc34e9705c1e9225510345e5208 Mon Sep 17 00:00:00 2001
+From: Kito Cheng <kito.cheng@sifive.com>
+Date: Mon, 21 Jun 2021 21:19:38 +0800
+Subject: [PATCH 03/15] testuite: Check pthread for omp module testing
+
+---
+ gcc/testsuite/g++.dg/modules/omp-1_a.C | 2 +-
+ gcc/testsuite/g++.dg/modules/omp-2_a.C | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/testsuite/g++.dg/modules/omp-1_a.C b/gcc/testsuite/g++.dg/modules/omp-1_a.C
+index 94e1171f03c..7ddb776d6a1 100644
+--- a/gcc/testsuite/g++.dg/modules/omp-1_a.C
++++ b/gcc/testsuite/g++.dg/modules/omp-1_a.C
+@@ -2,7 +2,7 @@
+ // { dg-require-effective-target pthread }
+ 
+ export module foo;
+-// { dg-module-cmi foo }
++// { dg-module-cmi foo { target pthread } }
+ 
+ export inline void frob (unsigned (&ary)[64])
+ {
+diff --git a/gcc/testsuite/g++.dg/modules/omp-2_a.C b/gcc/testsuite/g++.dg/modules/omp-2_a.C
+index b0d4bbc6e8a..e030ac7acf7 100644
+--- a/gcc/testsuite/g++.dg/modules/omp-2_a.C
++++ b/gcc/testsuite/g++.dg/modules/omp-2_a.C
+@@ -2,7 +2,7 @@
+ // { dg-require-effective-target pthread }
+ 
+ export module foo;
+-// { dg-module-cmi foo }
++// { dg-module-cmi foo { target pthread } }
+ 
+ // The OpenMPness doesn't escape to the interface.
+ export void frob (unsigned (&ary)[64])
+-- 
+2.33.1
+

+ 116 - 0
recipes-devtools/gcc/gcc/0004-64-bit-multilib-hack.patch

@@ -0,0 +1,116 @@
+From 28e7c312b1292ca216d4b54ec9f6b7ac055907a8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:10:06 +0400
+Subject: [PATCH] 64-bit multilib hack.
+
+GCC has internal multilib handling code but it assumes a very specific rigid directory
+layout. The build system implementation of multilib layout is very generic and allows
+complete customisation of the library directories.
+
+This patch is a partial solution to allow any custom directories to be passed into gcc
+and handled correctly. It forces gcc to use the base_libdir (which is the current
+directory, "."). We need to do this for each multilib that is configured as we don't
+know which compiler options may be being passed into the compiler. Since we have a compiler
+per mulitlib at this point that isn't an issue.
+
+The one problem is the target compiler is only going to work for the default multlilib at
+this point. Ideally we'd figure out which multilibs were being enabled with which paths
+and be able to patch these entries with a complete set of correct paths but this we
+don't have such code at this point. This is something the target gcc recipe should do
+and override these platform defaults in its build config.
+
+Do same for riscv64 and aarch64
+
+RP 15/8/11
+
+Upstream-Status: Inappropriate[OE-Specific]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+---
+ gcc/config/aarch64/t-aarch64-linux |  8 ++++----
+ gcc/config/i386/t-linux64          |  6 ++----
+ gcc/config/mips/t-linux64          | 10 +++-------
+ gcc/config/riscv/t-linux           |  6 ++++--
+ gcc/config/rs6000/t-linux64        |  5 ++---
+ 5 files changed, 15 insertions(+), 20 deletions(-)
+
+diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
+index 241b0ef20b6..a7dadb2d64f 100644
+--- a/gcc/config/aarch64/t-aarch64-linux
++++ b/gcc/config/aarch64/t-aarch64-linux
+@@ -21,8 +21,8 @@
+ LIB1ASMSRC   = aarch64/lib1funcs.asm
+ LIB1ASMFUNCS = _aarch64_sync_cache_range
+ 
+-AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
+-MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
+-MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
++#AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
++#MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++#MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
+ 
+-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
++#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
+diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
+index d288b093522..7b5980a9d21 100644
+--- a/gcc/config/i386/t-linux64
++++ b/gcc/config/i386/t-linux64
+@@ -32,7 +32,5 @@
+ #
+ comma=,
+ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+-MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
+-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
+-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
++MULTILIB_DIRNAMES = . .
++MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
+diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
+index 130e1f04707..3b7eb6b2a2f 100644
+--- a/gcc/config/mips/t-linux64
++++ b/gcc/config/mips/t-linux64
+@@ -17,10 +17,6 @@
+ # <http://www.gnu.org/licenses/>.
+ 
+ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
+-MULTILIB_DIRNAMES = n32 32 64
+-MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
+-MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
+-MULTILIB_OSDIRNAMES = \
+-	../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
+-	../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
+-	../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
++MULTILIB_DIRNAMES = . . .
++MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
++
+diff --git a/gcc/config/riscv/t-linux b/gcc/config/riscv/t-linux
+index 216d2776a18..e4d817621fc 100644
+--- a/gcc/config/riscv/t-linux
++++ b/gcc/config/riscv/t-linux
+@@ -1,3 +1,5 @@
+ # Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
+-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
+-MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
++MULTILIB_DIRNAMES := . .
++#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
++MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
+diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
+index e11a118cb5f..4eaffb416fe 100644
+--- a/gcc/config/rs6000/t-linux64
++++ b/gcc/config/rs6000/t-linux64
+@@ -26,10 +26,9 @@
+ # MULTILIB_OSDIRNAMES according to what is found on the target.
+ 
+ MULTILIB_OPTIONS    := m64/m32
+-MULTILIB_DIRNAMES   := 64 32
++MULTILIB_DIRNAMES   := . .
+ MULTILIB_EXTRA_OPTS := 
+-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
++MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
+ 
+ rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
+ 	$(COMPILE) $<

+ 180 - 0
recipes-devtools/gcc/gcc/0004-varasm-Two-SECTION_RETAIN-fixes-PR100130.patch

@@ -0,0 +1,180 @@
+From 3ef4e867281820ac2298c1783fbeda40224687d8 Mon Sep 17 00:00:00 2001
+From: Richard Sandiford <richard.sandiford@arm.com>
+Date: Wed, 21 Apr 2021 09:08:44 +0100
+Subject: [PATCH 04/15] varasm: Two SECTION_RETAIN fixes [PR100130]
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+switch_to_section warns if we try to output a retain decl in a
+section without a retain flag, or if we try to output a non-retain
+decl in a section with a retain flag.  However, the warning only
+applied if we were trying to “switch” to the current section.
+This works if all decls that use a section are generated consecutively,
+but not if there is an unrelated decl in between.
+
+This patch makes the check unconditional, but suppresses the warning
+if we're writing the section's named.decl (i.e. the decl from which
+the section name and original flags were derived).
+
+Also, the warning didn't fire for -fsection-anchors, for two reasons:
+we allowed retain and non-retain decls to be put into the same block,
+and we didn't pass a decl to switch_to_section.
+
+Although these are arguably separate bugs, it isn't easy to fix them
+independently without temporarily regressing -fsection-anchor targets.
+
+gcc/
+	PR middle-end/100130
+	* varasm.c (get_block_for_decl): Make sure that any use of the
+	retain attribute matches the section's retain flag.
+	(switch_to_section): Check for retain mismatches even when
+	changing sections, but do not warn if the given decl is the
+	section's named.decl.
+	(output_object_block): Pass the first decl in the block (if any)
+	to switch_to_section.
+
+gcc/testsuite/
+	PR middle-end/100130
+	* c-c++-common/attr-retain-10.c: New test.
+	* c-c++-common/attr-retain-11.c: Likewise.
+---
+ gcc/testsuite/c-c++-common/attr-retain-10.c | 11 ++++
+ gcc/testsuite/c-c++-common/attr-retain-11.c | 11 ++++
+ gcc/varasm.c                                | 60 +++++++++++----------
+ 3 files changed, 54 insertions(+), 28 deletions(-)
+ create mode 100644 gcc/testsuite/c-c++-common/attr-retain-10.c
+ create mode 100644 gcc/testsuite/c-c++-common/attr-retain-11.c
+
+diff --git a/gcc/testsuite/c-c++-common/attr-retain-10.c b/gcc/testsuite/c-c++-common/attr-retain-10.c
+new file mode 100644
+index 00000000000..0bac947023a
+--- /dev/null
++++ b/gcc/testsuite/c-c++-common/attr-retain-10.c
+@@ -0,0 +1,11 @@
++/* { dg-do compile { target R_flag_in_section } } */
++/* { dg-skip-if "non-ELF target" { *-*-darwin* powerpc*-*-aix* } } */
++/* { dg-options "-Wall -O2 -fno-toplevel-reorder" } */
++
++int __attribute__((used,retain,section(".data.foo"))) foo2 = 2;
++int between = 1;
++int __attribute__((section(".data.foo"))) foo1 = 1;
++/* { dg-warning "'.*' without 'retain' attribute and '.*' with 'retain' attribute are placed in a section with the same name" "" { target R_flag_in_section } .-1 } */
++
++/* { dg-final { scan-assembler ".data.foo,\"aw\"" { target R_flag_in_section } } } */
++/* { dg-final { scan-assembler ".data.foo,\"awR\"" { target R_flag_in_section } } } */
+diff --git a/gcc/testsuite/c-c++-common/attr-retain-11.c b/gcc/testsuite/c-c++-common/attr-retain-11.c
+new file mode 100644
+index 00000000000..d1d3d9e8c9f
+--- /dev/null
++++ b/gcc/testsuite/c-c++-common/attr-retain-11.c
+@@ -0,0 +1,11 @@
++/* { dg-do compile { target R_flag_in_section } } */
++/* { dg-skip-if "non-ELF target" { *-*-darwin* powerpc*-*-aix* } } */
++/* { dg-options "-Wall -O2 -fno-toplevel-reorder" } */
++
++int __attribute__((section(".data.foo"))) foo1 = 1;
++/* { dg-warning "'.*' without 'retain' attribute and '.*' with 'retain' attribute are placed in a section with the same name" "" { target R_flag_in_section } .-1 } */
++int between = 1;
++int __attribute__((used,retain,section(".data.foo"))) foo2 = 2;
++
++/* { dg-final { scan-assembler ".data.foo,\"aw\"" { target R_flag_in_section } } } */
++/* { dg-final { scan-assembler ".data.foo,\"awR\"" { target R_flag_in_section } } } */
+diff --git a/gcc/varasm.c b/gcc/varasm.c
+index 8bb921faa26..3ecf9e039bb 100644
+--- a/gcc/varasm.c
++++ b/gcc/varasm.c
+@@ -1314,6 +1314,10 @@ get_block_for_decl (tree decl)
+   if (SECTION_STYLE (sect) == SECTION_NOSWITCH)
+     return NULL;
+ 
++  if (bool (lookup_attribute ("retain", DECL_ATTRIBUTES (decl)))
++      != bool (sect->common.flags & SECTION_RETAIN))
++    return NULL;
++
+   return get_block_for_section (sect);
+ }
+ 
+@@ -7758,33 +7762,33 @@ output_section_asm_op (const void *directive)
+ void
+ switch_to_section (section *new_section, tree decl)
+ {
+-  if (in_section == new_section)
++  bool retain_p;
++  if ((new_section->common.flags & SECTION_NAMED)
++      && decl != nullptr
++      && DECL_P (decl)
++      && ((retain_p = !!lookup_attribute ("retain",
++					  DECL_ATTRIBUTES (decl)))
++	  != !!(new_section->common.flags & SECTION_RETAIN)))
+     {
+-      bool retain_p;
+-      if ((new_section->common.flags & SECTION_NAMED)
+-	  && decl != nullptr
+-	  && DECL_P (decl)
+-	  && ((retain_p = !!lookup_attribute ("retain",
+-					      DECL_ATTRIBUTES (decl)))
+-	      != !!(new_section->common.flags & SECTION_RETAIN)))
+-	{
+-	  /* If the SECTION_RETAIN bit doesn't match, switch to a new
+-	     section.  */
+-	  tree used_decl, no_used_decl;
++      /* If the SECTION_RETAIN bit doesn't match, switch to a new
++	 section.  */
++      tree used_decl, no_used_decl;
+ 
+-	  if (retain_p)
+-	    {
+-	      new_section->common.flags |= SECTION_RETAIN;
+-	      used_decl = decl;
+-	      no_used_decl = new_section->named.decl;
+-	    }
+-	  else
+-	    {
+-	      new_section->common.flags &= ~(SECTION_RETAIN
+-					     | SECTION_DECLARED);
+-	      used_decl = new_section->named.decl;
+-	      no_used_decl = decl;
+-	    }
++      if (retain_p)
++	{
++	  new_section->common.flags |= SECTION_RETAIN;
++	  used_decl = decl;
++	  no_used_decl = new_section->named.decl;
++	}
++      else
++	{
++	  new_section->common.flags &= ~(SECTION_RETAIN
++					 | SECTION_DECLARED);
++	  used_decl = new_section->named.decl;
++	  no_used_decl = decl;
++	}
++      if (no_used_decl != used_decl)
++	{
+ 	  warning (OPT_Wattributes,
+ 		   "%+qD without %<retain%> attribute and %qD with "
+ 		   "%<retain%> attribute are placed in a section with "
+@@ -7792,9 +7796,9 @@ switch_to_section (section *new_section, tree decl)
+ 	  inform (DECL_SOURCE_LOCATION (used_decl),
+ 		  "%qD was declared here", used_decl);
+ 	}
+-      else
+-	return;
+     }
++  else if (in_section == new_section)
++    return;
+ 
+   if (new_section->common.flags & SECTION_FORGET)
+     in_section = NULL;
+@@ -8007,7 +8011,7 @@ output_object_block (struct object_block *block)
+       && (strcmp (block->sect->named.name, ".vtable_map_vars") == 0))
+     handle_vtv_comdat_section (block->sect, block->sect->named.decl);
+   else
+-    switch_to_section (block->sect);
++    switch_to_section (block->sect, SYMBOL_REF_DECL ((*block->objects)[0]));
+ 
+   gcc_checking_assert (!(block->sect->common.flags & SECTION_MERGE));
+   assemble_align (block->alignment);
+-- 
+2.33.1
+

+ 122 - 0
recipes-devtools/gcc/gcc/0005-optional-libstdc.patch

@@ -0,0 +1,122 @@
+From 57e2c5e35732988c0b287289eb0997b4e9769371 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:12:56 +0400
+Subject: [PATCH] optional libstdc
+
+gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++
+will not run correctly since by default the linker will try to link against libstdc++
+which shouldn't exist yet. We need an option to disable -lstdc++
+option whilst leaving -lc, -lgcc and other automatic library dependencies added by gcc
+driver. This patch adds such an option which only disables the -lstdc++.
+
+A "standard" gcc build uses xgcc and hence avoids this. We should ask upstream how to
+do this officially, the likely answer is don't build libstdc++ separately.
+
+RP 29/6/10
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Inappropriate [embedded specific]
+---
+ gcc/c-family/c.opt  |  4 ++++
+ gcc/cp/g++spec.c    |  1 +
+ gcc/doc/invoke.texi | 32 +++++++++++++++++++++++++++++++-
+ gcc/gcc.c           |  1 +
+ 4 files changed, 37 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
+index 64e46e7573e..1824380f27a 100644
+--- a/gcc/c-family/c.opt
++++ b/gcc/c-family/c.opt
+@@ -2166,6 +2166,10 @@ nostdinc++
+ C++ ObjC++
+ Do not search standard system include directories for C++.
+ 
++nostdlib++
++Driver
++Do not link standard C++ runtime library
++
+ o
+ C ObjC C++ ObjC++ Joined Separate
+ ; Documented in common.opt
+diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c
+index 3c9bd1490b4..818beb61cee 100644
+--- a/gcc/cp/g++spec.c
++++ b/gcc/cp/g++spec.c
+@@ -159,6 +159,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
+       switch (decoded_options[i].opt_index)
+ 	{
+ 	case OPT_nostdlib:
++	case OPT_nostdlib__:
+ 	case OPT_nodefaultlibs:
+ 	  library = -1;
+ 	  break;
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 6659a903bf0..9ee63dbe52f 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -239,6 +239,9 @@ in the following sections.
+ -fno-weak  -nostdinc++ @gol
+ -fvisibility-inlines-hidden @gol
+ -fvisibility-ms-compat @gol
++-fvtable-verify=@r{[}std@r{|}preinit@r{|}none@r{]} @gol
++-fvtv-counts -fvtv-debug @gol
++-nostdlib++ @gol
+ -fext-numeric-literals @gol
+ -flang-info-include-translate@r{[}=@var{header}@r{]} @gol
+ -flang-info-include-translate-not @gol
+@@ -632,7 +635,7 @@ Objective-C and Objective-C++ Dialects}.
+ -pie  -pthread  -r  -rdynamic @gol
+ -s  -static  -static-pie  -static-libgcc  -static-libstdc++ @gol
+ -static-libasan  -static-libtsan  -static-liblsan  -static-libubsan @gol
+--shared  -shared-libgcc  -symbolic @gol
++-shared  -shared-libgcc  -symbolic -nostdlib++ @gol
+ -T @var{script}  -Wl,@var{option}  -Xlinker @var{option} @gol
+ -u @var{symbol}  -z @var{keyword}}
+ 
+@@ -15708,6 +15711,33 @@ Specify that the program entry point is @var{entry}.  The argument is
+ interpreted by the linker; the GNU linker accepts either a symbol name
+ or an address.
+ 
++@item -nostdlib++
++@opindex nostdlib++
++Do not use the standard system C++ runtime libraries when linking.
++Only the libraries you specify will be passed to the linker.
++
++@cindex @option{-lgcc}, use with @option{-nostdlib}
++@cindex @option{-nostdlib} and unresolved references
++@cindex unresolved references and @option{-nostdlib}
++@cindex @option{-lgcc}, use with @option{-nodefaultlibs}
++@cindex @option{-nodefaultlibs} and unresolved references
++@cindex unresolved references and @option{-nodefaultlibs}
++One of the standard libraries bypassed by @option{-nostdlib} and
++@option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines
++which GCC uses to overcome shortcomings of particular machines, or special
++needs for some languages.
++(@xref{Interface,,Interfacing to GCC Output,gccint,GNU Compiler
++Collection (GCC) Internals},
++for more discussion of @file{libgcc.a}.)
++In most cases, you need @file{libgcc.a} even when you want to avoid
++other standard libraries.  In other words, when you specify @option{-nostdlib}
++or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well.
++This ensures that you have no unresolved references to internal GCC
++library subroutines.
++(An example of such an internal subroutine is @code{__main}, used to ensure C++
++constructors are called; @pxref{Collect2,,@code{collect2}, gccint,
++GNU Compiler Collection (GCC) Internals}.)
++
+ @item -pie
+ @opindex pie
+ Produce a dynamically linked position independent executable on targets
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 19c75b6e20d..be7630ffd8c 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1162,6 +1162,7 @@ proper position among the other output files.  */
+     %(mflib) " STACK_SPLIT_SPEC "\
+     %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} " SANITIZER_SPEC " \
+     %{!nostdlib:%{!r:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}}\
++    %{!nostdlib++:}\
+     %{!nostdlib:%{!r:%{!nostartfiles:%E}}} %{T*}  \n%(post_link) }}}}}}"
+ #endif
+ 

+ 142 - 0
recipes-devtools/gcc/gcc/0005-testsuite-Add-fchecking-to-dg-ice-tests.patch

@@ -0,0 +1,142 @@
+From 484239a45044ffefebb54286ce89e71ce3304d8f Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Wed, 21 Apr 2021 15:17:10 +0200
+Subject: [PATCH 05/15] testsuite: Add -fchecking to dg-ice tests
+
+In --enable-checking=release builds (which is the default on release
+branches), I'm getting various extra FAILs that don't appear in
+--enable-checking=yes builds.
+
+XPASS: g++.dg/cpp0x/constexpr-52830.C  -std=c++14 (internal compiler error)
+FAIL: g++.dg/cpp0x/constexpr-52830.C  -std=c++14 (test for excess errors)
+XPASS: g++.dg/cpp0x/constexpr-52830.C  -std=c++17 (internal compiler error)
+FAIL: g++.dg/cpp0x/constexpr-52830.C  -std=c++17 (test for excess errors)
+XPASS: g++.dg/cpp0x/constexpr-52830.C  -std=c++2a (internal compiler error)
+FAIL: g++.dg/cpp0x/constexpr-52830.C  -std=c++2a (test for excess errors)
+FAIL: g++.dg/cpp0x/vt-88982.C  -std=c++14 (test for excess errors)
+FAIL: g++.dg/cpp0x/vt-88982.C  -std=c++17 (test for excess errors)
+FAIL: g++.dg/cpp0x/vt-88982.C  -std=c++2a (test for excess errors)
+FAIL: g++.dg/cpp1y/auto-fn61.C  -std=c++14 (test for excess errors)
+FAIL: g++.dg/cpp1y/auto-fn61.C  -std=c++17 (test for excess errors)
+FAIL: g++.dg/cpp1y/auto-fn61.C  -std=c++2a (test for excess errors)
+FAIL: g++.dg/cpp1z/constexpr-lambda26.C  -std=c++17 (test for excess errors)
+FAIL: g++.dg/cpp1z/constexpr-lambda26.C  -std=c++2a (test for excess errors)
+FAIL: g++.dg/cpp2a/nontype-class39.C  -std=c++2a (test for excess errors)
+FAIL: c-c++-common/goacc/kernels-decompose-ice-1.c  -std=c++14 (test for excess errors)
+FAIL: c-c++-common/goacc/kernels-decompose-ice-1.c  -std=c++17 (test for excess errors)
+FAIL: c-c++-common/goacc/kernels-decompose-ice-1.c  -std=c++2a (test for excess errors)
+FAIL: c-c++-common/goacc/kernels-decompose-ice-1.c  -std=c++98 (test for excess errors)
+FAIL: c-c++-common/goacc/kernels-decompose-ice-2.c  -std=c++14 (test for excess errors)
+FAIL: c-c++-common/goacc/kernels-decompose-ice-2.c  -std=c++17 (test for excess errors)
+FAIL: c-c++-common/goacc/kernels-decompose-ice-2.c  -std=c++2a (test for excess errors)
+FAIL: c-c++-common/goacc/kernels-decompose-ice-2.c  -std=c++98 (test for excess errors)
+
+These are tests that have dg-ice and most of those ICEs are checking ICEs
+which go away in release checking when -fno-checking is the default.
+
+The following patch adds -fchecking option to those.
+
+2021-04-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/cpp1z/constexpr-lambda26.C: Add dg-additional-options
+	-fchecking.
+	* g++.dg/cpp1y/auto-fn61.C: Likewise.
+	* g++.dg/cpp2a/nontype-class39.C: Likewise.
+	* g++.dg/cpp0x/constexpr-52830.C: Likewise.
+	* g++.dg/cpp0x/vt-88982.C: Likewise.
+	* c-c++-common/goacc/kernels-decompose-ice-1.c: Add -fchecking to
+	dg-additional-options.
+	* c-c++-common/goacc/kernels-decompose-ice-2.c: Likewise.
+---
+ gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c | 2 +-
+ gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-2.c | 2 +-
+ gcc/testsuite/g++.dg/cpp0x/constexpr-52830.C               | 1 +
+ gcc/testsuite/g++.dg/cpp0x/vt-88982.C                      | 1 +
+ gcc/testsuite/g++.dg/cpp1y/auto-fn61.C                     | 1 +
+ gcc/testsuite/g++.dg/cpp1z/constexpr-lambda26.C            | 1 +
+ gcc/testsuite/g++.dg/cpp2a/nontype-class39.C               | 1 +
+ 7 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c
+index d770b91dd09..8c3884bdc00 100644
+--- a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c
++++ b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c
+@@ -1,7 +1,7 @@
+ /* Test OpenACC 'kernels' construct decomposition.  */
+ 
+ /* { dg-additional-options "-fopt-info-omp-all" } */
+-/* { dg-additional-options "--param=openacc-kernels=decompose" } */
++/* { dg-additional-options "-fchecking --param=openacc-kernels=decompose" } */
+ /* { dg-ice "TODO" }
+    { dg-prune-output "during GIMPLE pass: omplower" } */
+ 
+diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-2.c b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-2.c
+index ae059eb354b..8bf60a9a509 100644
+--- a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-2.c
++++ b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-2.c
+@@ -1,6 +1,6 @@
+ /* Test OpenACC 'kernels' construct decomposition.  */
+ 
+-/* { dg-additional-options "--param=openacc-kernels=decompose" } */
++/* { dg-additional-options "-fchecking --param=openacc-kernels=decompose" } */
+ /* { dg-ice "TODO" }
+    { dg-prune-output "during GIMPLE pass: omplower" } */
+ 
+diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-52830.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-52830.C
+index 2c9d2f9b329..eae0d8c377b 100644
+--- a/gcc/testsuite/g++.dg/cpp0x/constexpr-52830.C
++++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-52830.C
+@@ -1,5 +1,6 @@
+ // PR c++/52830
+ // { dg-do compile { target c++11 } }
++// { dg-additional-options "-fchecking" }
+ // { dg-ice "comptypes" }
+ 
+ template<bool b> struct eif { typedef void type; };
+diff --git a/gcc/testsuite/g++.dg/cpp0x/vt-88982.C b/gcc/testsuite/g++.dg/cpp0x/vt-88982.C
+index cb9530dcee1..7a868233d73 100644
+--- a/gcc/testsuite/g++.dg/cpp0x/vt-88982.C
++++ b/gcc/testsuite/g++.dg/cpp0x/vt-88982.C
+@@ -1,5 +1,6 @@
+ // PR c++/88982
+ // { dg-do compile { target c++11 } }
++// { dg-additional-options "-fchecking" }
+ // { dg-ice "tsubst_pack_expansion" }
+ 
+ template<typename...Ts> struct A {
+diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-fn61.C b/gcc/testsuite/g++.dg/cpp1y/auto-fn61.C
+index c24c3b85d78..bed5ea0cfc0 100644
+--- a/gcc/testsuite/g++.dg/cpp1y/auto-fn61.C
++++ b/gcc/testsuite/g++.dg/cpp1y/auto-fn61.C
+@@ -1,5 +1,6 @@
+ // PR c++/88003
+ // { dg-do compile { target c++14 } }
++// { dg-additional-options "-fchecking" }
+ // { dg-ice "poplevel_class" }
+ 
+ auto test() {
+diff --git a/gcc/testsuite/g++.dg/cpp1z/constexpr-lambda26.C b/gcc/testsuite/g++.dg/cpp1z/constexpr-lambda26.C
+index d6c8bae525f..0cdb400d21c 100644
+--- a/gcc/testsuite/g++.dg/cpp1z/constexpr-lambda26.C
++++ b/gcc/testsuite/g++.dg/cpp1z/constexpr-lambda26.C
+@@ -1,5 +1,6 @@
+ // PR c++/87765
+ // { dg-do compile { target c++17 } }
++// { dg-additional-options "-fchecking" }
+ // { dg-ice "cxx_eval_constant_expression" }
+ 
+ template <int N>
+diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-class39.C b/gcc/testsuite/g++.dg/cpp2a/nontype-class39.C
+index f5f79a71ec2..512afad8e4f 100644
+--- a/gcc/testsuite/g++.dg/cpp2a/nontype-class39.C
++++ b/gcc/testsuite/g++.dg/cpp2a/nontype-class39.C
+@@ -1,5 +1,6 @@
+ // PR c++/89565
+ // { dg-do compile { target c++20 } }
++// { dg-additional-options "-fchecking" }
+ // { dg-ice "resolve_args" }
+ 
+ template <auto>
+-- 
+2.33.1
+

+ 35 - 0
recipes-devtools/gcc/gcc/0006-COLLECT_GCC_OPTIONS.patch

@@ -0,0 +1,35 @@
+From 127716a32a11ca2a6b3aac068054bfc69c4dcfd8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:16:28 +0400
+Subject: [PATCH] COLLECT_GCC_OPTIONS
+
+This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to
+invoke collect2.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+---
+ gcc/gcc.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index be7630ffd8c..1bc45285384 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -5383,6 +5383,15 @@ set_collect_gcc_options (void)
+ 		sizeof ("COLLECT_GCC_OPTIONS=") - 1);
+ 
+   first_time = TRUE;
++#ifdef HAVE_LD_SYSROOT
++  if (target_system_root_changed && target_system_root)
++    {
++      obstack_grow (&collect_obstack, "'--sysroot=", sizeof("'--sysroot=")-1);
++      obstack_grow (&collect_obstack, target_system_root,strlen(target_system_root));
++      obstack_grow (&collect_obstack, "'", 1);
++      first_time = FALSE;
++    }
++#endif
+   for (i = 0; (int) i < n_switches; i++)
+     {
+       const char *const *args;

+ 25 - 0
recipes-devtools/gcc/gcc/0006-testsuite-Add-ilp32-to-g-.dg-warn-Warray-bounds-20.C.patch

@@ -0,0 +1,25 @@
+From 5964b5cd72721186ea2195a7be8d40cfe6554023 Mon Sep 17 00:00:00 2001
+From: Kito Cheng <kito.cheng@sifive.com>
+Date: Wed, 23 Jun 2021 11:14:27 +0800
+Subject: [PATCH 06/15] testsuite: Add !ilp32 to g++.dg/warn/Warray-bounds-20.C
+
+---
+ gcc/testsuite/g++.dg/warn/Warray-bounds-20.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/testsuite/g++.dg/warn/Warray-bounds-20.C b/gcc/testsuite/g++.dg/warn/Warray-bounds-20.C
+index e142ea16787..ab42ede0340 100644
+--- a/gcc/testsuite/g++.dg/warn/Warray-bounds-20.C
++++ b/gcc/testsuite/g++.dg/warn/Warray-bounds-20.C
+@@ -27,7 +27,7 @@ struct D1: virtual B, virtual C
+      to the opening brace.  */
+   D1 ()
+   {                           // { dg-warning "\\\[-Warray-bounds" "brace" }
+-    ci = 0;                   // { dg-warning "\\\[-Warray-bounds" "assign" { xfail *-*-* } }
++    ci = 0;                   // { dg-warning "\\\[-Warray-bounds" "assign" { xfail { ! ilp32 } } }
+   }
+ };
+ 
+-- 
+2.33.1
+

+ 92 - 0
recipes-devtools/gcc/gcc/0007-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch

@@ -0,0 +1,92 @@
+From e64342df647829d3e1c52fd480a5be7c1281ced0 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:17:25 +0400
+Subject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}
+
+Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
+the source can be shared between gcc-cross-initial,
+gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+While compiling gcc-crosssdk-initial-x86_64 on some host, there is
+occasionally failure that test the existance of default.h doesn't
+work, the reason is tm_include_list='** defaults.h' rather than
+tm_include_list='** ./defaults.h'
+
+So we add the test condition for this situation.
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ gcc/Makefile.in  | 2 +-
+ gcc/configure    | 4 ++--
+ gcc/configure.ac | 4 ++--
+ gcc/mkconfig.sh  | 4 ++--
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 8a5fb3fd99c..7da6f439fff 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -552,7 +552,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
+ TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
+ 
+ xmake_file=@xmake_file@
+-tmake_file=@tmake_file@
++tmake_file=@tmake_file@ ./t-oe
+ TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@
+ TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
+ TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
+diff --git a/gcc/configure b/gcc/configure
+index 3f0734bff11..c5d3bc4ee2d 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -13090,8 +13090,8 @@ for f in $tm_file; do
+        tm_include_list="${tm_include_list} $f"
+        ;;
+     defaults.h )
+-       tm_file_list="${tm_file_list} \$(srcdir)/$f"
+-       tm_include_list="${tm_include_list} $f"
++       tm_file_list="${tm_file_list} ./$f"
++       tm_include_list="${tm_include_list} ./$f"
+        ;;
+     * )
+        tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 54e21764b3e..f83420326d6 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -2263,8 +2263,8 @@ for f in $tm_file; do
+        tm_include_list="${tm_include_list} $f"
+        ;;
+     defaults.h )
+-       tm_file_list="${tm_file_list} \$(srcdir)/$f"
+-       tm_include_list="${tm_include_list} $f"
++       tm_file_list="${tm_file_list} ./$f"
++       tm_include_list="${tm_include_list} ./$f"
+        ;;
+     * )
+        tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
+index c49acd8f7e4..a0a657bdbb9 100644
+--- a/gcc/mkconfig.sh
++++ b/gcc/mkconfig.sh
+@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then
+     if [ $# -ge 1 ]; then
+ 	echo '#ifdef IN_GCC' >> ${output}T
+ 	for file in "$@"; do
+-	    if test x"$file" = x"defaults.h"; then
++	    if test x"$file" = x"./defaults.h" -o x"$file" = x"defaults.h"; then
+ 		postpone_defaults_h="yes"
+ 	    else
+ 		echo "# include \"$file\"" >> ${output}T
+@@ -106,7 +106,7 @@ esac
+ 
+ # If we postponed including defaults.h, add the #include now.
+ if test x"$postpone_defaults_h" = x"yes"; then
+-    echo "# include \"defaults.h\"" >> ${output}T
++    echo "# include \"./defaults.h\"" >> ${output}T
+ fi
+ 
+ # Add multiple inclusion protection guard, part two.

+ 131 - 0
recipes-devtools/gcc/gcc/0007-merge-from-riscv-gcc-10.2.0-to-support-bitmanip.patch

@@ -0,0 +1,131 @@
+From 2441e7b302dc5f3805b61b3a675adb80de35fb4b Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Sat, 9 Oct 2021 10:41:17 +0800
+Subject: [PATCH 07/15] merge from riscv-gcc-10.2.0 to support bitmanip
+
+---
+ gcc/common/config/riscv/riscv-common.c | 32 ++++++++++++++++++++++++++
+ gcc/config/riscv/riscv-opts.h          | 22 ++++++++++++++++++
+ gcc/config/riscv/riscv.opt             |  5 ++++
+ 3 files changed, 59 insertions(+)
+
+diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c
+index 34b74e52a2d..c7b6158af4b 100644
+--- a/gcc/common/config/riscv/riscv-common.c
++++ b/gcc/common/config/riscv/riscv-common.c
+@@ -50,6 +50,16 @@ static const riscv_implied_info_t riscv_implied_info[] =
+   {"d", "f"},
+   {"f", "zicsr"},
+   {"d", "zicsr"},
++  {"b", "zbb"},
++  {"b", "zbs"},
++  {"b", "zba"},
++  {"b", "zbp"},
++  {"b", "zbe"},
++  {"b", "zbf"},
++  {"b", "zbc"},
++  {"b", "zbm"},
++  {"b", "zbr"},
++  {"b", "zbt"},
+   {NULL, NULL}
+ };
+ 
+@@ -101,6 +111,17 @@ static const struct riscv_ext_version riscv_ext_version_table[] =
+   {"zifencei", ISA_SPEC_CLASS_20191213, 2, 0},
+   {"zifencei", ISA_SPEC_CLASS_20190608, 2, 0},
+ 
++  {"b",   ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zba", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zbb", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zbc", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zbe", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zbf", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zbr", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zbm", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zbs", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zbt", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"zbp", ISA_SPEC_CLASS_NONE, 0, 93},
+   /* Terminate the list.  */
+   {NULL, ISA_SPEC_CLASS_NONE, 0, 0}
+ };
+@@ -900,10 +921,21 @@ static const riscv_ext_flag_table_t riscv_ext_flag_table[] =
+   {"f", &gcc_options::x_target_flags, MASK_HARD_FLOAT},
+   {"d", &gcc_options::x_target_flags, MASK_DOUBLE_FLOAT},
+   {"c", &gcc_options::x_target_flags, MASK_RVC},
++  {"b", &gcc_options::x_target_flags, MASK_BITMANIP},
+ 
+   {"zicsr",    &gcc_options::x_riscv_zi_subext, MASK_ZICSR},
+   {"zifencei", &gcc_options::x_riscv_zi_subext, MASK_ZIFENCEI},
+ 
++  {"zba", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBA},
++  {"zbb", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBB},
++  {"zbs", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBS},
++  {"zbp", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBP},
++  {"zbr", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBR},
++  {"zbe", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBE},
++  {"zbf", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBF},
++  {"zbc", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBC},
++  {"zbm", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBM},
++  {"zbt", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBT},
+   {NULL, NULL, 0}
+ };
+ 
+diff --git a/gcc/config/riscv/riscv-opts.h b/gcc/config/riscv/riscv-opts.h
+index f4cf6ca4b82..ca3190b6414 100644
+--- a/gcc/config/riscv/riscv-opts.h
++++ b/gcc/config/riscv/riscv-opts.h
+@@ -67,6 +67,28 @@ enum stack_protector_guard {
+   SSP_GLOBAL			/* global canary */
+ };
+ 
++#define MASK_ZBA (1 << 0)
++#define MASK_ZBB (1 << 1)
++#define MASK_ZBS (1 << 2)
++#define MASK_ZBP (1 << 3)
++#define MASK_ZBE (1 << 4)
++#define MASK_ZBF (1 << 5)
++#define MASK_ZBC (1 << 6)
++#define MASK_ZBR (1 << 7)
++#define MASK_ZBM (1 << 8)
++#define MASK_ZBT (1 << 9)
++
++#define TARGET_ZBA ((riscv_bitmanip_subext & MASK_ZBA) != 0)
++#define TARGET_ZBB ((riscv_bitmanip_subext & MASK_ZBB) != 0)
++#define TARGET_ZBS ((riscv_bitmanip_subext & MASK_ZBS) != 0)
++#define TARGET_ZBP ((riscv_bitmanip_subext & MASK_ZBP) != 0)
++#define TARGET_ZBE ((riscv_bitmanip_subext & MASK_ZBE) != 0)
++#define TARGET_ZBF ((riscv_bitmanip_subext & MASK_ZBF) != 0)
++#define TARGET_ZBC ((riscv_bitmanip_subext & MASK_ZBC) != 0)
++#define TARGET_ZBR ((riscv_bitmanip_subext & MASK_ZBR) != 0)
++#define TARGET_ZBM ((riscv_bitmanip_subext & MASK_ZBM) != 0)
++#define TARGET_ZBT ((riscv_bitmanip_subext & MASK_ZBT) != 0)
++
+ #define MASK_ZICSR    (1 << 0)
+ #define MASK_ZIFENCEI (1 << 1)
+ 
+diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt
+index e294e223151..0e73e2ab758 100644
+--- a/gcc/config/riscv/riscv.opt
++++ b/gcc/config/riscv/riscv.opt
+@@ -136,6 +136,8 @@ Mask(64BIT)
+ 
+ Mask(MUL)
+ 
++Mask(BITMANIP)
++
+ Mask(ATOMIC)
+ 
+ Mask(HARD_FLOAT)
+@@ -195,6 +197,9 @@ long riscv_stack_protector_guard_offset = 0
+ TargetVariable
+ int riscv_zi_subext
+ 
++TargetVariable
++int riscv_bitmanip_subext
++
+ Enum
+ Name(isa_spec_class) Type(enum riscv_isa_spec_class)
+ Supported ISA specs (for use with the -misa-spec= option):
+-- 
+2.33.1
+

+ 43 - 0
recipes-devtools/gcc/gcc/0008-fortran-cross-compile-hack.patch

@@ -0,0 +1,43 @@
+From 904d102e3ccb93296b16ceb2e283a6ccf3c1d718 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:20:01 +0400
+Subject: [PATCH] fortran cross-compile hack.
+
+* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
+used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
+directory.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Inappropriate [embedded specific]
+---
+ libgfortran/configure    | 2 +-
+ libgfortran/configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgfortran/configure b/libgfortran/configure
+index f3634389cf8..f974e874b8e 100755
+--- a/libgfortran/configure
++++ b/libgfortran/configure
+@@ -13102,7 +13102,7 @@ esac
+ 
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ ac_ext=${ac_fc_srcext-f}
+ ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
+ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
+diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
+index 8961e314d82..49c8221cb6b 100644
+--- a/libgfortran/configure.ac
++++ b/libgfortran/configure.ac
+@@ -271,7 +271,7 @@ AC_SUBST(enable_static)
+ 
+ # We need gfortran to compile parts of the library
+ #AC_PROG_FC(gfortran)
+-FC="$GFORTRAN"
++#FC="$GFORTRAN"
+ AC_PROG_FC(gfortran)
+ 
+ # extra LD Flags which are required for targets

+ 1542 - 0
recipes-devtools/gcc/gcc/0008-merge-from-riscv-gcc-10.2.0-to-support-bitmanip.patch

@@ -0,0 +1,1542 @@
+From 461f89263df4d8c27a2a99a9e0561e016e2752c6 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Sat, 9 Oct 2021 10:43:19 +0800
+Subject: [PATCH 08/15] merge from riscv-gcc-10.2.0 to support bitmanip
+
+---
+ gcc/config/riscv/bitmanip.md |  482 ++++++++++++++++
+ gcc/config/riscv/rvintrin.h  | 1033 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 1515 insertions(+)
+ create mode 100644 gcc/config/riscv/bitmanip.md
+ create mode 100644 gcc/config/riscv/rvintrin.h
+
+diff --git a/gcc/config/riscv/bitmanip.md b/gcc/config/riscv/bitmanip.md
+new file mode 100644
+index 00000000000..6653219c3f0
+--- /dev/null
++++ b/gcc/config/riscv/bitmanip.md
+@@ -0,0 +1,482 @@
++;; Machine description for RISC-V Bit Manipulation operations.
++;; Copyright (C) 2019 Free Software Foundation, Inc.
++
++;; This file is part of GCC.
++
++;; GCC is free software; you can redistribute it and/or modify
++;; it under the terms of the GNU General Public License as published by
++;; the Free Software Foundation; either version 3, or (at your option)
++;; any later version.
++
++;; GCC is distributed in the hope that it will be useful,
++;; but WITHOUT ANY WARRANTY; without even the implied warranty of
++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++;; GNU General Public License for more details.
++
++;; You should have received a copy of the GNU General Public License
++;; along with GCC; see the file COPYING3.  If not see
++;; <http://www.gnu.org/licenses/>.
++
++(define_code_iterator bitmanip_bitwise [and ior])
++
++(define_code_iterator any_minmax [smin smax umin umax])
++
++(define_code_iterator clz_ctz_pcnt [clz ctz popcount])
++
++(define_code_attr bitmanip_optab [(smin "smin")
++				  (smax "smax")
++				  (umin "umin")
++				  (umax "umax")
++				  (clz "clz")
++				  (ctz "ctz")
++				  (popcount "popcount")])
++
++(define_code_attr bitmanip_insn [(smin "min")
++				 (smax "max")
++				 (umin "minu")
++				 (umax "maxu")
++				 (clz "clz")
++				 (ctz "ctz")
++				 (popcount "cpop")])
++
++(define_mode_attr shiftm1 [(SI "const31_operand") (DI "const63_operand")])
++
++(define_insn "<bitmanip_optab>si2"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(clz_ctz_pcnt:SI (match_operand:SI 1 "register_operand" "r")))]
++  "TARGET_ZBB"
++  { return TARGET_64BIT ? "<bitmanip_insn>w\t%0,%1" : "<bitmanip_insn>\t%0,%1"; }
++  [(set_attr "type" "bitmanip")])
++
++;; TODO: In theory zero_extend should be OK to combine too, since the output
++;;       range is 0 ~ 32, zero_extend or sign_extend will get same result.
++(define_insn "*<bitmanip_optab>disi2"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(sign_extend:DI
++	  (clz_ctz_pcnt:SI (match_operand:SI 1 "register_operand" "r"))))]
++  "TARGET_64BIT && TARGET_ZBB"
++  "<bitmanip_insn>w\t%0,%1"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "<bitmanip_optab>di2"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(clz_ctz_pcnt:DI (match_operand:DI 1 "register_operand" "r")))]
++  "TARGET_64BIT && TARGET_ZBB"
++  "<bitmanip_insn>\t%0,%1"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*<optab>_not<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(bitmanip_bitwise:X (not:X (match_operand:X 1 "register_operand" "r"))
++			    (match_operand:X 2 "register_operand" "r")))]
++  "TARGET_ZBB || TARGET_ZBP"
++  "<insn>n\t%0,%2,%1"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*xor_not<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(not:X (xor:X (match_operand:X 1 "register_operand" "r")
++		      (match_operand:X 2 "register_operand" "r"))))]
++  "TARGET_ZBB || TARGET_ZBP"
++  "xnor\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++ 
++;;; ??? pack
++
++(define_insn "*zero_extendhi<GPR:mode>2_bitmanip"
++  [(set (match_operand:GPR 0 "register_operand" "=r,r")
++	(zero_extend:GPR (match_operand:HI 1 "nonimmediate_operand" "r,m")))]
++  "TARGET_ZBB || TARGET_ZBP"
++  "@
++   zext.h\t%0,%1
++   lhu\t%0,%1"
++  [(set_attr "type" "bitmanip,load")])
++
++(define_insn "*zero_extendsidi2_bitmanip"
++  [(set (match_operand:DI 0 "register_operand" "=r,r")
++	(zero_extend:DI (match_operand:SI 1 "nonimmediate_operand" "r,m")))]
++  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBA)"
++  "@
++   zext.w\t%0,%1
++   lwu\t%0,%1"
++  [(set_attr "type" "bitmanip,load")])
++
++(define_insn "<bitmanip_optab><mode>3"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(any_minmax:X (match_operand:X 1 "register_operand" "r")
++		      (match_operand:X 2 "register_operand" "r")))]
++  "TARGET_ZBB"
++  "<bitmanip_insn>\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bset<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(ior:X (ashift:X (const_int 1)
++			 (match_operand:QI 2 "register_operand" "r"))
++	       (match_operand:X 1 "register_operand" "r")))]
++  "TARGET_ZBS"
++  "bset\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bset<mode>_mask"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(ior:X (ashift:X (const_int 1)
++			 (subreg:QI
++			  (and:X (match_operand:X 2 "register_operand" "r")
++				 (match_operand 3 "<X:shiftm1>" "i")) 0))
++	       (match_operand:X 1 "register_operand" "r")))]
++  "TARGET_ZBS"
++  "bset\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bset<mode>_1"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(ashift:X (const_int 1)
++		  (match_operand:QI 1 "register_operand" "r")))]
++  "TARGET_ZBS"
++  "bset\t%0,x0,%1"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bset<mode>_1_mask"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(ashift:X (const_int 1)
++		  (subreg:QI
++		   (and:X (match_operand:X 1 "register_operand" "r")
++			  (match_operand 2 "<X:shiftm1>" "i")) 0)))]
++  "TARGET_ZBS"
++  "bset\t%0,x0,%1"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bseti<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(ior:X (match_operand:X 1 "register_operand" "r")
++	       (match_operand 2 "single_bit_mask_operand" "i")))]
++  "TARGET_ZBS"
++  "bseti\t%0,%1,%S2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bsetw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(sign_extend:DI
++	 (subreg:SI
++	  (ior:DI (subreg:DI
++		   (ashift:SI (const_int 1)
++			      (match_operand:QI 2 "register_operand" "r")) 0)
++		  (match_operand:DI 1 "register_operand" "r")) 0)))]
++  "TARGET_64BIT && TARGET_ZBS"
++  "bsetw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bsetw_mask"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(sign_extend:DI
++	 (subreg:SI
++	  (ior:DI (subreg:DI
++		   (ashift:SI
++		    (const_int 1)
++		    (subreg:QI
++		     (and:DI (match_operand:DI 2 "register_operand" "r")
++			     (match_operand 3 "const31_operand" "i")) 0)) 0)
++		  (match_operand:DI 1 "register_operand" "r")) 0)))]
++  "TARGET_64BIT && TARGET_ZBS"
++  "bsetw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bsetiw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(ior:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
++		(match_operand 2 "single_bit_mask_operand" "i")))]
++  "TARGET_64BIT && TARGET_ZBS"
++  "bsetiw\t%0,%1,%S2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bclr<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(and:X (rotate:X (const_int -2)
++			 (match_operand:QI 2 "register_operand" "r"))
++	       (match_operand:X 1 "register_operand" "r")))]
++  "TARGET_ZBS"
++  "bclr\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bclri<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(and:X (match_operand:X 1 "register_operand" "r")
++	       (match_operand 2 "not_single_bit_mask_operand" "i")))]
++  "TARGET_ZBS"
++  "bclri\t%0,%1,%T2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bclrw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(sign_extend:DI
++	 (subreg:SI
++	  (and:DI
++	   (not:DI (subreg:DI
++		    (ashift:SI (const_int 1)
++			       (match_operand:QI 2 "register_operand" "r")) 0))
++	   (match_operand:DI 1 "register_operand" "r")) 0)))]
++  "TARGET_64BIT && TARGET_ZBS"
++  "bclrw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bclriw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(and:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
++		(match_operand 2 "not_single_bit_mask_operand" "i")))]
++  "TARGET_64BIT && TARGET_ZBS"
++  "bclriw\t%0,%1,%T2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*binv<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(xor:X (ashift:X (const_int 1)
++			 (match_operand:QI 2 "register_operand" "r"))
++	       (match_operand:X 1 "register_operand" "r")))]
++  "TARGET_ZBS"
++  "binv\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*binvi<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(xor:X (match_operand:X 1 "register_operand" "r")
++	       (match_operand 2 "single_bit_mask_operand" "i")))]
++  "TARGET_ZBS"
++  "binvi\t%0,%1,%S2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*binvw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(sign_extend:DI
++	 (subreg:SI
++	  (xor:DI (subreg:DI
++		   (ashift:SI (const_int 1)
++			      (match_operand:QI 2 "register_operand" "r")) 0)
++		  (match_operand:DI 1 "register_operand" "r")) 0)))]
++  "TARGET_64BIT && TARGET_ZBS"
++  "binvw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*binviw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(xor:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
++		(match_operand 2 "single_bit_mask_operand" "i")))]
++  "TARGET_64BIT && TARGET_ZBS"
++  "binviw\t%0,%1,%S2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bext<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(zero_extract:X (match_operand:X 1 "register_operand" "r")
++			(const_int 1)
++			(zero_extend:X
++			 (match_operand:QI 2 "register_operand" "r"))))]
++  "TARGET_ZBS"
++  "bext\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bexti"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(zero_extract:X (match_operand:X 1 "register_operand" "r")
++			(const_int 1)
++			(match_operand 2 "immediate_operand" "i")))]
++  "TARGET_ZBS"
++  "bexti\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*bextw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(and:DI
++	 (subreg:DI
++	  (lshiftrt:SI (match_operand:SI 1 "register_operand" "r")
++		       (match_operand:QI 2 "register_operand" "r")) 0)
++	 (const_int 1)))]
++  "TARGET_64BIT && TARGET_ZBS"
++  "bextw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++;;; ??? s[lr]o*
++
++(define_insn "rotrsi3"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(rotatert:SI (match_operand:SI 1 "register_operand" "r")
++		     (match_operand:QI 2 "arith_operand" "rI")))]
++  "TARGET_ZBB || TARGET_ZBP"
++  { return TARGET_64BIT ? "ror%i2w\t%0,%1,%2" : "ror%i2\t%0,%1,%2"; }
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "rotrdi3"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(rotatert:DI (match_operand:DI 1 "register_operand" "r")
++		     (match_operand:QI 2 "arith_operand" "rI")))]
++  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++  "ror%i2\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_expand "riscv_rolw"
++  [(match_operand:SI 0 "register_operand" "=r")
++   (match_operand:SI 1 "register_operand" "r")
++   (match_operand:SI 2 "register_operand" "r")]
++  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++{
++  emit_insn (gen_rotlsi3 (operands[0], operands[1], operands[2]));
++  DONE;
++})
++
++(define_insn "rotlsi3"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(rotate:SI (match_operand:SI 1 "register_operand" "r")
++		   (match_operand:QI 2 "register_operand" "r")))]
++  "TARGET_ZBB || TARGET_ZBP"
++  { return TARGET_64BIT ? "rolw\t%0,%1,%2" : "rol\t%0,%1,%2"; }
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "rotldi3"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(rotate:DI (match_operand:DI 1 "register_operand" "r")
++		   (match_operand:QI 2 "register_operand" "r")))]
++  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++  "rol\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "rotlsi3_sext"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(sign_extend:DI (rotate:SI (match_operand:SI 1 "register_operand" "r")
++				   (match_operand:QI 2 "register_operand" "r"))))]
++  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++  "rolw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++;;; ??? grev
++
++(define_insn "bswapsi2"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++        (bswap:SI (match_operand:SI 1 "register_operand" "r")))]
++  "TARGET_ZBB || TARGET_ZBP"
++{
++  if (TARGET_64BIT)
++    return TARGET_ZBB ? "rev8\t%0,%1\n\tsrai\t%0,%0,32" : "rev8.w\t%0,%1";
++  else
++    return "rev8\t%0,%1";
++}
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "bswapdi2"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(bswap:DI (match_operand:DI 1 "register_operand" "r")))]
++  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++  "rev8\t%0,%1"
++  [(set_attr "type" "bitmanip")])
++
++;;; ??? shfl/unshfl
++
++;;; ??? bext/bdep
++
++;;; ??? clmul
++
++;;; ??? crc
++
++;;; ??? bmat
++
++(define_insn "*cmix"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(xor:X (and:X (xor:X (match_operand:X 1 "register_operand" "r")
++			     (match_operand:X 3 "register_operand" "r"))
++		      (match_operand:X 2 "register_operand" "r"))
++	       (match_dup 3)))]
++  "TARGET_ZBT"
++  "cmix\t%0,%2,%1,%3"
++  [(set_attr "type" "bitmanip")])
++
++;; ??? Can we do this by using the % communtative constraint?
++
++(define_insn "*cmix2"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(xor:X (and:X (xor:X (match_operand:X 1 "register_operand" "r")
++			     (match_operand:X 3 "register_operand" "r"))
++		      (match_operand:X 2 "register_operand" "r"))
++	       (match_dup 1)))]
++  "TARGET_ZBT"
++  "cmix\t%0,%2,%3,%1"
++  [(set_attr "type" "bitmanip")])
++
++;;; ??? cmov
++
++(define_insn "*mov<X:mode>cc_ne_bitmanip"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(if_then_else:X
++	 (ne (match_operand:X 1 "register_operand" "r") (const_int 0))
++	 (match_operand:X 2 "register_operand" "r")
++	 (match_operand:X 3 "register_operand" "r")))]
++  "TARGET_ZBT"
++  "cmov\t%0,%1,%2,%3"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*mov<X:mode>cc_eq_bitmanip"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(if_then_else:X
++	 (eq (match_operand:X 1 "register_operand" "r") (const_int 0))
++	 (match_operand:X 2 "register_operand" "r")
++	 (match_operand:X 3 "register_operand" "r")))]
++  "TARGET_ZBT"
++  "cmov\t%0,%1,%3,%2"
++  [(set_attr "type" "bitmanip")])
++
++;;; ??? fs[lr]
++
++(define_insn "*shNadd"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(plus:X (ashift:X (match_operand:X 1 "register_operand" "r")
++			  (match_operand:QI 2 "immediate_operand" "I"))
++		(match_operand:X 3 "register_operand" "r")))]
++  "TARGET_ZBA
++   && (INTVAL (operands[2]) >= 1) && (INTVAL (operands[2]) <= 3)"
++  "sh%2add\t%0,%1,%3"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*shNadduw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(plus:DI
++	 (and:DI (ashift:DI (match_operand:DI 1 "register_operand" "r")
++			    (match_operand:QI 2 "immediate_operand" "I"))
++		 (match_operand 3 "immediate_operand" ""))
++	 (match_operand:DI 4 "register_operand" "r")))]
++  "TARGET_64BIT && TARGET_ZBA
++   && (INTVAL (operands[2]) >= 1) && (INTVAL (operands[2]) <= 3)
++   && (INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff"
++  "sh%2add.uw\t%0,%1,%4"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*add.uw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(plus:DI (zero_extend:DI
++		  (match_operand:SI 1 "register_operand" "r"))
++		 (match_operand:DI 2 "register_operand" "r")))]
++  "TARGET_64BIT && TARGET_ZBA"
++  "add.uw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "*slliuw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(and:DI (ashift:DI (match_operand:DI 1 "register_operand" "r")
++			   (match_operand:QI 2 "immediate_operand" "I"))
++		(match_operand 3 "immediate_operand" "")))]
++  "TARGET_64BIT && TARGET_ZBA
++   && (INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff"
++  "slli.uw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++;; ??? bfxp
++
++;; sext
++
++(define_insn "*extend<SHORT:mode><SUPERQI:mode>2_bitmanip"
++  [(set (match_operand:SUPERQI 0 "register_operand" "=r,r")
++	(sign_extend:SUPERQI
++	    (match_operand:SHORT 1 "nonimmediate_operand" " r,m")))]
++  "TARGET_ZBB"
++  "@
++   sext.<SHORT:size>\t%0,%1
++   l<SHORT:size>\t%0,%1"
++  [(set_attr "type" "bitmanip")
++   (set_attr "length" "4")])
+diff --git a/gcc/config/riscv/rvintrin.h b/gcc/config/riscv/rvintrin.h
+new file mode 100644
+index 00000000000..0f6bfef3ff4
+--- /dev/null
++++ b/gcc/config/riscv/rvintrin.h
+@@ -0,0 +1,1033 @@
++/*
++ *  RISC-V "B" extension proposal intrinsics and emulation
++ *
++ *  Copyright (C) 2019  Clifford Wolf <clifford@clifford.at>
++ *
++ *  Permission to use, copy, modify, and/or distribute this software for any
++ *  purpose with or without fee is hereby granted, provided that the above
++ *  copyright notice and this permission notice appear in all copies.
++ *
++ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ *  ----------------------------------------------------------------------
++ *
++ *  Define RVINTRIN_EMULATE to enable emulation mode.
++ *
++ *  This header defines C inline functions with "mockup intrinsics" for
++ *  RISC-V "B" extension proposal instructions.
++ *
++ *  _rv_*(...)
++ *    RV32/64 intrinsics that operate on the "long" data type
++ *
++ *  _rv32_*(...)
++ *    RV32/64 intrinsics that operate on the "int32_t" data type
++ *
++ *  _rv64_*(...)
++ *    RV64-only intrinsics that operate on the "int64_t" data type
++ *
++ */
++
++#ifndef RVINTRIN_H
++#define RVINTRIN_H
++
++#include <limits.h>
++#include <stdint.h>
++
++#if !defined(__riscv_xlen) && !defined(RVINTRIN_EMULATE)
++#  warning "Target is not RISC-V. Enabling <rvintrin.h> emulation mode."
++#  define RVINTRIN_EMULATE 1
++#endif
++
++#ifndef RVINTRIN_EMULATE
++
++#if __riscv_xlen == 32
++#  define RVINTRIN_RV32
++#endif
++
++#if __riscv_xlen == 64
++#  define RVINTRIN_RV64
++#endif
++
++#ifdef RVINTRIN_RV32
++static inline int32_t _rv32_clz   (int32_t rs1) { int32_t rd; __asm__ ("clz     %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv32_ctz   (int32_t rs1) { int32_t rd; __asm__ ("ctz     %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv32_pcnt  (int32_t rs1) { int32_t rd; __asm__ ("pcnt    %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv32_sext_b(int32_t rs1) { int32_t rd; __asm__ ("sext.b  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv32_sext_h(int32_t rs1) { int32_t rd; __asm__ ("sext.h  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV64
++static inline int32_t _rv32_clz   (int32_t rs1) { int32_t rd; __asm__ ("clzw    %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv32_ctz   (int32_t rs1) { int32_t rd; __asm__ ("ctzw    %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv32_pcnt  (int32_t rs1) { int32_t rd; __asm__ ("pcntw   %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv32_sext_b(int32_t rs1) { int32_t rd; __asm__ ("sext.b  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv32_sext_h(int32_t rs1) { int32_t rd; __asm__ ("sext.h  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++
++static inline int64_t _rv64_clz   (int64_t rs1) { int64_t rd; __asm__ ("clz     %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int64_t _rv64_ctz   (int64_t rs1) { int64_t rd; __asm__ ("ctz     %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int64_t _rv64_pcnt  (int64_t rs1) { int64_t rd; __asm__ ("pcnt    %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv64_sext_b(int32_t rs1) { int32_t rd; __asm__ ("sext.b  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int32_t _rv64_sext_h(int32_t rs1) { int32_t rd; __asm__ ("sext.h  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV32
++static inline int32_t _rv32_pack (int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("pack  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_packu(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("packu %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_packh(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("packh %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_bfp  (int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("bfp   %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV64
++static inline int32_t _rv32_pack (int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("packw  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_packu(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("packuw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_packh(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("packh  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_bfp  (int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("bfpw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++
++static inline int64_t _rv64_pack (int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("pack  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_packu(int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("packu %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_packh(int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("packh %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_bfp  (int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("bfp   %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++static inline int32_t _rv32_min (int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("min  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_minu(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("minu %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_max (int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("max  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_maxu(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("maxu %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++
++#ifdef RVINTRIN_RV64
++static inline int64_t _rv64_min (int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("min  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_minu(int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("minu %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_max (int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("max  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_maxu(int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("maxu %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV32
++static inline int32_t _rv32_bset (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("bseti %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & rs2)); else __asm__ ("bset %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_bclr (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("bclri %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & rs2)); else __asm__ ("bclr %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_binv (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("binvi %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & rs2)); else __asm__ ("binv %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_bext (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("bexti %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & rs2)); else __asm__ ("bext %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV64
++static inline int32_t _rv32_bset (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("bsetiw %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & rs2)); else __asm__ ("bsetw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_bclr (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("bclriw %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & rs2)); else __asm__ ("bclrw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_binv (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("binviw %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & rs2)); else __asm__ ("binvw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_bext (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("bexti  %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & rs2)); else __asm__ ("bextw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++
++static inline int64_t _rv64_bset (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("bseti %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 & rs2)); else __asm__ ("bset %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_bclr (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("bclri %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 & rs2)); else __asm__ ("bclr %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_binv (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("binvi %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 & rs2)); else __asm__ ("binv %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_bext (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("bexti %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 & rs2)); else __asm__ ("bext %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV32
++static inline int32_t _rv32_sll    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("slli    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("sll     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_srl    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("srli    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("srl     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_sra    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("srai    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("sra     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_slo    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("sloi    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("slo     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_sro    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("sroi    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("sro     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_rol    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("rori    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & -rs2)); else __asm__ ("rol     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_ror    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("rori    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("ror     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_grev   (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("grevi   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("grev    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_gorc   (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("gorci   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("gorc    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_shfl   (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("shfli   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(15 &  rs2)); else __asm__ ("shfl    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_unshfl (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("unshfli %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(15 &  rs2)); else __asm__ ("unshfl  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV64
++static inline int32_t _rv32_sll    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("slliw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("sllw    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_srl    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("srliw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("srlw    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_sra    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("sraiw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("sraw    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_slo    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("sloiw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("slow    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_sro    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("sroiw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("srow    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_rol    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("roriw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 & -rs2)); else __asm__ ("rolw    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_ror    (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("roriw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("rorw    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_grev   (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("greviw  %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("grevw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_gorc   (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("gorciw  %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("gorcw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_shfl   (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("shfli   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(15 &  rs2)); else __asm__ ("shflw   %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_unshfl (int32_t rs1, int32_t rs2) { int32_t rd; if (__builtin_constant_p(rs2)) __asm__ ("unshfli %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(15 &  rs2)); else __asm__ ("unshflw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++
++static inline int64_t _rv64_sll    (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("slli    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 &  rs2)); else __asm__ ("sll     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_srl    (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("srli    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 &  rs2)); else __asm__ ("srl     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_sra    (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("srai    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 &  rs2)); else __asm__ ("sra     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_slo    (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("sloi    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 &  rs2)); else __asm__ ("slo     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_sro    (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("sroi    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 &  rs2)); else __asm__ ("sro     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_rol    (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("rori    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 & -rs2)); else __asm__ ("rol     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_ror    (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("rori    %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 &  rs2)); else __asm__ ("ror     %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_grev   (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("grevi   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 &  rs2)); else __asm__ ("grev    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_gorc   (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("gorci   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(63 &  rs2)); else __asm__ ("gorc    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_shfl   (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("shfli   %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("shfl    %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_unshfl (int64_t rs1, int64_t rs2) { int64_t rd; if (__builtin_constant_p(rs2)) __asm__ ("unshfli %0, %1, %2" : "=r"(rd) : "r"(rs1), "i"(31 &  rs2)); else __asm__ ("unshfl  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV32
++static inline int32_t _rv32_bext(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("bext  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_bdep(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("bdep  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV64
++static inline int32_t _rv32_bext(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("bextw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_bdep(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("bdepw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++
++static inline int64_t _rv64_bext(int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("bext  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_bdep(int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("bdep  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV32
++static inline int32_t _rv32_clmul (int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("clmul   %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_clmulh(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("clmulh  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_clmulr(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("clmulr  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV64
++static inline int32_t _rv32_clmul (int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("clmulw  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_clmulh(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("clmulhw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int32_t _rv32_clmulr(int32_t rs1, int32_t rs2) { int32_t rd; __asm__ ("clmulrw %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++
++static inline int64_t _rv64_clmul (int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("clmul   %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_clmulh(int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("clmulh  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_clmulr(int64_t rs1, int64_t rs2) { int64_t rd; __asm__ ("clmulr  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++static inline long _rv_crc32_b (long rs1) { long rd; __asm__ ("crc32.b  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline long _rv_crc32_h (long rs1) { long rd; __asm__ ("crc32.h  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline long _rv_crc32_w (long rs1) { long rd; __asm__ ("crc32.w  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++
++static inline long _rv_crc32c_b(long rs1) { long rd; __asm__ ("crc32c.b %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline long _rv_crc32c_h(long rs1) { long rd; __asm__ ("crc32c.h %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline long _rv_crc32c_w(long rs1) { long rd; __asm__ ("crc32c.w %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++
++#ifdef RVINTRIN_RV64
++static inline long _rv_crc32_d (long rs1) { long rd; __asm__ ("crc32.d  %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline long _rv_crc32c_d(long rs1) { long rd; __asm__ ("crc32c.d %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++#endif
++
++#ifdef RVINTRIN_RV64
++static inline int64_t _rv64_bmatflip(int64_t rs1) { long rd; __asm__ ("bmatflip %0, %1" : "=r"(rd) : "r"(rs1)); return rd; }
++static inline int64_t _rv64_bmator  (int64_t rs1, int64_t rs2) { long rd; __asm__ ("bmator  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline int64_t _rv64_bmatxor (int64_t rs1, int64_t rs2) { long rd; __asm__ ("bmatxor %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++#endif
++
++static inline long _rv_cmix(long rs2, long rs1, long rs3) { long rd; __asm__ ("cmix %0, %1, %2, %3" : "=r"(rd) : "r"(rs2), "r"(rs1), "r"(rs3)); return rd; }
++static inline long _rv_cmov(long rs2, long rs1, long rs3) { long rd; __asm__ ("cmov %0, %1, %2, %3" : "=r"(rd) : "r"(rs2), "r"(rs1), "r"(rs3)); return rd; }
++
++#ifdef RVINTRIN_RV32
++static inline int32_t _rv32_fsl(int32_t rs1, int32_t rs3, int32_t rs2)
++{
++	int32_t rd;
++	if (__builtin_constant_p(rs2)) {
++		rs2 &= 63;
++		if (rs2 < 32)
++			__asm__ ("fsli  %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "i"(rs2));
++		else
++			__asm__ ("fsli  %0, %1, %2, %3" : "=r"(rd) : "r"(rs3), "r"(rs1), "i"(rs2 & 31));
++	} else {
++		__asm__ ("fsl  %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "r"(rs2));
++	}
++	return rd;
++}
++
++static inline int32_t _rv32_fsr(int32_t rs1, int32_t rs3, int32_t rs2)
++{
++	int32_t rd;
++	if (__builtin_constant_p(rs2)) {
++		rs2 &= 63;
++		if (rs2 < 32)
++			__asm__ ("fsri  %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "i"(rs2));
++		else
++			__asm__ ("fsri  %0, %1, %2, %3" : "=r"(rd) : "r"(rs3), "r"(rs1), "i"(rs2 & 31));
++	} else {
++		__asm__ ("fsr  %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "r"(rs2));
++	}
++	return rd;
++}
++#endif
++
++#ifdef RVINTRIN_RV64
++static inline int32_t _rv32_fsl(int32_t rs1, int32_t rs3, int32_t rs2)
++{
++	int32_t rd;
++	if (__builtin_constant_p(rs2)) {
++		rs2 &= 63;
++		if (rs2 < 32)
++			__asm__ ("fsliw %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "i"(rs2));
++		else
++			__asm__ ("fsliw %0, %1, %2, %3" : "=r"(rd) : "r"(rs3), "r"(rs1), "i"(rs2 & 31));
++	} else {
++		__asm__ ("fslw %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "r"(rs2));
++	}
++	return rd;
++}
++
++static inline int32_t _rv32_fsr(int32_t rs1, int32_t rs3, int32_t rs2)
++{
++	int32_t rd;
++	if (__builtin_constant_p(rs2)) {
++		rs2 &= 63;
++		if (rs2 < 32)
++			__asm__ ("fsriw %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "i"(rs2));
++		else
++			__asm__ ("fsriw %0, %1, %2, %3" : "=r"(rd) : "r"(rs3), "r"(rs1), "i"(rs2 & 31));
++	} else {
++		__asm__ ("fsrw %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "r"(rs2));
++	}
++	return rd;
++}
++
++static inline int64_t _rv64_fsl(int64_t rs1, int64_t rs3, int64_t rs2)
++{
++	int64_t rd;
++	if (__builtin_constant_p(rs2)) {
++		rs2 &= 127;
++		if (rs2 < 64)
++			__asm__ ("fsli  %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "i"(rs2));
++		else
++			__asm__ ("fsli  %0, %1, %2, %3" : "=r"(rd) : "r"(rs3), "r"(rs1), "i"(rs2 & 63));
++	} else {
++		__asm__ ("fsl  %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "r"(rs2));
++	}
++	return rd;
++}
++
++static inline int64_t _rv64_fsr(int64_t rs1, int64_t rs3, int64_t rs2)
++{
++	int64_t rd;
++	if (__builtin_constant_p(rs2)) {
++		rs2 &= 127;
++		if (rs2 < 64)
++			__asm__ ("fsri  %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "i"(rs2));
++		else
++			__asm__ ("fsri  %0, %1, %2, %3" : "=r"(rd) : "r"(rs3), "r"(rs1), "i"(rs2 & 63));
++	} else {
++		__asm__ ("fsr  %0, %1, %2, %3" : "=r"(rd) : "r"(rs1), "r"(rs3), "r"(rs2));
++	}
++	return rd;
++}
++#endif
++
++static inline long _rv_andn(long rs1, long rs2) { long rd; __asm__ ("andn %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline long _rv_orn (long rs1, long rs2) { long rd; __asm__ ("orn  %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++static inline long _rv_xnor(long rs1, long rs2) { long rd; __asm__ ("xnor %0, %1, %2" : "=r"(rd) : "r"(rs1), "r"(rs2)); return rd; }
++
++#else // RVINTRIN_EMULATE
++
++#if UINT_MAX != 0xffffffffU
++#  error "<rvintrin.h> emulation mode only supports systems with sizeof(int) = 4."
++#endif
++
++#if (ULLONG_MAX == 0xffffffffLLU) || (ULLONG_MAX != 0xffffffffffffffffLLU)
++#  error "<rvintrin.h> emulation mode only supports systems with sizeof(long long) = 8."
++#endif
++
++#if UINT_MAX == ULONG_MAX
++#  define RVINTRIN_RV32
++#else
++#  define RVINTRIN_RV64
++#endif
++
++#ifdef RVINTRIN_NOBUILTINS
++static inline int32_t _rv32_clz(int32_t rs1) { for (int i=0; i < 32; i++) { if (1 & (rs1 >> (31-i))) return i; } return 32; }
++static inline int64_t _rv64_clz(int64_t rs1) { for (int i=0; i < 64; i++) { if (1 & (rs1 >> (63-i))) return i; } return 64; }
++
++static inline int32_t _rv32_ctz(int32_t rs1) { for (int i=0; i < 32; i++) { if (1 & (rs1 >> i)) return i; } return 32; }
++static inline int64_t _rv64_ctz(int64_t rs1) { for (int i=0; i < 64; i++) { if (1 & (rs1 >> i)) return i; } return 64; }
++
++static inline int32_t _rv32_pcnt(int32_t rs1) { int k=0; for (int i=0; i < 32; i++) { if (1 & (rs1 >> i)) k++; } return k; }
++static inline int64_t _rv64_pcnt(int64_t rs1) { int k=0; for (int i=0; i < 64; i++) { if (1 & (rs1 >> i)) k++; } return k; }
++#else
++static inline int32_t _rv32_clz(int32_t rs1) { return rs1 ? __builtin_clz(rs1)   : 32; }
++static inline int64_t _rv64_clz(int64_t rs1) { return rs1 ? __builtin_clzll(rs1) : 64; }
++
++static inline int32_t _rv32_ctz(int32_t rs1) { return rs1 ? __builtin_ctz(rs1)   : 32; }
++static inline int64_t _rv64_ctz(int64_t rs1) { return rs1 ? __builtin_ctzll(rs1) : 64; }
++
++static inline int32_t _rv32_pcnt(int32_t rs1) { return __builtin_popcount(rs1);   }
++static inline int64_t _rv64_pcnt(int64_t rs1) { return __builtin_popcountll(rs1); }
++#endif
++
++static inline int32_t _rv32_sext_b(int32_t rs1) { return rs1 << (32-8) >> (32-8); }
++static inline int64_t _rv64_sext_b(int64_t rs1) { return rs1 << (64-8) >> (64-8); }
++
++static inline int32_t _rv32_sext_h(int32_t rs1) { return rs1 << (32-16) >> (32-16); }
++static inline int64_t _rv64_sext_h(int64_t rs1) { return rs1 << (64-16) >> (64-16); }
++
++static inline int32_t _rv32_pack(int32_t rs1, int32_t rs2) { return (rs1 & 0x0000ffff)   | (rs2 << 16); }
++static inline int64_t _rv64_pack(int64_t rs1, int64_t rs2) { return (rs1 & 0xffffffffLL) | (rs2 << 32); }
++
++static inline int32_t _rv32_packu(int32_t rs1, int32_t rs2) { return ((rs1 >> 16) & 0x0000ffff)   | (rs2 >> 16 << 16); }
++static inline int64_t _rv64_packu(int64_t rs1, int64_t rs2) { return ((rs1 >> 32) & 0xffffffffLL) | (rs2 >> 32 << 32); }
++
++static inline int32_t _rv32_packh(int32_t rs1, int32_t rs2) { return (rs1 & 0xff) | ((rs2 & 0xff) << 8); }
++static inline int64_t _rv64_packh(int64_t rs1, int64_t rs2) { return (rs1 & 0xff) | ((rs2 & 0xff) << 8); }
++
++static inline int32_t _rv32_min (int32_t rs1, int32_t rs2) { return rs1 < rs2 ? rs1 : rs2; }
++static inline int32_t _rv32_minu(int32_t rs1, int32_t rs2) { return (uint32_t)rs1 < (uint32_t)rs2 ? rs1 : rs2; }
++static inline int32_t _rv32_max (int32_t rs1, int32_t rs2) { return rs1 > rs2 ? rs1 : rs2; }
++static inline int32_t _rv32_maxu(int32_t rs1, int32_t rs2) { return (uint32_t)rs1 > (uint32_t)rs2 ? rs1 : rs2; }
++
++static inline int64_t _rv64_min (int64_t rs1, int64_t rs2) { return rs1 < rs2 ? rs1 : rs2; }
++static inline int64_t _rv64_minu(int64_t rs1, int64_t rs2) { return (uint64_t)rs1 < (uint64_t)rs2 ? rs1 : rs2; }
++static inline int64_t _rv64_max (int64_t rs1, int64_t rs2) { return rs1 > rs2 ? rs1 : rs2; }
++static inline int64_t _rv64_maxu(int64_t rs1, int64_t rs2) { return (uint64_t)rs1 > (uint64_t)rs2 ? rs1 : rs2; }
++
++static inline int32_t _rv32_bset (int32_t rs1, int32_t rs2) { return rs1 |  (1   << (rs2 & 31)); }
++static inline int32_t _rv32_bclr (int32_t rs1, int32_t rs2) { return rs1 & ~(1   << (rs2 & 31)); }
++static inline int32_t _rv32_binv (int32_t rs1, int32_t rs2) { return rs1 ^  (1   << (rs2 & 31)); }
++static inline int32_t _rv32_bext (int32_t rs1, int32_t rs2) { return 1   &  (rs1 >> (rs2 & 31)); }
++
++static inline int64_t _rv64_bset (int64_t rs1, int64_t rs2) { return rs1 |  (1LL << (rs2 & 63)); }
++static inline int64_t _rv64_bclr (int64_t rs1, int64_t rs2) { return rs1 & ~(1LL << (rs2 & 63)); }
++static inline int64_t _rv64_binv (int64_t rs1, int64_t rs2) { return rs1 ^  (1LL << (rs2 & 63)); }
++static inline int64_t _rv64_bext (int64_t rs1, int64_t rs2) { return 1LL &  (rs1 >> (rs2 & 63)); }
++
++static inline int32_t _rv32_sll    (int32_t rs1, int32_t rs2) { return rs1 << (rs2 & 31); }
++static inline int32_t _rv32_srl    (int32_t rs1, int32_t rs2) { return (uint32_t)rs1 >> (rs2 & 31); }
++static inline int32_t _rv32_sra    (int32_t rs1, int32_t rs2) { return rs1 >> (rs2 & 31); }
++static inline int32_t _rv32_slo    (int32_t rs1, int32_t rs2) { return ~(~rs1 << (rs2 & 31)); }
++static inline int32_t _rv32_sro    (int32_t rs1, int32_t rs2) { return ~(~(uint32_t)rs1 >> (rs2 & 31)); }
++static inline int32_t _rv32_rol    (int32_t rs1, int32_t rs2) { return _rv32_sll(rs1, rs2) | _rv32_srl(rs1, -rs2); }
++static inline int32_t _rv32_ror    (int32_t rs1, int32_t rs2) { return _rv32_srl(rs1, rs2) | _rv32_sll(rs1, -rs2); }
++
++static inline int32_t _rv32_bfp(int32_t rs1, int32_t rs2)
++{
++	uint32_t cfg = rs2 >> 16;
++	int len = (cfg >> 8) & 15;
++	int off = cfg & 31;
++	len = len ? len : 16;
++	uint32_t mask = _rv32_slo(0, len) << off;
++	uint32_t data = rs2 << off;
++	return (data & mask) | (rs1 & ~mask);
++}
++
++static inline int32_t _rv32_grev(int32_t rs1, int32_t rs2)
++{
++	uint32_t x = rs1;
++	int shamt = rs2 & 31;
++	if (shamt &  1) x = ((x & 0x55555555) <<  1) | ((x & 0xAAAAAAAA) >>  1);
++	if (shamt &  2) x = ((x & 0x33333333) <<  2) | ((x & 0xCCCCCCCC) >>  2);
++	if (shamt &  4) x = ((x & 0x0F0F0F0F) <<  4) | ((x & 0xF0F0F0F0) >>  4);
++	if (shamt &  8) x = ((x & 0x00FF00FF) <<  8) | ((x & 0xFF00FF00) >>  8);
++	if (shamt & 16) x = ((x & 0x0000FFFF) << 16) | ((x & 0xFFFF0000) >> 16);
++	return x;
++}
++
++static inline int32_t _rv32_gorc(int32_t rs1, int32_t rs2)
++{
++	uint32_t x = rs1;
++	int shamt = rs2 & 31;
++	if (shamt &  1) x |= ((x & 0x55555555) <<  1) | ((x & 0xAAAAAAAA) >>  1);
++	if (shamt &  2) x |= ((x & 0x33333333) <<  2) | ((x & 0xCCCCCCCC) >>  2);
++	if (shamt &  4) x |= ((x & 0x0F0F0F0F) <<  4) | ((x & 0xF0F0F0F0) >>  4);
++	if (shamt &  8) x |= ((x & 0x00FF00FF) <<  8) | ((x & 0xFF00FF00) >>  8);
++	if (shamt & 16) x |= ((x & 0x0000FFFF) << 16) | ((x & 0xFFFF0000) >> 16);
++	return x;
++}
++
++static inline uint32_t _rvintrin_shuffle32_stage(uint32_t src, uint32_t maskL, uint32_t maskR, int N)
++{
++	uint32_t x = src & ~(maskL | maskR);
++	x |= ((src <<  N) & maskL) | ((src >>  N) & maskR);
++	return x;
++}
++
++static inline int32_t _rv32_shfl(int32_t rs1, int32_t rs2)
++{
++	uint32_t x = rs1;
++	int shamt = rs2 & 15;
++
++	if (shamt & 8) x = _rvintrin_shuffle32_stage(x, 0x00ff0000, 0x0000ff00, 8);
++	if (shamt & 4) x = _rvintrin_shuffle32_stage(x, 0x0f000f00, 0x00f000f0, 4);
++	if (shamt & 2) x = _rvintrin_shuffle32_stage(x, 0x30303030, 0x0c0c0c0c, 2);
++	if (shamt & 1) x = _rvintrin_shuffle32_stage(x, 0x44444444, 0x22222222, 1);
++
++	return x;
++}
++
++static inline int32_t _rv32_unshfl(int32_t rs1, int32_t rs2)
++{
++	uint32_t x = rs1;
++	int shamt = rs2 & 15;
++
++	if (shamt & 1) x = _rvintrin_shuffle32_stage(x, 0x44444444, 0x22222222, 1);
++	if (shamt & 2) x = _rvintrin_shuffle32_stage(x, 0x30303030, 0x0c0c0c0c, 2);
++	if (shamt & 4) x = _rvintrin_shuffle32_stage(x, 0x0f000f00, 0x00f000f0, 4);
++	if (shamt & 8) x = _rvintrin_shuffle32_stage(x, 0x00ff0000, 0x0000ff00, 8);
++
++	return x;
++}
++
++static inline int64_t _rv64_sll    (int64_t rs1, int64_t rs2) { return rs1 << (rs2 & 63); }
++static inline int64_t _rv64_srl    (int64_t rs1, int64_t rs2) { return (uint64_t)rs1 >> (rs2 & 63); }
++static inline int64_t _rv64_sra    (int64_t rs1, int64_t rs2) { return rs1 >> (rs2 & 63); }
++static inline int64_t _rv64_slo    (int64_t rs1, int64_t rs2) { return ~(~rs1 << (rs2 & 63)); }
++static inline int64_t _rv64_sro    (int64_t rs1, int64_t rs2) { return ~(~(uint64_t)rs1 >> (rs2 & 63)); }
++static inline int64_t _rv64_rol    (int64_t rs1, int64_t rs2) { return _rv64_sll(rs1, rs2) | _rv64_srl(rs1, -rs2); }
++static inline int64_t _rv64_ror    (int64_t rs1, int64_t rs2) { return _rv64_srl(rs1, rs2) | _rv64_sll(rs1, -rs2); }
++
++static inline int64_t _rv64_bfp(int64_t rs1, int64_t rs2)
++{
++	uint64_t cfg = (uint64_t)rs2 >> 32;
++	if ((cfg >> 30) == 2)
++		cfg = cfg >> 16;
++	int len = (cfg >> 8) & 31;
++	int off = cfg & 63;
++	len = len ? len : 32;
++	uint64_t mask = _rv64_slo(0, len) << off;
++	uint64_t data = rs2 << off;
++	return (data & mask) | (rs1 & ~mask);
++}
++
++static inline int64_t _rv64_grev(int64_t rs1, int64_t rs2)
++{
++	uint64_t x = rs1;
++	int shamt = rs2 & 63;
++	if (shamt &  1) x = ((x & 0x5555555555555555LL) <<  1) | ((x & 0xAAAAAAAAAAAAAAAALL) >>  1);
++	if (shamt &  2) x = ((x & 0x3333333333333333LL) <<  2) | ((x & 0xCCCCCCCCCCCCCCCCLL) >>  2);
++	if (shamt &  4) x = ((x & 0x0F0F0F0F0F0F0F0FLL) <<  4) | ((x & 0xF0F0F0F0F0F0F0F0LL) >>  4);
++	if (shamt &  8) x = ((x & 0x00FF00FF00FF00FFLL) <<  8) | ((x & 0xFF00FF00FF00FF00LL) >>  8);
++	if (shamt & 16) x = ((x & 0x0000FFFF0000FFFFLL) << 16) | ((x & 0xFFFF0000FFFF0000LL) >> 16);
++	if (shamt & 32) x = ((x & 0x00000000FFFFFFFFLL) << 32) | ((x & 0xFFFFFFFF00000000LL) >> 32);
++	return x;
++}
++
++static inline int64_t _rv64_gorc(int64_t rs1, int64_t rs2)
++{
++	uint64_t x = rs1;
++	int shamt = rs2 & 63;
++	if (shamt &  1) x |= ((x & 0x5555555555555555LL) <<  1) | ((x & 0xAAAAAAAAAAAAAAAALL) >>  1);
++	if (shamt &  2) x |= ((x & 0x3333333333333333LL) <<  2) | ((x & 0xCCCCCCCCCCCCCCCCLL) >>  2);
++	if (shamt &  4) x |= ((x & 0x0F0F0F0F0F0F0F0FLL) <<  4) | ((x & 0xF0F0F0F0F0F0F0F0LL) >>  4);
++	if (shamt &  8) x |= ((x & 0x00FF00FF00FF00FFLL) <<  8) | ((x & 0xFF00FF00FF00FF00LL) >>  8);
++	if (shamt & 16) x |= ((x & 0x0000FFFF0000FFFFLL) << 16) | ((x & 0xFFFF0000FFFF0000LL) >> 16);
++	if (shamt & 32) x |= ((x & 0x00000000FFFFFFFFLL) << 32) | ((x & 0xFFFFFFFF00000000LL) >> 32);
++	return x;
++}
++
++static inline uint64_t _rvintrin_shuffle64_stage(uint64_t src, uint64_t maskL, uint64_t maskR, int N)
++{
++	uint64_t x = src & ~(maskL | maskR);
++	x |= ((src <<  N) & maskL) | ((src >>  N) & maskR);
++	return x;
++}
++
++static inline int64_t _rv64_shfl(int64_t rs1, int64_t rs2)
++{
++	uint64_t x = rs1;
++	int shamt = rs2 & 31;
++	if (shamt & 16) x = _rvintrin_shuffle64_stage(x, 0x0000ffff00000000LL, 0x00000000ffff0000LL, 16);
++	if (shamt &  8) x = _rvintrin_shuffle64_stage(x, 0x00ff000000ff0000LL, 0x0000ff000000ff00LL,  8);
++	if (shamt &  4) x = _rvintrin_shuffle64_stage(x, 0x0f000f000f000f00LL, 0x00f000f000f000f0LL,  4);
++	if (shamt &  2) x = _rvintrin_shuffle64_stage(x, 0x3030303030303030LL, 0x0c0c0c0c0c0c0c0cLL,  2);
++	if (shamt &  1) x = _rvintrin_shuffle64_stage(x, 0x4444444444444444LL, 0x2222222222222222LL,  1);
++	return x;
++}
++
++static inline int64_t _rv64_unshfl(int64_t rs1, int64_t rs2)
++{
++	uint64_t x = rs1;
++	int shamt = rs2 & 31;
++	if (shamt &  1) x = _rvintrin_shuffle64_stage(x, 0x4444444444444444LL, 0x2222222222222222LL,  1);
++	if (shamt &  2) x = _rvintrin_shuffle64_stage(x, 0x3030303030303030LL, 0x0c0c0c0c0c0c0c0cLL,  2);
++	if (shamt &  4) x = _rvintrin_shuffle64_stage(x, 0x0f000f000f000f00LL, 0x00f000f000f000f0LL,  4);
++	if (shamt &  8) x = _rvintrin_shuffle64_stage(x, 0x00ff000000ff0000LL, 0x0000ff000000ff00LL,  8);
++	if (shamt & 16) x = _rvintrin_shuffle64_stage(x, 0x0000ffff00000000LL, 0x00000000ffff0000LL, 16);
++	return x;
++}
++
++static inline int32_t _rv32_bext(int32_t rs1, int32_t rs2)
++{
++	uint32_t c = 0, i = 0, data = rs1, mask = rs2;
++	while (mask) {
++		uint32_t b = mask & ~((mask | (mask-1)) + 1);
++		c |= (data & b) >> (_rv32_ctz(b) - i);
++		i += _rv32_pcnt(b);
++		mask -= b;
++	}
++	return c;
++}
++
++static inline int32_t _rv32_bdep(int32_t rs1, int32_t rs2)
++{
++	uint32_t c = 0, i = 0, data = rs1, mask = rs2;
++	while (mask) {
++		uint32_t b = mask & ~((mask | (mask-1)) + 1);
++		c |= (data << (_rv32_ctz(b) - i)) & b;
++		i += _rv32_pcnt(b);
++		mask -= b;
++	}
++	return c;
++}
++
++static inline int64_t _rv64_bext(int64_t rs1, int64_t rs2)
++{
++	uint64_t c = 0, i = 0, data = rs1, mask = rs2;
++	while (mask) {
++		uint64_t b = mask & ~((mask | (mask-1)) + 1);
++		c |= (data & b) >> (_rv64_ctz(b) - i);
++		i += _rv64_pcnt(b);
++		mask -= b;
++	}
++	return c;
++}
++
++static inline int64_t _rv64_bdep(int64_t rs1, int64_t rs2)
++{
++	uint64_t c = 0, i = 0, data = rs1, mask = rs2;
++	while (mask) {
++		uint64_t b = mask & ~((mask | (mask-1)) + 1);
++		c |= (data << (_rv64_ctz(b) - i)) & b;
++		i += _rv64_pcnt(b);
++		mask -= b;
++	}
++	return c;
++}
++
++static inline int32_t _rv32_clmul(int32_t rs1, int32_t rs2)
++{
++	uint32_t a = rs1, b = rs2, x = 0;
++	for (int i = 0; i < 32; i++)
++		if ((b >> i) & 1)
++			x ^= a << i;
++	return x;
++}
++
++static inline int32_t _rv32_clmulh(int32_t rs1, int32_t rs2)
++{
++	uint32_t a = rs1, b = rs2, x = 0;
++	for (int i = 1; i < 32; i++)
++		if ((b >> i) & 1)
++			x ^= a >> (32-i);
++	return x;
++}
++
++static inline int32_t _rv32_clmulr(int32_t rs1, int32_t rs2)
++{
++	uint32_t a = rs1, b = rs2, x = 0;
++	for (int i = 0; i < 32; i++)
++		if ((b >> i) & 1)
++			x ^= a >> (31-i);
++	return x;
++}
++
++static inline int64_t _rv64_clmul(int64_t rs1, int64_t rs2)
++{
++	uint64_t a = rs1, b = rs2, x = 0;
++	for (int i = 0; i < 64; i++)
++		if ((b >> i) & 1)
++			x ^= a << i;
++	return x;
++}
++
++static inline int64_t _rv64_clmulh(int64_t rs1, int64_t rs2)
++{
++	uint64_t a = rs1, b = rs2, x = 0;
++	for (int i = 1; i < 64; i++)
++		if ((b >> i) & 1)
++			x ^= a >> (64-i);
++	return x;
++}
++
++static inline int64_t _rv64_clmulr(int64_t rs1, int64_t rs2)
++{
++	uint64_t a = rs1, b = rs2, x = 0;
++	for (int i = 0; i < 64; i++)
++		if ((b >> i) & 1)
++			x ^= a >> (63-i);
++	return x;
++}
++
++static inline long _rvintrin_crc32(unsigned long x, int nbits)
++{
++	for (int i = 0; i < nbits; i++)
++		x = (x >> 1) ^ (0xEDB88320 & ~((x&1)-1));
++	return x;
++}
++
++static inline long _rvintrin_crc32c(unsigned long x, int nbits)
++{
++	for (int i = 0; i < nbits; i++)
++		x = (x >> 1) ^ (0x82F63B78 & ~((x&1)-1));
++	return x;
++}
++
++static inline long _rv_crc32_b(long rs1) { return _rvintrin_crc32(rs1, 8); }
++static inline long _rv_crc32_h(long rs1) { return _rvintrin_crc32(rs1, 16); }
++static inline long _rv_crc32_w(long rs1) { return _rvintrin_crc32(rs1, 32); }
++
++static inline long _rv_crc32c_b(long rs1) { return _rvintrin_crc32c(rs1, 8); }
++static inline long _rv_crc32c_h(long rs1) { return _rvintrin_crc32c(rs1, 16); }
++static inline long _rv_crc32c_w(long rs1) { return _rvintrin_crc32c(rs1, 32); }
++
++#ifdef RVINTRIN_RV64
++static inline long _rv_crc32_d (long rs1) { return _rvintrin_crc32 (rs1, 64); }
++static inline long _rv_crc32c_d(long rs1) { return _rvintrin_crc32c(rs1, 64); }
++#endif
++
++static inline int64_t _rv64_bmatflip(int64_t rs1)
++{
++	uint64_t x = rs1;
++	x = _rv64_shfl(x, 31);
++	x = _rv64_shfl(x, 31);
++	x = _rv64_shfl(x, 31);
++	return x;
++}
++
++static inline int64_t _rv64_bmatxor(int64_t rs1, int64_t rs2)
++{
++	// transpose of rs2
++	int64_t rs2t = _rv64_bmatflip(rs2);
++
++	uint8_t u[8]; // rows of rs1
++	uint8_t v[8]; // cols of rs2
++
++	for (int i = 0; i < 8; i++) {
++		u[i] = rs1 >> (i*8);
++		v[i] = rs2t >> (i*8);
++	}
++
++	uint64_t x = 0;
++	for (int i = 0; i < 64; i++) {
++		if (_rv64_pcnt(u[i / 8] & v[i % 8]) & 1)
++			x |= 1LL << i;
++	}
++
++	return x;
++}
++
++static inline int64_t _rv64_bmator(int64_t rs1, int64_t rs2)
++{
++	// transpose of rs2
++	int64_t rs2t = _rv64_bmatflip(rs2);
++
++	uint8_t u[8]; // rows of rs1
++	uint8_t v[8]; // cols of rs2
++
++	for (int i = 0; i < 8; i++) {
++		u[i] = rs1 >> (i*8);
++		v[i] = rs2t >> (i*8);
++	}
++
++	uint64_t x = 0;
++	for (int i = 0; i < 64; i++) {
++		if ((u[i / 8] & v[i % 8]) != 0)
++			x |= 1LL << i;
++	}
++
++	return x;
++}
++
++static inline long _rv_cmix(long rs2, long rs1, long rs3)
++{
++	return (rs1 & rs2) | (rs3 & ~rs2);
++}
++
++static inline long _rv_cmov(long rs2, long rs1, long rs3)
++{
++	return rs2 ? rs1 : rs3;
++}
++
++static inline int32_t _rv32_fsl(int32_t rs1, int32_t rs3, int32_t rs2)
++{
++	int shamt = rs2 & 63;
++	uint32_t A = rs1, B = rs3;
++	if (shamt >= 32) {
++		shamt -= 32;
++		A = rs3;
++		B = rs1;
++	}
++	return shamt ? (A << shamt) | (B >> (32-shamt)) : A;
++}
++
++static inline int32_t _rv32_fsr(int32_t rs1, int32_t rs3, int32_t rs2)
++{
++	int shamt = rs2 & 63;
++	uint32_t A = rs1, B = rs3;
++	if (shamt >= 32) {
++		shamt -= 32;
++		A = rs3;
++		B = rs1;
++	}
++	return shamt ? (A >> shamt) | (B << (32-shamt)) : A;
++}
++
++static inline int64_t _rv64_fsl(int64_t rs1, int64_t rs3, int64_t rs2)
++{
++	int shamt = rs2 & 127;
++	uint64_t A = rs1, B = rs3;
++	if (shamt >= 64) {
++		shamt -= 64;
++		A = rs3;
++		B = rs1;
++	}
++	return shamt ? (A << shamt) | (B >> (64-shamt)) : A;
++}
++
++static inline int64_t _rv64_fsr(int64_t rs1, int64_t rs3, int64_t rs2)
++{
++	int shamt = rs2 & 127;
++	uint64_t A = rs1, B = rs3;
++	if (shamt >= 64) {
++		shamt -= 64;
++		A = rs3;
++		B = rs1;
++	}
++	return shamt ? (A >> shamt) | (B << (64-shamt)) : A;
++}
++
++static inline long _rv_andn(long rs1, long rs2) { return rs1 & ~rs2; }
++static inline long _rv_orn (long rs1, long rs2) { return rs1 | ~rs2; }
++static inline long _rv_xnor(long rs1, long rs2) { return rs1 ^ ~rs2; }
++
++#endif // RVINTRIN_EMULATE
++
++#ifdef RVINTRIN_RV32
++static inline long _rv_clz    (long rs1) { return _rv32_clz   (rs1); }
++static inline long _rv_ctz    (long rs1) { return _rv32_ctz   (rs1); }
++static inline long _rv_pcnt   (long rs1) { return _rv32_pcnt  (rs1); }
++static inline long _rv_sext_b (long rs1) { return _rv32_sext_b(rs1); }
++static inline long _rv_sext_h (long rs1) { return _rv32_sext_h(rs1); }
++
++static inline long _rv_pack   (long rs1, long rs2) { return _rv32_pack   (rs1, rs2); }
++static inline long _rv_packu  (long rs1, long rs2) { return _rv32_packu  (rs1, rs2); }
++static inline long _rv_packh  (long rs1, long rs2) { return _rv32_packh  (rs1, rs2); }
++static inline long _rv_bfp    (long rs1, long rs2) { return _rv32_bfp    (rs1, rs2); }
++static inline long _rv_min    (long rs1, long rs2) { return _rv32_min    (rs1, rs2); }
++static inline long _rv_minu   (long rs1, long rs2) { return _rv32_minu   (rs1, rs2); }
++static inline long _rv_max    (long rs1, long rs2) { return _rv32_max    (rs1, rs2); }
++static inline long _rv_maxu   (long rs1, long rs2) { return _rv32_maxu   (rs1, rs2); }
++static inline long _rv_bset  (long rs1, long rs2) { return _rv32_bset  (rs1, rs2); }
++static inline long _rv_bclr  (long rs1, long rs2) { return _rv32_bclr  (rs1, rs2); }
++static inline long _rv_binv  (long rs1, long rs2) { return _rv32_binv  (rs1, rs2); }
++static inline long _rv_bext  (long rs1, long rs2) { return _rv32_bext  (rs1, rs2); }
++static inline long _rv_sll    (long rs1, long rs2) { return _rv32_sll    (rs1, rs2); }
++static inline long _rv_srl    (long rs1, long rs2) { return _rv32_srl    (rs1, rs2); }
++static inline long _rv_sra    (long rs1, long rs2) { return _rv32_sra    (rs1, rs2); }
++static inline long _rv_slo    (long rs1, long rs2) { return _rv32_slo    (rs1, rs2); }
++static inline long _rv_sro    (long rs1, long rs2) { return _rv32_sro    (rs1, rs2); }
++static inline long _rv_rol    (long rs1, long rs2) { return _rv32_rol    (rs1, rs2); }
++static inline long _rv_ror    (long rs1, long rs2) { return _rv32_ror    (rs1, rs2); }
++static inline long _rv_grev   (long rs1, long rs2) { return _rv32_grev   (rs1, rs2); }
++static inline long _rv_gorc   (long rs1, long rs2) { return _rv32_gorc   (rs1, rs2); }
++static inline long _rv_shfl   (long rs1, long rs2) { return _rv32_shfl   (rs1, rs2); }
++static inline long _rv_unshfl (long rs1, long rs2) { return _rv32_unshfl (rs1, rs2); }
++static inline long _rv_bext   (long rs1, long rs2) { return _rv32_bext   (rs1, rs2); }
++static inline long _rv_bdep   (long rs1, long rs2) { return _rv32_bdep   (rs1, rs2); }
++static inline long _rv_clmul  (long rs1, long rs2) { return _rv32_clmul  (rs1, rs2); }
++static inline long _rv_clmulh (long rs1, long rs2) { return _rv32_clmulh (rs1, rs2); }
++static inline long _rv_clmulr (long rs1, long rs2) { return _rv32_clmulr (rs1, rs2); }
++
++static inline long _rv_fsl(long rs1, long rs3, long rs2) { return _rv32_fsl(rs1, rs3, rs2); }
++static inline long _rv_fsr(long rs1, long rs3, long rs2) { return _rv32_fsr(rs1, rs3, rs2); }
++#endif
++
++#ifdef RVINTRIN_RV64
++static inline long _rv_clz     (long rs1) { return _rv64_clz     (rs1); }
++static inline long _rv_ctz     (long rs1) { return _rv64_ctz     (rs1); }
++static inline long _rv_pcnt    (long rs1) { return _rv64_pcnt    (rs1); }
++static inline long _rv_sext_b  (long rs1) { return _rv64_sext_b  (rs1); }
++static inline long _rv_sext_h  (long rs1) { return _rv64_sext_h  (rs1); }
++static inline long _rv_bmatflip(long rs1) { return _rv64_bmatflip(rs1); }
++
++static inline long _rv_pack   (long rs1, long rs2) { return _rv64_pack   (rs1, rs2); }
++static inline long _rv_packu  (long rs1, long rs2) { return _rv64_packu  (rs1, rs2); }
++static inline long _rv_packh  (long rs1, long rs2) { return _rv64_packh  (rs1, rs2); }
++static inline long _rv_bfp    (long rs1, long rs2) { return _rv64_bfp    (rs1, rs2); }
++static inline long _rv_min    (long rs1, long rs2) { return _rv64_min    (rs1, rs2); }
++static inline long _rv_minu   (long rs1, long rs2) { return _rv64_minu   (rs1, rs2); }
++static inline long _rv_max    (long rs1, long rs2) { return _rv64_max    (rs1, rs2); }
++static inline long _rv_maxu   (long rs1, long rs2) { return _rv64_maxu   (rs1, rs2); }
++static inline long _rv_bset  (long rs1, long rs2) { return _rv64_bset  (rs1, rs2); }
++static inline long _rv_bclr  (long rs1, long rs2) { return _rv64_bclr  (rs1, rs2); }
++static inline long _rv_binv  (long rs1, long rs2) { return _rv64_binv  (rs1, rs2); }
++static inline long _rv_bext  (long rs1, long rs2) { return _rv64_bext  (rs1, rs2); }
++static inline long _rv_sll    (long rs1, long rs2) { return _rv64_sll    (rs1, rs2); }
++static inline long _rv_srl    (long rs1, long rs2) { return _rv64_srl    (rs1, rs2); }
++static inline long _rv_sra    (long rs1, long rs2) { return _rv64_sra    (rs1, rs2); }
++static inline long _rv_slo    (long rs1, long rs2) { return _rv64_slo    (rs1, rs2); }
++static inline long _rv_sro    (long rs1, long rs2) { return _rv64_sro    (rs1, rs2); }
++static inline long _rv_rol    (long rs1, long rs2) { return _rv64_rol    (rs1, rs2); }
++static inline long _rv_ror    (long rs1, long rs2) { return _rv64_ror    (rs1, rs2); }
++static inline long _rv_grev   (long rs1, long rs2) { return _rv64_grev   (rs1, rs2); }
++static inline long _rv_gorc   (long rs1, long rs2) { return _rv64_gorc   (rs1, rs2); }
++static inline long _rv_shfl   (long rs1, long rs2) { return _rv64_shfl   (rs1, rs2); }
++static inline long _rv_unshfl (long rs1, long rs2) { return _rv64_unshfl (rs1, rs2); }
++static inline long _rv_bext   (long rs1, long rs2) { return _rv64_bext   (rs1, rs2); }
++static inline long _rv_bdep   (long rs1, long rs2) { return _rv64_bdep   (rs1, rs2); }
++static inline long _rv_clmul  (long rs1, long rs2) { return _rv64_clmul  (rs1, rs2); }
++static inline long _rv_clmulh (long rs1, long rs2) { return _rv64_clmulh (rs1, rs2); }
++static inline long _rv_clmulr (long rs1, long rs2) { return _rv64_clmulr (rs1, rs2); }
++static inline long _rv_bmator (long rs1, long rs2) { return _rv64_bmator (rs1, rs2); }
++static inline long _rv_bmatxor(long rs1, long rs2) { return _rv64_bmatxor(rs1, rs2); }
++
++static inline long _rv_fsl(long rs1, long rs3, long rs2) { return _rv64_fsl(rs1, rs3, rs2); }
++static inline long _rv_fsr(long rs1, long rs3, long rs2) { return _rv64_fsr(rs1, rs3, rs2); }
++#endif
++
++#ifdef RVINTRIN_RV32
++
++#define RVINTRIN_GREV_PSEUDO_OP32(_arg, _name) \
++	static inline long    _rv_   ## _name(long    rs1) { return _rv_grev  (rs1, _arg); } \
++	static inline int32_t _rv32_ ## _name(int32_t rs1) { return _rv32_grev(rs1, _arg); }
++
++#define RVINTRIN_GREV_PSEUDO_OP64(_arg, _name)
++
++#else
++
++#define RVINTRIN_GREV_PSEUDO_OP32(_arg, _name) \
++	static inline int32_t _rv32_ ## _name(int32_t rs1) { return _rv32_grev(rs1, _arg); }
++
++#define RVINTRIN_GREV_PSEUDO_OP64(_arg, _name) \
++	static inline long    _rv_   ## _name(long    rs1) { return _rv_grev  (rs1, _arg); } \
++	static inline int64_t _rv64_ ## _name(int64_t rs1) { return _rv64_grev(rs1, _arg); }
++#endif
++
++RVINTRIN_GREV_PSEUDO_OP32( 1, rev_p)
++RVINTRIN_GREV_PSEUDO_OP32( 2, rev2_n)
++RVINTRIN_GREV_PSEUDO_OP32( 3, rev_n)
++RVINTRIN_GREV_PSEUDO_OP32( 4, rev4_b)
++RVINTRIN_GREV_PSEUDO_OP32( 6, rev2_b)
++RVINTRIN_GREV_PSEUDO_OP32( 7, rev_b)
++RVINTRIN_GREV_PSEUDO_OP32( 8, rev8_h)
++RVINTRIN_GREV_PSEUDO_OP32(12, rev4_h)
++RVINTRIN_GREV_PSEUDO_OP32(14, rev2_h)
++RVINTRIN_GREV_PSEUDO_OP32(15, rev_h)
++RVINTRIN_GREV_PSEUDO_OP32(16, rev16)
++RVINTRIN_GREV_PSEUDO_OP32(24, rev8)
++RVINTRIN_GREV_PSEUDO_OP32(28, rev4)
++RVINTRIN_GREV_PSEUDO_OP32(30, rev2)
++RVINTRIN_GREV_PSEUDO_OP32(31, rev)
++
++RVINTRIN_GREV_PSEUDO_OP64( 1, rev_p)
++RVINTRIN_GREV_PSEUDO_OP64( 2, rev2_n)
++RVINTRIN_GREV_PSEUDO_OP64( 3, rev_n)
++RVINTRIN_GREV_PSEUDO_OP64( 4, rev4_b)
++RVINTRIN_GREV_PSEUDO_OP64( 6, rev2_b)
++RVINTRIN_GREV_PSEUDO_OP64( 7, rev_b)
++RVINTRIN_GREV_PSEUDO_OP64( 8, rev8_h)
++RVINTRIN_GREV_PSEUDO_OP64(12, rev4_h)
++RVINTRIN_GREV_PSEUDO_OP64(14, rev2_h)
++RVINTRIN_GREV_PSEUDO_OP64(15, rev_h)
++RVINTRIN_GREV_PSEUDO_OP64(16, rev16_w)
++RVINTRIN_GREV_PSEUDO_OP64(24, rev8_w)
++RVINTRIN_GREV_PSEUDO_OP64(28, rev4_w)
++RVINTRIN_GREV_PSEUDO_OP64(30, rev2_w)
++RVINTRIN_GREV_PSEUDO_OP64(31, rev_w)
++RVINTRIN_GREV_PSEUDO_OP64(32, rev32)
++RVINTRIN_GREV_PSEUDO_OP64(48, rev16)
++RVINTRIN_GREV_PSEUDO_OP64(56, rev8)
++RVINTRIN_GREV_PSEUDO_OP64(60, rev4)
++RVINTRIN_GREV_PSEUDO_OP64(62, rev2)
++RVINTRIN_GREV_PSEUDO_OP64(63, rev)
++
++#ifdef RVINTRIN_RV32
++
++#define RVINTRIN_GORC_PSEUDO_OP32(_arg, _name) \
++	static inline long    _rv_   ## _name(long    rs1) { return _rv_gorc  (rs1, _arg); } \
++	static inline int32_t _rv32_ ## _name(int32_t rs1) { return _rv32_gorc(rs1, _arg); }
++
++#define RVINTRIN_GORC_PSEUDO_OP64(_arg, _name)
++
++#else
++
++#define RVINTRIN_GORC_PSEUDO_OP32(_arg, _name) \
++	static inline int32_t _rv32_ ## _name(int32_t rs1) { return _rv32_gorc(rs1, _arg); }
++
++#define RVINTRIN_GORC_PSEUDO_OP64(_arg, _name) \
++	static inline long    _rv_   ## _name(long    rs1) { return _rv_gorc  (rs1, _arg); } \
++	static inline int64_t _rv64_ ## _name(int64_t rs1) { return _rv64_gorc(rs1, _arg); }
++#endif
++
++RVINTRIN_GORC_PSEUDO_OP32( 1, orc_p)
++RVINTRIN_GORC_PSEUDO_OP32( 2, orc2_n)
++RVINTRIN_GORC_PSEUDO_OP32( 3, orc_n)
++RVINTRIN_GORC_PSEUDO_OP32( 4, orc4_b)
++RVINTRIN_GORC_PSEUDO_OP32( 6, orc2_b)
++RVINTRIN_GORC_PSEUDO_OP32( 7, orc_b)
++RVINTRIN_GORC_PSEUDO_OP32( 8, orc8_h)
++RVINTRIN_GORC_PSEUDO_OP32(12, orc4_h)
++RVINTRIN_GORC_PSEUDO_OP32(14, orc2_h)
++RVINTRIN_GORC_PSEUDO_OP32(15, orc_h)
++RVINTRIN_GORC_PSEUDO_OP32(16, orc16)
++RVINTRIN_GORC_PSEUDO_OP32(24, orc8)
++RVINTRIN_GORC_PSEUDO_OP32(28, orc4)
++RVINTRIN_GORC_PSEUDO_OP32(30, orc2)
++RVINTRIN_GORC_PSEUDO_OP32(31, orc)
++
++RVINTRIN_GORC_PSEUDO_OP64( 1, orc_p)
++RVINTRIN_GORC_PSEUDO_OP64( 2, orc2_n)
++RVINTRIN_GORC_PSEUDO_OP64( 3, orc_n)
++RVINTRIN_GORC_PSEUDO_OP64( 4, orc4_b)
++RVINTRIN_GORC_PSEUDO_OP64( 6, orc2_b)
++RVINTRIN_GORC_PSEUDO_OP64( 7, orc_b)
++RVINTRIN_GORC_PSEUDO_OP64( 8, orc8_h)
++RVINTRIN_GORC_PSEUDO_OP64(12, orc4_h)
++RVINTRIN_GORC_PSEUDO_OP64(14, orc2_h)
++RVINTRIN_GORC_PSEUDO_OP64(15, orc_h)
++RVINTRIN_GORC_PSEUDO_OP64(16, orc16_w)
++RVINTRIN_GORC_PSEUDO_OP64(24, orc8_w)
++RVINTRIN_GORC_PSEUDO_OP64(28, orc4_w)
++RVINTRIN_GORC_PSEUDO_OP64(30, orc2_w)
++RVINTRIN_GORC_PSEUDO_OP64(31, orc_w)
++RVINTRIN_GORC_PSEUDO_OP64(32, orc32)
++RVINTRIN_GORC_PSEUDO_OP64(48, orc16)
++RVINTRIN_GORC_PSEUDO_OP64(56, orc8)
++RVINTRIN_GORC_PSEUDO_OP64(60, orc4)
++RVINTRIN_GORC_PSEUDO_OP64(62, orc2)
++RVINTRIN_GORC_PSEUDO_OP64(63, orc)
++
++#ifdef RVINTRIN_RV32
++
++#define RVINTRIN_SHFL_PSEUDO_OP32(_arg, _name) \
++	static inline long    _rv_     ## _name(long    rs1) { return _rv_shfl    (rs1, _arg); } \
++	static inline long    _rv_un   ## _name(long    rs1) { return _rv_unshfl  (rs1, _arg); } \
++	static inline int32_t _rv32_un ## _name(int32_t rs1) { return _rv32_shfl  (rs1, _arg); } \
++	static inline int32_t _rv32_   ## _name(int32_t rs1) { return _rv32_unshfl(rs1, _arg); }
++
++#define RVINTRIN_SHFL_PSEUDO_OP64(_arg, _name)
++
++#else
++
++#define RVINTRIN_SHFL_PSEUDO_OP32(_arg, _name)
++
++#define RVINTRIN_SHFL_PSEUDO_OP64(_arg, _name) \
++	static inline long    _rv_     ## _name(long    rs1) { return _rv_shfl    (rs1, _arg); } \
++	static inline long    _rv_un   ## _name(long    rs1) { return _rv_unshfl  (rs1, _arg); } \
++	static inline int64_t _rv64_   ## _name(int64_t rs1) { return _rv64_shfl  (rs1, _arg); } \
++	static inline int64_t _rv64_un ## _name(int64_t rs1) { return _rv64_unshfl(rs1, _arg); }
++
++#endif
++
++RVINTRIN_SHFL_PSEUDO_OP32( 1, zip_n)
++RVINTRIN_SHFL_PSEUDO_OP32( 2, zip2_b)
++RVINTRIN_SHFL_PSEUDO_OP32( 3, zip_b)
++RVINTRIN_SHFL_PSEUDO_OP32( 4, zip4_h)
++RVINTRIN_SHFL_PSEUDO_OP32( 6, zip2_h)
++RVINTRIN_SHFL_PSEUDO_OP32( 7, zip_h)
++RVINTRIN_SHFL_PSEUDO_OP32( 8, zip8)
++RVINTRIN_SHFL_PSEUDO_OP32(12, zip4)
++RVINTRIN_SHFL_PSEUDO_OP32(14, zip2)
++RVINTRIN_SHFL_PSEUDO_OP32(15, zip)
++
++RVINTRIN_SHFL_PSEUDO_OP64( 1, zip_n)
++RVINTRIN_SHFL_PSEUDO_OP64( 2, zip2_b)
++RVINTRIN_SHFL_PSEUDO_OP64( 3, zip_b)
++RVINTRIN_SHFL_PSEUDO_OP64( 4, zip4_h)
++RVINTRIN_SHFL_PSEUDO_OP64( 6, zip2_h)
++RVINTRIN_SHFL_PSEUDO_OP64( 7, zip_h)
++RVINTRIN_SHFL_PSEUDO_OP64( 8, zip8_w)
++RVINTRIN_SHFL_PSEUDO_OP64(12, zip4_w)
++RVINTRIN_SHFL_PSEUDO_OP64(14, zip2_w)
++RVINTRIN_SHFL_PSEUDO_OP64(15, zip_w)
++RVINTRIN_SHFL_PSEUDO_OP64(16, zip16)
++RVINTRIN_SHFL_PSEUDO_OP64(24, zip8)
++RVINTRIN_SHFL_PSEUDO_OP64(28, zip4)
++RVINTRIN_SHFL_PSEUDO_OP64(30, zip2)
++RVINTRIN_SHFL_PSEUDO_OP64(31, zip)
++
++#endif // RVINTRIN_H
+-- 
+2.33.1
+

+ 53 - 0
recipes-devtools/gcc/gcc/0009-cpp-honor-sysroot.patch

@@ -0,0 +1,53 @@
+From 33a7a55d39c040ba09af2d69f7fa9cf8e6f84c91 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:22:00 +0400
+Subject: [PATCH] cpp: honor sysroot.
+
+Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile
+preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location
+rather than the --sysroot option specified on the commandline. If access to that directory is
+permission denied (unreadable), gcc will error.
+
+This happens when ccache is in use due to the fact it uses preprocessed source files.
+
+The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix,
+-isystem, -isysroot happen and the correct sysroot is used.
+
+[YOCTO #2074]
+
+RP 2012/04/13
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+---
+ gcc/cp/lang-specs.h | 2 +-
+ gcc/gcc.c           | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
+index 8902ae1d2ed..e99e2fcd6ad 100644
+--- a/gcc/cp/lang-specs.h
++++ b/gcc/cp/lang-specs.h
+@@ -116,7 +116,7 @@ along with GCC; see the file COPYING3.  If not see
+   {".ii", "@c++-cpp-output", 0, 0, 0},
+   {"@c++-cpp-output",
+       "%{!E:%{!M:%{!MM:"
+-      "  cc1plus -fpreprocessed %i %(cc1_options) %2"
++      "  cc1plus -fpreprocessed %i %I %(cc1_options) %2"
+       "  %{!fsyntax-only:"
+       "    %{fmodule-only:%{!S:-o %g.s%V}}"
+       "    %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}"
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 1bc45285384..8737bae5353 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -1470,7 +1470,7 @@ static const struct compiler default_compilers[] =
+ 					   %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
+   {".i", "@cpp-output", 0, 0, 0},
+   {"@cpp-output",
+-   "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
++   "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+   {".s", "@assembler", 0, 0, 0},
+   {"@assembler",
+    "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},

+ 45 - 0
recipes-devtools/gcc/gcc/0009-update-B-version-from-0.93-to-0.94.patch

@@ -0,0 +1,45 @@
+From 7bcd04ce147c1cd442a1e6e8b9ba8b11e7d3f483 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Mon, 11 Oct 2021 10:00:48 +0800
+Subject: [PATCH 09/15] update B version from 0.93 to 0.94
+
+---
+ gcc/common/config/riscv/riscv-common.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c
+index c7b6158af4b..28475fc76b5 100644
+--- a/gcc/common/config/riscv/riscv-common.c
++++ b/gcc/common/config/riscv/riscv-common.c
+@@ -111,17 +111,17 @@ static const struct riscv_ext_version riscv_ext_version_table[] =
+   {"zifencei", ISA_SPEC_CLASS_20191213, 2, 0},
+   {"zifencei", ISA_SPEC_CLASS_20190608, 2, 0},
+ 
+-  {"b",   ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zba", ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zbb", ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zbc", ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zbe", ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zbf", ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zbr", ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zbm", ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zbs", ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zbt", ISA_SPEC_CLASS_NONE, 0, 93},
+-  {"zbp", ISA_SPEC_CLASS_NONE, 0, 93},
++  {"b",   ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zba", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zbb", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zbc", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zbe", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zbf", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zbr", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zbm", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zbs", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zbt", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"zbp", ISA_SPEC_CLASS_NONE, 0, 94},
+   /* Terminate the list.  */
+   {NULL, ISA_SPEC_CLASS_NONE, 0, 0}
+ };
+-- 
+2.33.1
+

+ 54 - 0
recipes-devtools/gcc/gcc/0010-MIPS64-Default-to-N64-ABI.patch

@@ -0,0 +1,54 @@
+From a2dc2fa4cc7e5d54544d4a7b6601eef79bc26cad Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:23:08 +0400
+Subject: [PATCH] MIPS64: Default to N64 ABI
+
+MIPS64 defaults to n32 ABI, this patch makes it
+so that it defaults to N64 ABI
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Inappropriate [OE config specific]
+---
+ gcc/config.gcc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gcc/config.gcc b/gcc/config.gcc
+index 3ec7582f5dd..a046fa6945c 100644
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -2543,29 +2543,29 @@ mips*-*-linux*)				# Linux MIPS, either endian.
+ 			default_mips_arch=mips32
+ 			;;
+ 		mips64el-st-linux-gnu)
+-			default_mips_abi=n32
++			default_mips_abi=64
+ 			tm_file="${tm_file} mips/st.h"
+ 			tmake_file="${tmake_file} mips/t-st"
+ 			enable_mips_multilibs="yes"
+ 			;;
+ 		mips64octeon*-*-linux*)
+-			default_mips_abi=n32
++			default_mips_abi=64
+ 			tm_defines="${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\"octeon\\\""
+ 			target_cpu_default=MASK_SOFT_FLOAT_ABI
+ 			enable_mips_multilibs="yes"
+ 			;;
+ 		mipsisa64r6*-*-linux*)
+-			default_mips_abi=n32
++			default_mips_abi=64
+ 			default_mips_arch=mips64r6
+ 			enable_mips_multilibs="yes"
+ 			;;
+ 		mipsisa64r2*-*-linux*)
+-			default_mips_abi=n32
++			default_mips_abi=64
+ 			default_mips_arch=mips64r2
+ 			enable_mips_multilibs="yes"
+ 			;;
+ 		mips64*-*-linux* | mipsisa64*-*-linux*)
+-			default_mips_abi=n32
++			default_mips_abi=64
+ 			enable_mips_multilibs="yes"
+ 			;;
+ 	esac

+ 253 - 0
recipes-devtools/gcc/gcc/0010-Merge-B-instruction-from-0p94-to-1.0.patch

@@ -0,0 +1,253 @@
+From c1eb999a3aed84d42c792280ea2c313d1c6063ca Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Fri, 22 Oct 2021 16:10:16 +0800
+Subject: [PATCH 10/15] Merge B instruction from 0p94 to 1.0
+
+---
+ gcc/common/config/riscv/riscv-common.c | 28 +++---------
+ gcc/config/riscv/bitmanip.md           | 62 +++++---------------------
+ gcc/config/riscv/riscv-opts.h          | 14 +-----
+ 3 files changed, 17 insertions(+), 87 deletions(-)
+
+diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c
+index 28475fc76b5..48eb558bcf5 100644
+--- a/gcc/common/config/riscv/riscv-common.c
++++ b/gcc/common/config/riscv/riscv-common.c
+@@ -53,13 +53,7 @@ static const riscv_implied_info_t riscv_implied_info[] =
+   {"b", "zbb"},
+   {"b", "zbs"},
+   {"b", "zba"},
+-  {"b", "zbp"},
+-  {"b", "zbe"},
+-  {"b", "zbf"},
+   {"b", "zbc"},
+-  {"b", "zbm"},
+-  {"b", "zbr"},
+-  {"b", "zbt"},
+   {NULL, NULL}
+ };
+ 
+@@ -111,17 +105,11 @@ static const struct riscv_ext_version riscv_ext_version_table[] =
+   {"zifencei", ISA_SPEC_CLASS_20191213, 2, 0},
+   {"zifencei", ISA_SPEC_CLASS_20190608, 2, 0},
+ 
+-  {"b",   ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zba", ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zbb", ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zbc", ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zbe", ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zbf", ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zbr", ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zbm", ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zbs", ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zbt", ISA_SPEC_CLASS_NONE, 0, 94},
+-  {"zbp", ISA_SPEC_CLASS_NONE, 0, 94},
++  {"b",   ISA_SPEC_CLASS_NONE, 1, 0},
++  {"zba", ISA_SPEC_CLASS_NONE, 1, 0},
++  {"zbb", ISA_SPEC_CLASS_NONE, 1, 0},
++  {"zbc", ISA_SPEC_CLASS_NONE, 1, 0},
++  {"zbs", ISA_SPEC_CLASS_NONE, 1, 0},
+   /* Terminate the list.  */
+   {NULL, ISA_SPEC_CLASS_NONE, 0, 0}
+ };
+@@ -929,13 +917,7 @@ static const riscv_ext_flag_table_t riscv_ext_flag_table[] =
+   {"zba", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBA},
+   {"zbb", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBB},
+   {"zbs", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBS},
+-  {"zbp", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBP},
+-  {"zbr", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBR},
+-  {"zbe", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBE},
+-  {"zbf", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBF},
+   {"zbc", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBC},
+-  {"zbm", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBM},
+-  {"zbt", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBT},
+   {NULL, NULL, 0}
+ };
+ 
+diff --git a/gcc/config/riscv/bitmanip.md b/gcc/config/riscv/bitmanip.md
+index 6653219c3f0..ceb5c89dd47 100644
+--- a/gcc/config/riscv/bitmanip.md
++++ b/gcc/config/riscv/bitmanip.md
+@@ -69,7 +69,7 @@
+   [(set (match_operand:X 0 "register_operand" "=r")
+ 	(bitmanip_bitwise:X (not:X (match_operand:X 1 "register_operand" "r"))
+ 			    (match_operand:X 2 "register_operand" "r")))]
+-  "TARGET_ZBB || TARGET_ZBP"
++  "TARGET_ZBB"
+   "<insn>n\t%0,%2,%1"
+   [(set_attr "type" "bitmanip")])
+ 
+@@ -77,7 +77,7 @@
+   [(set (match_operand:X 0 "register_operand" "=r")
+ 	(not:X (xor:X (match_operand:X 1 "register_operand" "r")
+ 		      (match_operand:X 2 "register_operand" "r"))))]
+-  "TARGET_ZBB || TARGET_ZBP"
++  "TARGET_ZBB"
+   "xnor\t%0,%1,%2"
+   [(set_attr "type" "bitmanip")])
+  
+@@ -86,7 +86,7 @@
+ (define_insn "*zero_extendhi<GPR:mode>2_bitmanip"
+   [(set (match_operand:GPR 0 "register_operand" "=r,r")
+ 	(zero_extend:GPR (match_operand:HI 1 "nonimmediate_operand" "r,m")))]
+-  "TARGET_ZBB || TARGET_ZBP"
++  "TARGET_ZBB"
+   "@
+    zext.h\t%0,%1
+    lhu\t%0,%1"
+@@ -301,7 +301,7 @@
+   [(set (match_operand:SI 0 "register_operand" "=r")
+ 	(rotatert:SI (match_operand:SI 1 "register_operand" "r")
+ 		     (match_operand:QI 2 "arith_operand" "rI")))]
+-  "TARGET_ZBB || TARGET_ZBP"
++  "TARGET_ZBB"
+   { return TARGET_64BIT ? "ror%i2w\t%0,%1,%2" : "ror%i2\t%0,%1,%2"; }
+   [(set_attr "type" "bitmanip")])
+ 
+@@ -309,7 +309,7 @@
+   [(set (match_operand:DI 0 "register_operand" "=r")
+ 	(rotatert:DI (match_operand:DI 1 "register_operand" "r")
+ 		     (match_operand:QI 2 "arith_operand" "rI")))]
+-  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++  "TARGET_64BIT && TARGET_ZBB"
+   "ror%i2\t%0,%1,%2"
+   [(set_attr "type" "bitmanip")])
+ 
+@@ -317,7 +317,7 @@
+   [(match_operand:SI 0 "register_operand" "=r")
+    (match_operand:SI 1 "register_operand" "r")
+    (match_operand:SI 2 "register_operand" "r")]
+-  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++  "TARGET_64BIT && TARGET_ZBB"
+ {
+   emit_insn (gen_rotlsi3 (operands[0], operands[1], operands[2]));
+   DONE;
+@@ -327,7 +327,7 @@
+   [(set (match_operand:SI 0 "register_operand" "=r")
+ 	(rotate:SI (match_operand:SI 1 "register_operand" "r")
+ 		   (match_operand:QI 2 "register_operand" "r")))]
+-  "TARGET_ZBB || TARGET_ZBP"
++  "TARGET_ZBB"
+   { return TARGET_64BIT ? "rolw\t%0,%1,%2" : "rol\t%0,%1,%2"; }
+   [(set_attr "type" "bitmanip")])
+ 
+@@ -335,7 +335,7 @@
+   [(set (match_operand:DI 0 "register_operand" "=r")
+ 	(rotate:DI (match_operand:DI 1 "register_operand" "r")
+ 		   (match_operand:QI 2 "register_operand" "r")))]
+-  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++  "TARGET_64BIT && TARGET_ZBB"
+   "rol\t%0,%1,%2"
+   [(set_attr "type" "bitmanip")])
+ 
+@@ -343,7 +343,7 @@
+   [(set (match_operand:DI 0 "register_operand" "=r")
+ 	(sign_extend:DI (rotate:SI (match_operand:SI 1 "register_operand" "r")
+ 				   (match_operand:QI 2 "register_operand" "r"))))]
+-  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++  "TARGET_64BIT && TARGET_ZBB"
+   "rolw\t%0,%1,%2"
+   [(set_attr "type" "bitmanip")])
+ 
+@@ -352,7 +352,7 @@
+ (define_insn "bswapsi2"
+   [(set (match_operand:SI 0 "register_operand" "=r")
+         (bswap:SI (match_operand:SI 1 "register_operand" "r")))]
+-  "TARGET_ZBB || TARGET_ZBP"
++  "TARGET_ZBB"
+ {
+   if (TARGET_64BIT)
+     return TARGET_ZBB ? "rev8\t%0,%1\n\tsrai\t%0,%0,32" : "rev8.w\t%0,%1";
+@@ -364,7 +364,7 @@
+ (define_insn "bswapdi2"
+   [(set (match_operand:DI 0 "register_operand" "=r")
+ 	(bswap:DI (match_operand:DI 1 "register_operand" "r")))]
+-  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBP)"
++  "TARGET_64BIT && TARGET_ZBB"
+   "rev8\t%0,%1"
+   [(set_attr "type" "bitmanip")])
+ 
+@@ -378,50 +378,10 @@
+ 
+ ;;; ??? bmat
+ 
+-(define_insn "*cmix"
+-  [(set (match_operand:X 0 "register_operand" "=r")
+-	(xor:X (and:X (xor:X (match_operand:X 1 "register_operand" "r")
+-			     (match_operand:X 3 "register_operand" "r"))
+-		      (match_operand:X 2 "register_operand" "r"))
+-	       (match_dup 3)))]
+-  "TARGET_ZBT"
+-  "cmix\t%0,%2,%1,%3"
+-  [(set_attr "type" "bitmanip")])
+-
+ ;; ??? Can we do this by using the % communtative constraint?
+ 
+-(define_insn "*cmix2"
+-  [(set (match_operand:X 0 "register_operand" "=r")
+-	(xor:X (and:X (xor:X (match_operand:X 1 "register_operand" "r")
+-			     (match_operand:X 3 "register_operand" "r"))
+-		      (match_operand:X 2 "register_operand" "r"))
+-	       (match_dup 1)))]
+-  "TARGET_ZBT"
+-  "cmix\t%0,%2,%3,%1"
+-  [(set_attr "type" "bitmanip")])
+-
+ ;;; ??? cmov
+ 
+-(define_insn "*mov<X:mode>cc_ne_bitmanip"
+-  [(set (match_operand:X 0 "register_operand" "=r")
+-	(if_then_else:X
+-	 (ne (match_operand:X 1 "register_operand" "r") (const_int 0))
+-	 (match_operand:X 2 "register_operand" "r")
+-	 (match_operand:X 3 "register_operand" "r")))]
+-  "TARGET_ZBT"
+-  "cmov\t%0,%1,%2,%3"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "*mov<X:mode>cc_eq_bitmanip"
+-  [(set (match_operand:X 0 "register_operand" "=r")
+-	(if_then_else:X
+-	 (eq (match_operand:X 1 "register_operand" "r") (const_int 0))
+-	 (match_operand:X 2 "register_operand" "r")
+-	 (match_operand:X 3 "register_operand" "r")))]
+-  "TARGET_ZBT"
+-  "cmov\t%0,%1,%3,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+ ;;; ??? fs[lr]
+ 
+ (define_insn "*shNadd"
+diff --git a/gcc/config/riscv/riscv-opts.h b/gcc/config/riscv/riscv-opts.h
+index ca3190b6414..61d1e9d96d8 100644
+--- a/gcc/config/riscv/riscv-opts.h
++++ b/gcc/config/riscv/riscv-opts.h
+@@ -70,24 +70,12 @@ enum stack_protector_guard {
+ #define MASK_ZBA (1 << 0)
+ #define MASK_ZBB (1 << 1)
+ #define MASK_ZBS (1 << 2)
+-#define MASK_ZBP (1 << 3)
+-#define MASK_ZBE (1 << 4)
+-#define MASK_ZBF (1 << 5)
+-#define MASK_ZBC (1 << 6)
+-#define MASK_ZBR (1 << 7)
+-#define MASK_ZBM (1 << 8)
+-#define MASK_ZBT (1 << 9)
++#define MASK_ZBC (1 << 3)
+ 
+ #define TARGET_ZBA ((riscv_bitmanip_subext & MASK_ZBA) != 0)
+ #define TARGET_ZBB ((riscv_bitmanip_subext & MASK_ZBB) != 0)
+ #define TARGET_ZBS ((riscv_bitmanip_subext & MASK_ZBS) != 0)
+-#define TARGET_ZBP ((riscv_bitmanip_subext & MASK_ZBP) != 0)
+-#define TARGET_ZBE ((riscv_bitmanip_subext & MASK_ZBE) != 0)
+-#define TARGET_ZBF ((riscv_bitmanip_subext & MASK_ZBF) != 0)
+ #define TARGET_ZBC ((riscv_bitmanip_subext & MASK_ZBC) != 0)
+-#define TARGET_ZBR ((riscv_bitmanip_subext & MASK_ZBR) != 0)
+-#define TARGET_ZBM ((riscv_bitmanip_subext & MASK_ZBM) != 0)
+-#define TARGET_ZBT ((riscv_bitmanip_subext & MASK_ZBT) != 0)
+ 
+ #define MASK_ZICSR    (1 << 0)
+ #define MASK_ZIFENCEI (1 << 1)
+-- 
+2.33.1
+

+ 243 - 0
recipes-devtools/gcc/gcc/0011-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch

@@ -0,0 +1,243 @@
+From 8e9d6efecdc8c42f47e3a012dee764b13c3dad59 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:24:50 +0400
+Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
+ relative to SYSTEMLIBS_DIR
+
+This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
+relative to SYSTEMLIBS_DIR which can be set in generated headers
+This breaks the assumption of hardcoded multilib in gcc
+Change is only for the supported architectures in OE including
+SH, sparc, alpha for possible future support (if any)
+
+Removes the do_headerfix task in metadata
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Inappropriate [OE configuration]
+---
+ gcc/config/alpha/linux-elf.h |  4 ++--
+ gcc/config/arm/linux-eabi.h  |  4 ++--
+ gcc/config/arm/linux-elf.h   |  2 +-
+ gcc/config/i386/linux.h      |  2 +-
+ gcc/config/i386/linux64.h    |  6 +++---
+ gcc/config/linux.h           |  8 ++++----
+ gcc/config/mips/linux.h      | 12 ++++++------
+ gcc/config/riscv/linux.h     |  2 +-
+ gcc/config/rs6000/linux64.h  | 15 +++++----------
+ gcc/config/sh/linux.h        |  2 +-
+ gcc/config/sparc/linux.h     |  2 +-
+ gcc/config/sparc/linux64.h   |  4 ++--
+ 12 files changed, 29 insertions(+), 34 deletions(-)
+
+diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
+index c1dae8ca2cf..3ce2b76c1a4 100644
+--- a/gcc/config/alpha/linux-elf.h
++++ b/gcc/config/alpha/linux-elf.h
+@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3.  If not see
+ #define EXTRA_SPECS \
+ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
+ 
+-#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER	SYSTEMLIBS_DIR "ld-linux.so.2"
++#define UCLIBC_DYNAMIC_LINKER  SYSTEMLIBS_DIR "ld-uClibc.so.0"
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+ #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
+ #elif DEFAULT_LIBC == LIBC_GLIBC
+diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
+index 85d0136e76e..6bd95855827 100644
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -65,8 +65,8 @@
+    GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI.  */
+ 
+ #undef  GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
+-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
++#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT SYSTEMLIBS_DIR "ld-linux.so.3"
++#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT SYSTEMLIBS_DIR "ld-linux-armhf.so.3"
+ #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
+ 
+ #define GLIBC_DYNAMIC_LINKER \
+diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
+index 0c1c4e70b6b..6bd643ade11 100644
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -60,7 +60,7 @@
+ 
+ #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #define LINUX_TARGET_LINK_SPEC  "%{h*} \
+    %{static:-Bstatic} \
+diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
+index 04b274f1654..7aafcf3ac2d 100644
+--- a/gcc/config/i386/linux.h
++++ b/gcc/config/i386/linux.h
+@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
+diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
+index b3822ced528..92d303e80d6 100644
+--- a/gcc/config/i386/linux64.h
++++ b/gcc/config/i386/linux64.h
+@@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
+ #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
++#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2"
+ 
+ #undef MUSL_DYNAMIC_LINKER32
+ #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index 4e1db60fced..87efc5f69fe 100644
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -94,10 +94,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
+    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
+    supporting both 32-bit and 64-bit compilation.  */
+-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+-#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0"
++#define UCLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ldx32-uClibc.so.0"
+ #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
+ #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
+ #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
+diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
+index 44a85e410d9..8d41b5574f6 100644
+--- a/gcc/config/mips/linux.h
++++ b/gcc/config/mips/linux.h
+@@ -22,20 +22,20 @@ along with GCC; see the file COPYING3.  If not see
+ #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
+ 
+ #define GLIBC_DYNAMIC_LINKER32 \
+-  "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
+ #define GLIBC_DYNAMIC_LINKER64 \
+-  "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
+ #define GLIBC_DYNAMIC_LINKERN32 \
+-  "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
+ 
+ #undef UCLIBC_DYNAMIC_LINKER32
+ #define UCLIBC_DYNAMIC_LINKER32 \
+-  "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}"
+ #undef UCLIBC_DYNAMIC_LINKER64
+ #define UCLIBC_DYNAMIC_LINKER64 \
+-  "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld64-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld64-uClibc.so.0}"
+ #define UCLIBC_DYNAMIC_LINKERN32 \
+-  "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}"
++  "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}"
+ 
+ #undef MUSL_DYNAMIC_LINKER32
+ #define MUSL_DYNAMIC_LINKER32 \
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index 9238de5bc92..7136a83260a 100644
+--- a/gcc/config/riscv/linux.h
++++ b/gcc/config/riscv/linux.h
+@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
+     GNU_USER_TARGET_OS_CPP_BUILTINS();				\
+   } while (0)
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1"
+ 
+ #define MUSL_ABI_SUFFIX \
+   "%{mabi=ilp32:-sf}" \
+diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
+index e3f2cd254f6..a11e01faa3d 100644
+--- a/gcc/config/rs6000/linux64.h
++++ b/gcc/config/rs6000/linux64.h
+@@ -336,24 +336,19 @@ extern int dot_symbols;
+ #undef	LINK_OS_DEFAULT_SPEC
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
+-
++#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1"
+ #ifdef LINUX64_DEFAULT_ABI_ELFv2
+-#define GLIBC_DYNAMIC_LINKER64 \
+-"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \
+-":%(dynamic_linker_prefix)/lib64/ld64.so.2}"
++#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:" SYSTEMLIBS_DIR "ld64.so.1;:" SYSTEMLIBS_DIR "ld64.so.2}"
+ #else
+-#define GLIBC_DYNAMIC_LINKER64 \
+-"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \
+-":%(dynamic_linker_prefix)/lib64/ld64.so.1}"
++#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:" SYSTEMLIBS_DIR "ld64.so.2;:" SYSTEMLIBS_DIR "ld64.so.1}"
+ #endif
+ 
+ #undef MUSL_DYNAMIC_LINKER32
+ #define MUSL_DYNAMIC_LINKER32 \
+-  "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++  SYSTEMLIBS_DIR "ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
+ #undef MUSL_DYNAMIC_LINKER64
+ #define MUSL_DYNAMIC_LINKER64 \
+-  "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
++  SYSTEMLIBS_DIR "ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
+ 
+ #undef  DEFAULT_ASM_ENDIAN
+ #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
+diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
+index 7558d2f7195..3aaa6c3a078 100644
+--- a/gcc/config/sh/linux.h
++++ b/gcc/config/sh/linux.h
+@@ -64,7 +64,7 @@ along with GCC; see the file COPYING3.  If not see
+   "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \
+   "%{mfdpic:-fdpic}.so.1"
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+ #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"
+diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
+index 2550d7ee8f0..a94f4cd8ba2 100644
+--- a/gcc/config/sparc/linux.h
++++ b/gcc/config/sparc/linux.h
+@@ -78,7 +78,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
+diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
+index 95af8afa9b5..63127afb074 100644
+--- a/gcc/config/sparc/linux64.h
++++ b/gcc/config/sparc/linux64.h
+@@ -78,8 +78,8 @@ along with GCC; see the file COPYING3.  If not see
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux.so.2"
+ 
+ #ifdef SPARC_BI_ARCH
+ 

+ 77 - 0
recipes-devtools/gcc/gcc/0011-remove-b-flag-and-use-zba_zbb_zbc_zbs-instead.patch

@@ -0,0 +1,77 @@
+From b4060fc036995229bd9c4c0d7d9b74b45a4ccf50 Mon Sep 17 00:00:00 2001
+From: "max.ma" <max.ma@starfivetech.com>
+Date: Wed, 27 Oct 2021 19:09:37 -0700
+Subject: [PATCH 11/15] remove 'b' flag and use zba_zbb_zbc_zbs instead
+
+---
+ gcc/common/config/riscv/riscv-common.c |  1 -
+ gcc/config/riscv/riscv-opts.h          | 18 +++++++++---------
+ gcc/config/riscv/riscv.opt             |  4 +---
+ 3 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c
+index 48eb558bcf5..a00b20e065a 100644
+--- a/gcc/common/config/riscv/riscv-common.c
++++ b/gcc/common/config/riscv/riscv-common.c
+@@ -105,7 +105,6 @@ static const struct riscv_ext_version riscv_ext_version_table[] =
+   {"zifencei", ISA_SPEC_CLASS_20191213, 2, 0},
+   {"zifencei", ISA_SPEC_CLASS_20190608, 2, 0},
+ 
+-  {"b",   ISA_SPEC_CLASS_NONE, 1, 0},
+   {"zba", ISA_SPEC_CLASS_NONE, 1, 0},
+   {"zbb", ISA_SPEC_CLASS_NONE, 1, 0},
+   {"zbc", ISA_SPEC_CLASS_NONE, 1, 0},
+diff --git a/gcc/config/riscv/riscv-opts.h b/gcc/config/riscv/riscv-opts.h
+index 61d1e9d96d8..617feebc7bb 100644
+--- a/gcc/config/riscv/riscv-opts.h
++++ b/gcc/config/riscv/riscv-opts.h
+@@ -67,15 +67,15 @@ enum stack_protector_guard {
+   SSP_GLOBAL			/* global canary */
+ };
+ 
+-#define MASK_ZBA (1 << 0)
+-#define MASK_ZBB (1 << 1)
+-#define MASK_ZBS (1 << 2)
+-#define MASK_ZBC (1 << 3)
+-
+-#define TARGET_ZBA ((riscv_bitmanip_subext & MASK_ZBA) != 0)
+-#define TARGET_ZBB ((riscv_bitmanip_subext & MASK_ZBB) != 0)
+-#define TARGET_ZBS ((riscv_bitmanip_subext & MASK_ZBS) != 0)
+-#define TARGET_ZBC ((riscv_bitmanip_subext & MASK_ZBC) != 0)
++#define MASK_ZBA      (1 << 0)
++#define MASK_ZBB      (1 << 1)
++#define MASK_ZBC      (1 << 2)
++#define MASK_ZBS      (1 << 3)
++
++#define TARGET_ZBA ((riscv_zb_subext & MASK_ZBA) != 0)
++#define TARGET_ZBB ((riscv_zb_subext & MASK_ZBB) != 0)
++#define TARGET_ZBS ((riscv_zb_subext & MASK_ZBS) != 0)
++#define TARGET_ZBC ((riscv_zb_subext & MASK_ZBC) != 0)
+ 
+ #define MASK_ZICSR    (1 << 0)
+ #define MASK_ZIFENCEI (1 << 1)
+diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt
+index 0e73e2ab758..7f7e1c4f50b 100644
+--- a/gcc/config/riscv/riscv.opt
++++ b/gcc/config/riscv/riscv.opt
+@@ -136,8 +136,6 @@ Mask(64BIT)
+ 
+ Mask(MUL)
+ 
+-Mask(BITMANIP)
+-
+ Mask(ATOMIC)
+ 
+ Mask(HARD_FLOAT)
+@@ -198,7 +196,7 @@ TargetVariable
+ int riscv_zi_subext
+ 
+ TargetVariable
+-int riscv_bitmanip_subext
++int riscv_zb_subext
+ 
+ Enum
+ Name(isa_spec_class) Type(enum riscv_isa_spec_class)
+-- 
+2.33.1
+

+ 42 - 0
recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch

@@ -0,0 +1,42 @@
+From 12646c0899dec1b127ce71ebacf2571c1c7360f4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:26:37 +0400
+Subject: [PATCH] gcc: Fix argument list too long error.
+
+There would be an "Argument list too long" error when the
+build directory is longer than 200, this is caused by:
+
+headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u`
+
+The PLUGIN_HEADERS is too long before sort, so the "echo" can't handle
+it, use the $(sort list) of GNU make which can handle the too long list
+would fix the problem, the header would be short enough after sorted.
+The "tr ' ' '\012'" was used for translating the space to "\n", the
+$(sort list) doesn't need this.
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+RP: gcc then added *.h and *.def additions to this list, breaking the original
+fix. Add the sort to the original gcc code, leaving the tr+sort to fix the original
+issue but include the new files too as reported by Zhuang <qiuguang.zqg@alibaba-inc.com>
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 7da6f439fff..59c45c81393 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -3678,7 +3678,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
+ # We keep the directory structure for files in config, common/config or
+ # c-family and .def files. All other files are flattened to a single directory.
+ 	$(mkinstalldirs) $(DESTDIR)$(plugin_includedir)
+-	headers=`echo $(PLUGIN_HEADERS) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \
++	headers=`echo $(sort $(PLUGIN_HEADERS)) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \
+ 	srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
+ 	for file in $$headers; do \
+ 	  if [ -f $$file ] ; then \

+ 32 - 0
recipes-devtools/gcc/gcc/0012-replace-x_riscv_bitmanip_subext-with-x_riscv_bitmani.patch

@@ -0,0 +1,32 @@
+From 718c3eae9b25018221379210a0b14bb5e84d8cda Mon Sep 17 00:00:00 2001
+From: "max.ma" <max.ma@starfivetech.com>
+Date: Wed, 27 Oct 2021 23:06:15 -0700
+Subject: [PATCH 12/15] replace x_riscv_bitmanip_subext with
+ x_riscv_bitmanip_subext
+
+---
+ gcc/common/config/riscv/riscv-common.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c
+index a00b20e065a..569cea68461 100644
+--- a/gcc/common/config/riscv/riscv-common.c
++++ b/gcc/common/config/riscv/riscv-common.c
+@@ -913,10 +913,10 @@ static const riscv_ext_flag_table_t riscv_ext_flag_table[] =
+   {"zicsr",    &gcc_options::x_riscv_zi_subext, MASK_ZICSR},
+   {"zifencei", &gcc_options::x_riscv_zi_subext, MASK_ZIFENCEI},
+ 
+-  {"zba", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBA},
+-  {"zbb", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBB},
+-  {"zbs", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBS},
+-  {"zbc", &gcc_options::x_riscv_bitmanip_subext, MASK_ZBC},
++  {"zba", &gcc_options::riscv_zb_subext, MASK_ZBA},
++  {"zbb", &gcc_options::riscv_zb_subext, MASK_ZBB},
++  {"zbs", &gcc_options::riscv_zb_subext, MASK_ZBS},
++  {"zbc", &gcc_options::riscv_zb_subext, MASK_ZBC},
+   {NULL, NULL, 0}
+ };
+ 
+-- 
+2.33.1
+

+ 110 - 0
recipes-devtools/gcc/gcc/0013-Disable-sdt.patch

@@ -0,0 +1,110 @@
+From 7928a4eddc4a6d821a6aa6eaaea1fd60d54e3da9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:28:10 +0400
+Subject: [PATCH] Disable sdt.
+
+We don't list dtrace in DEPENDS so we shouldn't be depending on this header.
+It may or may not exist from preivous builds though. To be determinstic, disable
+sdt.h usage always. This avoids build failures if the header is removed after configure
+but before libgcc is compiled for example.
+
+RP 2012/8/7
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Disable sdt for libstdc++-v3.
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
+Upstream-Status: Inappropriate [hack]
+---
+ gcc/configure             | 12 ++++++------
+ gcc/configure.ac          | 18 +++++++++---------
+ libstdc++-v3/configure    |  6 +++---
+ libstdc++-v3/configure.ac |  2 +-
+ 4 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/gcc/configure b/gcc/configure
+index c5d3bc4ee2d..5160917d73e 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -30812,12 +30812,12 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
+ $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
+ have_sys_sdt_h=no
+-if test -f $target_header_dir/sys/sdt.h; then
+-  have_sys_sdt_h=yes
+-
+-$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
+-
+-fi
++#if test -f $target_header_dir/sys/sdt.h; then
++#  have_sys_sdt_h=yes
++#
++#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
++#
++#fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
+ $as_echo "$have_sys_sdt_h" >&6; }
+ 
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index f83420326d6..50f78308e8a 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -6653,15 +6653,15 @@ fi
+ AC_SUBST([enable_default_ssp])
+ 
+ # Test for <sys/sdt.h> on the target.
+-GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
+-AC_MSG_CHECKING(sys/sdt.h in the target C library)
+-have_sys_sdt_h=no
+-if test -f $target_header_dir/sys/sdt.h; then
+-  have_sys_sdt_h=yes
+-  AC_DEFINE(HAVE_SYS_SDT_H, 1,
+-            [Define if your target C library provides sys/sdt.h])
+-fi
+-AC_MSG_RESULT($have_sys_sdt_h)
++#GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
++#AC_MSG_CHECKING(sys/sdt.h in the target C library)
++#have_sys_sdt_h=no
++#if test -f $target_header_dir/sys/sdt.h; then
++#  have_sys_sdt_h=yes
++#  AC_DEFINE(HAVE_SYS_SDT_H, 1,
++#            [Define if your target C library provides sys/sdt.h])
++#fi
++#AC_MSG_RESULT($have_sys_sdt_h)
+ 
+ # Check if TFmode long double should be used by default or not.
+ # Some glibc targets used DFmode long double, but with glibc 2.4
+diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
+index a310e9feb6c..c879445b8a6 100755
+--- a/libstdc++-v3/configure
++++ b/libstdc++-v3/configure
+@@ -22014,11 +22014,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-  if test $glibcxx_cv_sys_sdt_h = yes; then
++#  if test $glibcxx_cv_sys_sdt_h = yes; then
+ 
+-$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
++#$as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
+ 
+-  fi
++#  fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_sys_sdt_h" >&5
+ $as_echo "$glibcxx_cv_sys_sdt_h" >&6; }
+ 
+diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
+index 3c799be82b1..3f63a8ec9ce 100644
+--- a/libstdc++-v3/configure.ac
++++ b/libstdc++-v3/configure.ac
+@@ -240,7 +240,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
+ GLIBCXX_CHECK_SC_NPROC_ONLN
+ GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
+ GLIBCXX_CHECK_SYSCTL_HW_NCPU
+-GLIBCXX_CHECK_SDT_H
++#GLIBCXX_CHECK_SDT_H
+ 
+ # Check for available headers.
+ AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \

+ 24 - 0
recipes-devtools/gcc/gcc/0013-remove-b-gcc-options.patch

@@ -0,0 +1,24 @@
+From e4a5e8cfb91dab067e8f224046e085f8faaa4b93 Mon Sep 17 00:00:00 2001
+From: "max.ma" <max.ma@starfivetech.com>
+Date: Thu, 28 Oct 2021 02:10:21 -0700
+Subject: [PATCH 13/15] remove b gcc options
+
+---
+ gcc/common/config/riscv/riscv-common.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c
+index 569cea68461..6a3bda64e68 100644
+--- a/gcc/common/config/riscv/riscv-common.c
++++ b/gcc/common/config/riscv/riscv-common.c
+@@ -908,7 +908,6 @@ static const riscv_ext_flag_table_t riscv_ext_flag_table[] =
+   {"f", &gcc_options::x_target_flags, MASK_HARD_FLOAT},
+   {"d", &gcc_options::x_target_flags, MASK_DOUBLE_FLOAT},
+   {"c", &gcc_options::x_target_flags, MASK_RVC},
+-  {"b", &gcc_options::x_target_flags, MASK_BITMANIP},
+ 
+   {"zicsr",    &gcc_options::x_riscv_zi_subext, MASK_ZICSR},
+   {"zifencei", &gcc_options::x_riscv_zi_subext, MASK_ZIFENCEI},
+-- 
+2.33.1
+

+ 31 - 0
recipes-devtools/gcc/gcc/0014-fix-incorrect-subext-name.patch

@@ -0,0 +1,31 @@
+From 2b5f08aa28efa2ee545eb1f49d147b0d39b4b695 Mon Sep 17 00:00:00 2001
+From: "max.ma" <max.ma@starfivetech.com>
+Date: Thu, 28 Oct 2021 16:54:05 -0700
+Subject: [PATCH 14/15] fix incorrect subext name
+
+---
+ gcc/common/config/riscv/riscv-common.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gcc/common/config/riscv/riscv-common.c b/gcc/common/config/riscv/riscv-common.c
+index 6a3bda64e68..0927554d506 100644
+--- a/gcc/common/config/riscv/riscv-common.c
++++ b/gcc/common/config/riscv/riscv-common.c
+@@ -912,10 +912,10 @@ static const riscv_ext_flag_table_t riscv_ext_flag_table[] =
+   {"zicsr",    &gcc_options::x_riscv_zi_subext, MASK_ZICSR},
+   {"zifencei", &gcc_options::x_riscv_zi_subext, MASK_ZIFENCEI},
+ 
+-  {"zba", &gcc_options::riscv_zb_subext, MASK_ZBA},
+-  {"zbb", &gcc_options::riscv_zb_subext, MASK_ZBB},
+-  {"zbs", &gcc_options::riscv_zb_subext, MASK_ZBS},
+-  {"zbc", &gcc_options::riscv_zb_subext, MASK_ZBC},
++  {"zba", &gcc_options::x_riscv_zb_subext, MASK_ZBA},
++  {"zbb", &gcc_options::x_riscv_zb_subext, MASK_ZBB},
++  {"zbs", &gcc_options::x_riscv_zb_subext, MASK_ZBS},
++  {"zbc", &gcc_options::x_riscv_zb_subext, MASK_ZBC},
+   {NULL, NULL, 0}
+ };
+ 
+-- 
+2.33.1
+

+ 39 - 0
recipes-devtools/gcc/gcc/0014-libtool.patch

@@ -0,0 +1,39 @@
+From a5b984db9669cf38a7bd76c3fcdb41c086f740db Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:29:11 +0400
+Subject: [PATCH] libtool
+
+libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64
+when running on am x86_64 build host.
+
+This patch stops this speading to libdir in the libstdc++.la file within libtool.
+Arguably, it shouldn't be passing this into libtool in the first place but
+for now this resolves the nastiest problems this causes.
+
+func_normal_abspath would resolve an empty path to `pwd` so we need
+to filter the zero case.
+
+RP 2012/8/24
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+---
+ ltmain.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index 70990740b6c..ee938056bef 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -6359,6 +6359,10 @@ func_mode_link ()
+ 	func_warning "ignoring multiple \`-rpath's for a libtool library"
+ 
+       install_libdir="$1"
++      if test -n "$install_libdir"; then
++	func_normal_abspath "$install_libdir"
++	install_libdir=$func_normal_abspath_result
++      fi
+ 
+       oldlibs=
+       if test -z "$rpath"; then

+ 127 - 0
recipes-devtools/gcc/gcc/0015-add-builtin-orc.b-clmul-clmulr-clmulh.patch

@@ -0,0 +1,127 @@
+From 7b4956f76d1f495d8c7b785c97682a36d852d184 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Thu, 4 Nov 2021 17:26:53 +0800
+Subject: [PATCH 15/15] add builtin orc.b/clmul/clmulr/clmulh
+
+---
+ gcc/config/riscv/riscv-builtins.c | 10 ++++++++
+ gcc/config/riscv/riscv-ftypes.def |  2 ++
+ gcc/config/riscv/riscv.md         | 40 ++++++++++++++++++++++++++++++-
+ 3 files changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/config/riscv/riscv-builtins.c b/gcc/config/riscv/riscv-builtins.c
+index 97b1480a15e..674e3f6dc04 100644
+--- a/gcc/config/riscv/riscv-builtins.c
++++ b/gcc/config/riscv/riscv-builtins.c
+@@ -40,6 +40,7 @@ along with GCC; see the file COPYING3.  If not see
+ /* Macros to create an enumeration identifier for a function prototype.  */
+ #define RISCV_FTYPE_NAME0(A) RISCV_##A##_FTYPE
+ #define RISCV_FTYPE_NAME1(A, B) RISCV_##A##_FTYPE_##B
++#define RISCV_FTYPE_NAME2(A, B, C) RISCV_##A##_FTYPE_##B##_##C
+ 
+ /* Classifies the prototype of a built-in function.  */
+ enum riscv_function_type {
+@@ -86,6 +87,8 @@ struct riscv_builtin_description {
+ };
+ 
+ AVAIL (hard_float, TARGET_HARD_FLOAT)
++AVAIL (zbb, TARGET_ZBB)
++AVAIL (zbc, TARGET_ZBC)
+ 
+ /* Construct a riscv_builtin_description from the given arguments.
+ 
+@@ -119,6 +122,7 @@ AVAIL (hard_float, TARGET_HARD_FLOAT)
+ /* Argument types.  */
+ #define RISCV_ATYPE_VOID void_type_node
+ #define RISCV_ATYPE_USI unsigned_intSI_type_node
++#define RISCV_ATYPE_SI intSI_type_node
+ 
+ /* RISCV_FTYPE_ATYPESN takes N RISCV_FTYPES-like type codes and lists
+    their associated RISCV_ATYPEs.  */
+@@ -126,8 +130,14 @@ AVAIL (hard_float, TARGET_HARD_FLOAT)
+   RISCV_ATYPE_##A
+ #define RISCV_FTYPE_ATYPES1(A, B) \
+   RISCV_ATYPE_##A, RISCV_ATYPE_##B
++#define RISCV_FTYPE_ATYPES2(A, B, C) \
++  RISCV_ATYPE_##A, RISCV_ATYPE_##B, RISCV_ATYPE_##C
+ 
+ static const struct riscv_builtin_description riscv_builtins[] = {
++  DIRECT_BUILTIN (orc_b, RISCV_SI_FTYPE_SI, zbb),
++  DIRECT_BUILTIN (clmul, RISCV_SI_FTYPE_SI_SI, zbc),
++  DIRECT_BUILTIN (clmulh, RISCV_SI_FTYPE_SI_SI, zbc),
++  DIRECT_BUILTIN (clmulr, RISCV_SI_FTYPE_SI_SI, zbc),
+   DIRECT_BUILTIN (frflags, RISCV_USI_FTYPE, hard_float),
+   DIRECT_NO_TARGET_BUILTIN (fsflags, RISCV_VOID_FTYPE_USI, hard_float)
+ };
+diff --git a/gcc/config/riscv/riscv-ftypes.def b/gcc/config/riscv/riscv-ftypes.def
+index b19b731bdf2..ab7348d1d7d 100644
+--- a/gcc/config/riscv/riscv-ftypes.def
++++ b/gcc/config/riscv/riscv-ftypes.def
+@@ -28,3 +28,5 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ DEF_RISCV_FTYPE (0, (USI))
+ DEF_RISCV_FTYPE (1, (VOID, USI))
++DEF_RISCV_FTYPE (1, (SI, SI))
++DEF_RISCV_FTYPE (2, (SI, SI, SI))
+\ No newline at end of file
+diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md
+index c3687d57047..26003ac5df7 100644
+--- a/gcc/config/riscv/riscv.md
++++ b/gcc/config/riscv/riscv.md
+@@ -170,7 +170,7 @@
+ (define_attr "type"
+   "unknown,branch,jump,call,load,fpload,store,fpstore,
+    mtc,mfc,const,arith,logical,shift,slt,imul,idiv,move,fmove,fadd,fmul,
+-   fmadd,fdiv,fcmp,fcvt,fsqrt,multi,auipc,sfb_alu,nop,ghost"
++   fmadd,fdiv,fcmp,fcvt,fsqrt,multi,auipc,sfb_alu,nop,ghost,bitmanip"
+   (cond [(eq_attr "got" "load") (const_string "load")
+ 
+ 	 ;; If a doubleword move uses these expensive instructions,
+@@ -2504,6 +2504,44 @@
+   [(set_attr "length" "0")]
+ )
+ 
++(define_insn "riscv_orc_b"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(sign_extend:SI (match_operand:SI 1 "register_operand" "r")))]
++  "TARGET_ZBB"
++  "orc.b\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "riscv_rev8"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(sign_extend:SI (match_operand:SI 1 "register_operand" "r")))]
++  "TARGET_ZBB"
++  "rev8\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "riscv_clmul"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(sign_extend:SI (rotate:SI (match_operand:SI 1 "register_operand" "r")
++				   (match_operand:SI 2 "register_operand" "r"))))]
++  "TARGET_ZBC"
++  "clmul\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "riscv_clmulh"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(sign_extend:SI (rotate:SI (match_operand:SI 1 "register_operand" "r")
++				   (match_operand:SI 2 "register_operand" "r"))))]
++  "TARGET_ZBC"
++  "clmulh\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "riscv_clmulr"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(sign_extend:SI (rotate:SI (match_operand:SI 1 "register_operand" "r")
++				   (match_operand:SI 2 "register_operand" "r"))))]
++  "TARGET_ZBC"
++  "clmulr\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
+ ;; This fixes a failure with gcc.c-torture/execute/pr64242.c at -O2 for a
+ ;; 32-bit target when using -mtune=sifive-7-series.  The first sched pass
+ ;; runs before register elimination, and we have a non-obvious dependency
+-- 
+2.33.1
+

+ 40 - 0
recipes-devtools/gcc/gcc/0015-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch

@@ -0,0 +1,40 @@
+From 0ae7090dec149cb2ff0c87eef87c043d4000ece1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:30:32 +0400
+Subject: [PATCH] gcc: armv4: pass fix-v4bx to linker to support EABI.
+
+The LINK_SPEC for linux gets overwritten by linux-eabi.h which
+means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result
+the option is not passed to linker when chosing march=armv4
+This patch redefines this in linux-eabi.h and reinserts it
+for eabi defaulting toolchains.
+
+We might want to send it upstream.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+---
+ gcc/config/arm/linux-eabi.h | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
+index 6bd95855827..77befab5da8 100644
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
+@@ -91,10 +91,14 @@
+ #define MUSL_DYNAMIC_LINKER \
+   "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}%{mfdpic:-fdpic}.so.1"
+ 
++/* For armv4 we pass --fix-v4bx to linker to support EABI */
++#undef TARGET_FIX_V4BX_SPEC
++#define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}"
++
+ /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
+    use the GNU/Linux version, not the generic BPABI version.  */
+ #undef  LINK_SPEC
+-#define LINK_SPEC EABI_LINK_SPEC					\
++#define LINK_SPEC TARGET_FIX_V4BX_SPEC EABI_LINK_SPEC			\
+   LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC,				\
+ 		       LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
+ 

+ 99 - 0
recipes-devtools/gcc/gcc/0016-Use-the-multilib-config-files-from-B-instead-of-usin.patch

@@ -0,0 +1,99 @@
+From 5ce8aa4615a3816d12c43752323154744517ae9f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 29 Mar 2013 09:33:04 +0400
+Subject: [PATCH] Use the multilib config files from ${B} instead of using the
+ ones from ${S}
+
+Use the multilib config files from ${B} instead of using the ones from ${S}
+so that the source can be shared between gcc-cross-initial,
+gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+---
+ gcc/configure    | 22 ++++++++++++++++++----
+ gcc/configure.ac | 22 ++++++++++++++++++----
+ 2 files changed, 36 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/configure b/gcc/configure
+index 5160917d73e..e663052cad2 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -13070,10 +13070,20 @@ done
+ tmake_file_=
+ for f in ${tmake_file}
+ do
+-	if test -f ${srcdir}/config/$f
+-	then
+-		tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
+-	fi
++  case $f in
++    */t-linux64 )
++       if test -f ./config/$f
++       then
++         tmake_file_="${tmake_file_} ./config/$f"
++       fi
++       ;;
++    * )
++       if test -f ${srcdir}/config/$f
++       then
++         tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
++       fi
++       ;;
++  esac
+ done
+ tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
+ 
+@@ -13084,6 +13094,10 @@ tm_file_list="options.h"
+ tm_include_list="options.h insn-constants.h"
+ for f in $tm_file; do
+   case $f in
++    */linux64.h )
++       tm_file_list="${tm_file_list} ./config/$f"
++       tm_include_list="${tm_include_list} ./config/$f"
++       ;;
+     ./* )
+        f=`echo $f | sed 's/^..//'`
+        tm_file_list="${tm_file_list} $f"
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 50f78308e8a..2b84875b028 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -2243,10 +2243,20 @@ done
+ tmake_file_=
+ for f in ${tmake_file}
+ do
+-	if test -f ${srcdir}/config/$f
+-	then
+-		tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
+-	fi
++  case $f in
++    */t-linux64 )
++       if test -f ./config/$f
++       then
++         tmake_file_="${tmake_file_} ./config/$f"
++       fi
++       ;;
++    * )
++       if test -f ${srcdir}/config/$f
++       then
++         tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
++       fi
++       ;;
++  esac
+ done
+ tmake_file="${tmake_file_}${omp_device_property_tmake_file}"
+ 
+@@ -2257,6 +2267,10 @@ tm_file_list="options.h"
+ tm_include_list="options.h insn-constants.h"
+ for f in $tm_file; do
+   case $f in
++    */linux64.h )
++       tm_file_list="${tm_file_list} ./config/$f"
++       tm_include_list="${tm_include_list} ./config/$f"
++       ;;
+     ./* )
+        f=`echo $f | sed 's/^..//'`
+        tm_file_list="${tm_file_list} $f"

+ 545 - 0
recipes-devtools/gcc/gcc/0016-merge-sifve-change-for-bitmanip.patch

@@ -0,0 +1,545 @@
+From e243539f72938317c85bb9859576c39b1baf011d Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Thu, 18 Nov 2021 14:25:18 +0800
+Subject: [PATCH 16/26] merge sifve change for bitmanip
+
+---
+ gcc/config/riscv/bitmanip.md | 446 ++++++++++++++---------------------
+ 1 file changed, 173 insertions(+), 273 deletions(-)
+
+diff --git a/gcc/config/riscv/bitmanip.md b/gcc/config/riscv/bitmanip.md
+index ceb5c89dd47..d2e1d6c936b 100644
+--- a/gcc/config/riscv/bitmanip.md
++++ b/gcc/config/riscv/bitmanip.md
+@@ -1,5 +1,5 @@
+ ;; Machine description for RISC-V Bit Manipulation operations.
+-;; Copyright (C) 2019 Free Software Foundation, Inc.
++;; Copyright (C) 2021 Free Software Foundation, Inc.
+ 
+ ;; This file is part of GCC.
+ 
+@@ -19,7 +19,7 @@
+ 
+ (define_code_iterator bitmanip_bitwise [and ior])
+ 
+-(define_code_iterator any_minmax [smin smax umin umax])
++(define_code_iterator bitmanip_minmax [smin umin smax umax])
+ 
+ (define_code_iterator clz_ctz_pcnt [clz ctz popcount])
+ 
+@@ -31,6 +31,7 @@
+ 				  (ctz "ctz")
+ 				  (popcount "popcount")])
+ 
++
+ (define_code_attr bitmanip_insn [(smin "min")
+ 				 (smax "max")
+ 				 (umin "minu")
+@@ -41,74 +42,206 @@
+ 
+ (define_mode_attr shiftm1 [(SI "const31_operand") (DI "const63_operand")])
+ 
++;; ZBA extension.
++
++(define_insn "*zero_extendsidi2_bitmanip"
++  [(set (match_operand:DI 0 "register_operand" "=r,r")
++	(zero_extend:DI (match_operand:SI 1 "nonimmediate_operand" "r,m")))]
++  "TARGET_64BIT && TARGET_ZBA"
++  "@
++   zext.w\t%0,%1
++   lwu\t%0,%1"
++  [(set_attr "type" "bitmanip,load")
++   (set_attr "mode" "DI")])
++
++(define_insn "*shNadd"
++  [(set (match_operand:X 0 "register_operand" "=r")
++	(plus:X (ashift:X (match_operand:X 1 "register_operand" "r")
++			  (match_operand:QI 2 "immediate_operand" "I"))
++		(match_operand:X 3 "register_operand" "r")))]
++  "TARGET_ZBA
++   && (INTVAL (operands[2]) >= 1) && (INTVAL (operands[2]) <= 3)"
++  "sh%2add\t%0,%1,%3"
++  [(set_attr "type" "bitmanip")
++   (set_attr "mode" "<X:MODE>")])
++
++(define_insn "*shNadduw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(plus:DI
++	  (and:DI (ashift:DI (match_operand:DI 1 "register_operand" "r")
++			     (match_operand:QI 2 "immediate_operand" "I"))
++		 (match_operand 3 "immediate_operand" ""))
++	  (match_operand:DI 4 "register_operand" "r")))]
++  "TARGET_64BIT && TARGET_ZBA
++   && (INTVAL (operands[2]) >= 1) && (INTVAL (operands[2]) <= 3)
++   && (INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff"
++  "sh%2add.uw\t%0,%1,%4"
++  [(set_attr "type" "bitmanip")
++   (set_attr "mode" "DI")])
++
++(define_insn "*add.uw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(plus:DI (zero_extend:DI
++		   (match_operand:SI 1 "register_operand" "r"))
++		 (match_operand:DI 2 "register_operand" "r")))]
++  "TARGET_64BIT && TARGET_ZBA"
++  "add.uw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")
++   (set_attr "mode" "DI")])
++
++(define_insn "*slliuw"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(and:DI (ashift:DI (match_operand:DI 1 "register_operand" "r")
++			   (match_operand:QI 2 "immediate_operand" "I"))
++		(match_operand 3 "immediate_operand" "")))]
++  "TARGET_64BIT && TARGET_ZBA
++   && (INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff"
++  "slli.uw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")
++   (set_attr "mode" "DI")])
++
++;; ZBB extension.
++
++(define_insn "*<optab>_not<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++        (bitmanip_bitwise:X (not:X (match_operand:X 1 "register_operand" "r"))
++                            (match_operand:X 2 "register_operand" "r")))]
++  "TARGET_ZBB"
++  "<insn>n\t%0,%2,%1"
++  [(set_attr "type" "bitmanip")
++   (set_attr "mode" "<X:MODE>")])
++
++(define_insn "*xor_not<mode>"
++  [(set (match_operand:X 0 "register_operand" "=r")
++        (not:X (xor:X (match_operand:X 1 "register_operand" "r")
++                      (match_operand:X 2 "register_operand" "r"))))]
++  "TARGET_ZBB"
++  "xnor\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")
++   (set_attr "mode" "<X:MODE>")])
++
+ (define_insn "<bitmanip_optab>si2"
+   [(set (match_operand:SI 0 "register_operand" "=r")
+-	(clz_ctz_pcnt:SI (match_operand:SI 1 "register_operand" "r")))]
++        (clz_ctz_pcnt:SI (match_operand:SI 1 "register_operand" "r")))]
+   "TARGET_ZBB"
+   { return TARGET_64BIT ? "<bitmanip_insn>w\t%0,%1" : "<bitmanip_insn>\t%0,%1"; }
+-  [(set_attr "type" "bitmanip")])
++  [(set_attr "type" "bitmanip")
++   (set_attr "mode" "SI")])
+ 
+-;; TODO: In theory zero_extend should be OK to combine too, since the output
+-;;       range is 0 ~ 32, zero_extend or sign_extend will get same result.
+ (define_insn "*<bitmanip_optab>disi2"
+   [(set (match_operand:DI 0 "register_operand" "=r")
+-	(sign_extend:DI
+-	  (clz_ctz_pcnt:SI (match_operand:SI 1 "register_operand" "r"))))]
++        (sign_extend:DI
++          (clz_ctz_pcnt:SI (match_operand:SI 1 "register_operand" "r"))))]
+   "TARGET_64BIT && TARGET_ZBB"
+   "<bitmanip_insn>w\t%0,%1"
+-  [(set_attr "type" "bitmanip")])
++  [(set_attr "type" "bitmanip")
++   (set_attr "mode" "SI")])
+ 
+ (define_insn "<bitmanip_optab>di2"
+   [(set (match_operand:DI 0 "register_operand" "=r")
+-	(clz_ctz_pcnt:DI (match_operand:DI 1 "register_operand" "r")))]
++        (clz_ctz_pcnt:DI (match_operand:DI 1 "register_operand" "r")))]
+   "TARGET_64BIT && TARGET_ZBB"
+   "<bitmanip_insn>\t%0,%1"
+-  [(set_attr "type" "bitmanip")])
++  [(set_attr "type" "bitmanip")
++   (set_attr "mode" "DI")])
+ 
+-(define_insn "*<optab>_not<mode>"
+-  [(set (match_operand:X 0 "register_operand" "=r")
+-	(bitmanip_bitwise:X (not:X (match_operand:X 1 "register_operand" "r"))
+-			    (match_operand:X 2 "register_operand" "r")))]
++(define_insn "*zero_extendhi<GPR:mode>2_bitmanip"
++  [(set (match_operand:GPR 0 "register_operand" "=r,r")
++        (zero_extend:GPR (match_operand:HI 1 "nonimmediate_operand" "r,m")))]
+   "TARGET_ZBB"
+-  "<insn>n\t%0,%2,%1"
+-  [(set_attr "type" "bitmanip")])
++  "@
++   zext.h\t%0,%1
++   lhu\t%0,%1"
++  [(set_attr "type" "bitmanip,load")
++   (set_attr "mode" "<GPR:MODE>")])
+ 
+-(define_insn "*xor_not<mode>"
+-  [(set (match_operand:X 0 "register_operand" "=r")
+-	(not:X (xor:X (match_operand:X 1 "register_operand" "r")
+-		      (match_operand:X 2 "register_operand" "r"))))]
++(define_insn "*extend<SHORT:mode><SUPERQI:mode>2_zbb"
++  [(set (match_operand:SUPERQI   0 "register_operand"     "=r,r")
++	(sign_extend:SUPERQI
++	    (match_operand:SHORT 1 "nonimmediate_operand" " r,m")))]
+   "TARGET_ZBB"
+-  "xnor\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+- 
+-;;; ??? pack
++  "@
++   sext.<SHORT:size>\t%0,%1
++   l<SHORT:size>\t%0,%1"
++  [(set_attr "type" "bitmanip,load")
++   (set_attr "mode" "<SUPERQI:MODE>")])
+ 
+-(define_insn "*zero_extendhi<GPR:mode>2_bitmanip"
+-  [(set (match_operand:GPR 0 "register_operand" "=r,r")
+-	(zero_extend:GPR (match_operand:HI 1 "nonimmediate_operand" "r,m")))]
++(define_insn "*zero_extendhi<GPR:mode>2_zbb"
++  [(set (match_operand:GPR    0 "register_operand"     "=r,r")
++	(zero_extend:GPR
++	    (match_operand:HI 1 "nonimmediate_operand" " r,m")))]
+   "TARGET_ZBB"
+   "@
+    zext.h\t%0,%1
+    lhu\t%0,%1"
+-  [(set_attr "type" "bitmanip,load")])
++  [(set_attr "type" "bitmanip,load")
++   (set_attr "mode" "HI")])
+ 
+-(define_insn "*zero_extendsidi2_bitmanip"
+-  [(set (match_operand:DI 0 "register_operand" "=r,r")
+-	(zero_extend:DI (match_operand:SI 1 "nonimmediate_operand" "r,m")))]
+-  "TARGET_64BIT && (TARGET_ZBB || TARGET_ZBA)"
+-  "@
+-   zext.w\t%0,%1
+-   lwu\t%0,%1"
+-  [(set_attr "type" "bitmanip,load")])
++(define_insn "rotrsi3"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(rotatert:SI (match_operand:SI 1 "register_operand" "r")
++		     (match_operand:QI 2 "arith_operand" "rI")))]
++  "TARGET_ZBB"
++  { return TARGET_64BIT ? "ror%i2w\t%0,%1,%2" : "ror%i2\t%0,%1,%2"; }
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "rotrdi3"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(rotatert:DI (match_operand:DI 1 "register_operand" "r")
++		     (match_operand:QI 2 "arith_operand" "rI")))]
++  "TARGET_64BIT && TARGET_ZBB"
++  "ror%i2\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "rotrsi3_sext"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(sign_extend:DI (rotatert:SI (match_operand:SI 1 "register_operand" "r")
++				     (match_operand:QI 2 "register_operand" "r"))))]
++  "TARGET_64BIT && TARGET_ZBB"
++  "rorw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "rotlsi3"
++  [(set (match_operand:SI 0 "register_operand" "=r")
++	(rotate:SI (match_operand:SI 1 "register_operand" "r")
++		   (match_operand:QI 2 "register_operand" "r")))]
++  "TARGET_ZBB"
++  { return TARGET_64BIT ? "rolw\t%0,%1,%2" : "rol\t%0,%1,%2"; }
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "rotldi3"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(rotate:DI (match_operand:DI 1 "register_operand" "r")
++		   (match_operand:QI 2 "register_operand" "r")))]
++  "TARGET_64BIT && TARGET_ZBB"
++  "rol\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "rotlsi3_sext"
++  [(set (match_operand:DI 0 "register_operand" "=r")
++	(sign_extend:DI (rotate:SI (match_operand:SI 1 "register_operand" "r")
++				   (match_operand:QI 2 "register_operand" "r"))))]
++  "TARGET_64BIT && TARGET_ZBB"
++  "rolw\t%0,%1,%2"
++  [(set_attr "type" "bitmanip")])
++
++(define_insn "bswap<mode>2"
++  [(set (match_operand:X 0 "register_operand" "=r")
++        (bswap:X (match_operand:X 1 "register_operand" "r")))]
++  "TARGET_64BIT && TARGET_ZBB"
++  "rev8\t%0,%1"
++  [(set_attr "type" "bitmanip")])
+ 
+ (define_insn "<bitmanip_optab><mode>3"
+   [(set (match_operand:X 0 "register_operand" "=r")
+-	(any_minmax:X (match_operand:X 1 "register_operand" "r")
+-		      (match_operand:X 2 "register_operand" "r")))]
++        (bitmanip_minmax:X (match_operand:X 1 "register_operand" "r")
++			   (match_operand:X 2 "register_operand" "r")))]
+   "TARGET_ZBB"
+   "<bitmanip_insn>\t%0,%1,%2"
+   [(set_attr "type" "bitmanip")])
+ 
++;; ZBS extension.
++
+ (define_insn "*bset<mode>"
+   [(set (match_operand:X 0 "register_operand" "=r")
+ 	(ior:X (ashift:X (const_int 1)
+@@ -155,41 +288,6 @@
+   "bseti\t%0,%1,%S2"
+   [(set_attr "type" "bitmanip")])
+ 
+-(define_insn "*bsetw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(sign_extend:DI
+-	 (subreg:SI
+-	  (ior:DI (subreg:DI
+-		   (ashift:SI (const_int 1)
+-			      (match_operand:QI 2 "register_operand" "r")) 0)
+-		  (match_operand:DI 1 "register_operand" "r")) 0)))]
+-  "TARGET_64BIT && TARGET_ZBS"
+-  "bsetw\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "*bsetw_mask"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(sign_extend:DI
+-	 (subreg:SI
+-	  (ior:DI (subreg:DI
+-		   (ashift:SI
+-		    (const_int 1)
+-		    (subreg:QI
+-		     (and:DI (match_operand:DI 2 "register_operand" "r")
+-			     (match_operand 3 "const31_operand" "i")) 0)) 0)
+-		  (match_operand:DI 1 "register_operand" "r")) 0)))]
+-  "TARGET_64BIT && TARGET_ZBS"
+-  "bsetw\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "*bsetiw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(ior:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
+-		(match_operand 2 "single_bit_mask_operand" "i")))]
+-  "TARGET_64BIT && TARGET_ZBS"
+-  "bsetiw\t%0,%1,%S2"
+-  [(set_attr "type" "bitmanip")])
+-
+ (define_insn "*bclr<mode>"
+   [(set (match_operand:X 0 "register_operand" "=r")
+ 	(and:X (rotate:X (const_int -2)
+@@ -207,27 +305,6 @@
+   "bclri\t%0,%1,%T2"
+   [(set_attr "type" "bitmanip")])
+ 
+-(define_insn "*bclrw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(sign_extend:DI
+-	 (subreg:SI
+-	  (and:DI
+-	   (not:DI (subreg:DI
+-		    (ashift:SI (const_int 1)
+-			       (match_operand:QI 2 "register_operand" "r")) 0))
+-	   (match_operand:DI 1 "register_operand" "r")) 0)))]
+-  "TARGET_64BIT && TARGET_ZBS"
+-  "bclrw\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "*bclriw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(and:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
+-		(match_operand 2 "not_single_bit_mask_operand" "i")))]
+-  "TARGET_64BIT && TARGET_ZBS"
+-  "bclriw\t%0,%1,%T2"
+-  [(set_attr "type" "bitmanip")])
+-
+ (define_insn "*binv<mode>"
+   [(set (match_operand:X 0 "register_operand" "=r")
+ 	(xor:X (ashift:X (const_int 1)
+@@ -245,26 +322,6 @@
+   "binvi\t%0,%1,%S2"
+   [(set_attr "type" "bitmanip")])
+ 
+-(define_insn "*binvw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(sign_extend:DI
+-	 (subreg:SI
+-	  (xor:DI (subreg:DI
+-		   (ashift:SI (const_int 1)
+-			      (match_operand:QI 2 "register_operand" "r")) 0)
+-		  (match_operand:DI 1 "register_operand" "r")) 0)))]
+-  "TARGET_64BIT && TARGET_ZBS"
+-  "binvw\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "*binviw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(xor:DI (sign_extend:DI (match_operand:SI 1 "register_operand" "r"))
+-		(match_operand 2 "single_bit_mask_operand" "i")))]
+-  "TARGET_64BIT && TARGET_ZBS"
+-  "binviw\t%0,%1,%S2"
+-  [(set_attr "type" "bitmanip")])
+-
+ (define_insn "*bext<mode>"
+   [(set (match_operand:X 0 "register_operand" "=r")
+ 	(zero_extract:X (match_operand:X 1 "register_operand" "r")
+@@ -282,161 +339,4 @@
+ 			(match_operand 2 "immediate_operand" "i")))]
+   "TARGET_ZBS"
+   "bexti\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "*bextw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(and:DI
+-	 (subreg:DI
+-	  (lshiftrt:SI (match_operand:SI 1 "register_operand" "r")
+-		       (match_operand:QI 2 "register_operand" "r")) 0)
+-	 (const_int 1)))]
+-  "TARGET_64BIT && TARGET_ZBS"
+-  "bextw\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-;;; ??? s[lr]o*
+-
+-(define_insn "rotrsi3"
+-  [(set (match_operand:SI 0 "register_operand" "=r")
+-	(rotatert:SI (match_operand:SI 1 "register_operand" "r")
+-		     (match_operand:QI 2 "arith_operand" "rI")))]
+-  "TARGET_ZBB"
+-  { return TARGET_64BIT ? "ror%i2w\t%0,%1,%2" : "ror%i2\t%0,%1,%2"; }
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "rotrdi3"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(rotatert:DI (match_operand:DI 1 "register_operand" "r")
+-		     (match_operand:QI 2 "arith_operand" "rI")))]
+-  "TARGET_64BIT && TARGET_ZBB"
+-  "ror%i2\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_expand "riscv_rolw"
+-  [(match_operand:SI 0 "register_operand" "=r")
+-   (match_operand:SI 1 "register_operand" "r")
+-   (match_operand:SI 2 "register_operand" "r")]
+-  "TARGET_64BIT && TARGET_ZBB"
+-{
+-  emit_insn (gen_rotlsi3 (operands[0], operands[1], operands[2]));
+-  DONE;
+-})
+-
+-(define_insn "rotlsi3"
+-  [(set (match_operand:SI 0 "register_operand" "=r")
+-	(rotate:SI (match_operand:SI 1 "register_operand" "r")
+-		   (match_operand:QI 2 "register_operand" "r")))]
+-  "TARGET_ZBB"
+-  { return TARGET_64BIT ? "rolw\t%0,%1,%2" : "rol\t%0,%1,%2"; }
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "rotldi3"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(rotate:DI (match_operand:DI 1 "register_operand" "r")
+-		   (match_operand:QI 2 "register_operand" "r")))]
+-  "TARGET_64BIT && TARGET_ZBB"
+-  "rol\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "rotlsi3_sext"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(sign_extend:DI (rotate:SI (match_operand:SI 1 "register_operand" "r")
+-				   (match_operand:QI 2 "register_operand" "r"))))]
+-  "TARGET_64BIT && TARGET_ZBB"
+-  "rolw\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-;;; ??? grev
+-
+-(define_insn "bswapsi2"
+-  [(set (match_operand:SI 0 "register_operand" "=r")
+-        (bswap:SI (match_operand:SI 1 "register_operand" "r")))]
+-  "TARGET_ZBB"
+-{
+-  if (TARGET_64BIT)
+-    return TARGET_ZBB ? "rev8\t%0,%1\n\tsrai\t%0,%0,32" : "rev8.w\t%0,%1";
+-  else
+-    return "rev8\t%0,%1";
+-}
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "bswapdi2"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(bswap:DI (match_operand:DI 1 "register_operand" "r")))]
+-  "TARGET_64BIT && TARGET_ZBB"
+-  "rev8\t%0,%1"
+-  [(set_attr "type" "bitmanip")])
+-
+-;;; ??? shfl/unshfl
+-
+-;;; ??? bext/bdep
+-
+-;;; ??? clmul
+-
+-;;; ??? crc
+-
+-;;; ??? bmat
+-
+-;; ??? Can we do this by using the % communtative constraint?
+-
+-;;; ??? cmov
+-
+-;;; ??? fs[lr]
+-
+-(define_insn "*shNadd"
+-  [(set (match_operand:X 0 "register_operand" "=r")
+-	(plus:X (ashift:X (match_operand:X 1 "register_operand" "r")
+-			  (match_operand:QI 2 "immediate_operand" "I"))
+-		(match_operand:X 3 "register_operand" "r")))]
+-  "TARGET_ZBA
+-   && (INTVAL (operands[2]) >= 1) && (INTVAL (operands[2]) <= 3)"
+-  "sh%2add\t%0,%1,%3"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "*shNadduw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(plus:DI
+-	 (and:DI (ashift:DI (match_operand:DI 1 "register_operand" "r")
+-			    (match_operand:QI 2 "immediate_operand" "I"))
+-		 (match_operand 3 "immediate_operand" ""))
+-	 (match_operand:DI 4 "register_operand" "r")))]
+-  "TARGET_64BIT && TARGET_ZBA
+-   && (INTVAL (operands[2]) >= 1) && (INTVAL (operands[2]) <= 3)
+-   && (INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff"
+-  "sh%2add.uw\t%0,%1,%4"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "*add.uw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(plus:DI (zero_extend:DI
+-		  (match_operand:SI 1 "register_operand" "r"))
+-		 (match_operand:DI 2 "register_operand" "r")))]
+-  "TARGET_64BIT && TARGET_ZBA"
+-  "add.uw\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-(define_insn "*slliuw"
+-  [(set (match_operand:DI 0 "register_operand" "=r")
+-	(and:DI (ashift:DI (match_operand:DI 1 "register_operand" "r")
+-			   (match_operand:QI 2 "immediate_operand" "I"))
+-		(match_operand 3 "immediate_operand" "")))]
+-  "TARGET_64BIT && TARGET_ZBA
+-   && (INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff"
+-  "slli.uw\t%0,%1,%2"
+-  [(set_attr "type" "bitmanip")])
+-
+-;; ??? bfxp
+-
+-;; sext
+-
+-(define_insn "*extend<SHORT:mode><SUPERQI:mode>2_bitmanip"
+-  [(set (match_operand:SUPERQI 0 "register_operand" "=r,r")
+-	(sign_extend:SUPERQI
+-	    (match_operand:SHORT 1 "nonimmediate_operand" " r,m")))]
+-  "TARGET_ZBB"
+-  "@
+-   sext.<SHORT:size>\t%0,%1
+-   l<SHORT:size>\t%0,%1"
+-  [(set_attr "type" "bitmanip")
+-   (set_attr "length" "4")])
++  [(set_attr "type" "bitmanip")])
+\ No newline at end of file
+-- 
+2.33.1
+

+ 28 - 0
recipes-devtools/gcc/gcc/0017-Avoid-using-libdir-from-.la-which-usually-points-to-.patch

@@ -0,0 +1,28 @@
+From 75a1ce0265ca123f74f17a40ad8bd8f26d9c2ab3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Feb 2015 09:39:38 +0000
+Subject: [PATCH] Avoid using libdir from .la which usually points to a host
+ path
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ltmain.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index ee938056bef..9ebc7e3d1e0 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5628,6 +5628,9 @@ func_mode_link ()
+ 	    absdir="$abs_ladir"
+ 	    libdir="$abs_ladir"
+ 	  else
++	    # Instead of using libdir from .la which usually points to a host path,
++	    # use the path the .la is contained in.
++	    libdir="$abs_ladir"
+ 	    dir="$libdir"
+ 	    absdir="$libdir"
+ 	  fi

+ 208 - 0
recipes-devtools/gcc/gcc/0017-Implement-instruction-patterns-for-ZBA-extension.patch

@@ -0,0 +1,208 @@
+From 3b7112d4b773768af0da81e7c9575fc9a0d90062 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Thu, 18 Nov 2021 14:42:41 +0800
+Subject: [PATCH 17/26] Implement instruction patterns for ZBA extension
+
+---
+ gcc/config/riscv/riscv.md                     | 12 +++++--
+ gcc/testsuite/gcc.target/riscv/zba-adduw.c    | 12 +++++++
+ .../gcc.target/riscv/zba-shNadd-01.c          | 19 ++++++++++++
+ .../gcc.target/riscv/zba-shNadd-02.c          | 19 ++++++++++++
+ .../gcc.target/riscv/zba-shNadd-03.c          | 31 +++++++++++++++++++
+ gcc/testsuite/gcc.target/riscv/zba-slliuw.c   | 11 +++++++
+ gcc/testsuite/gcc.target/riscv/zba-zextw.c    | 10 ++++++
+ 7 files changed, 111 insertions(+), 3 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zba-adduw.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zba-shNadd-01.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zba-shNadd-02.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zba-shNadd-03.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zba-slliuw.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zba-zextw.c
+
+diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md
+index 26003ac5df7..34702af3aff 100644
+--- a/gcc/config/riscv/riscv.md
++++ b/gcc/config/riscv/riscv.md
+@@ -1057,11 +1057,16 @@
+ 
+ ;; Extension insns.
+ 
+-(define_insn_and_split "zero_extendsidi2"
++(define_expand "zero_extendsidi2"
++  [(set (match_operand:DI 0 "register_operand")
++	(zero_extend:DI (match_operand:SI 1 "nonimmediate_operand")))]
++  "TARGET_64BIT")
++
++(define_insn_and_split "*zero_extendsidi2_internal"
+   [(set (match_operand:DI     0 "register_operand"     "=r,r")
+ 	(zero_extend:DI
+ 	    (match_operand:SI 1 "nonimmediate_operand" " r,m")))]
+-  "TARGET_64BIT"
++  "TARGET_64BIT && !(TARGET_ZBA || TARGET_ZBB)"
+   "@
+    #
+    lwu\t%0,%1"
+@@ -1833,7 +1838,7 @@
+ 			   (match_operand:QI 2 "immediate_operand" "I"))
+ 		(match_operand 3 "immediate_operand" "")))
+    (clobber (match_scratch:DI 4 "=&r"))]
+-  "TARGET_64BIT
++  "TARGET_64BIT && !TARGET_ZBA
+    && ((INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff)"
+   "#"
+   "&& reload_completed"
+@@ -2642,6 +2647,7 @@
+   "<load>\t%3, %1\;<load>\t%0, %2\;xor\t%0, %3, %0\;li\t%3, 0"
+   [(set_attr "length" "12")])
+ 
++(include "bitmanip.md")
+ (include "sync.md")
+ (include "peephole.md")
+ (include "pic.md")
+diff --git a/gcc/testsuite/gcc.target/riscv/zba-adduw.c b/gcc/testsuite/gcc.target/riscv/zba-adduw.c
+new file mode 100644
+index 00000000000..480d62c884d
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zba-adduw.c
+@@ -0,0 +1,12 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zba_zbs -mabi=lp64 -O2" } */
++
++int foo(int n, unsigned char *arr, unsigned y){
++  int s = 0;
++  unsigned x = 0;
++  for (;x<n;x++)
++    s += arr[x+y];
++  return s;
++}
++
++/* { dg-final { scan-assembler "add.uw" } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zba-shNadd-01.c b/gcc/testsuite/gcc.target/riscv/zba-shNadd-01.c
+new file mode 100644
+index 00000000000..9893fb6c451
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zba-shNadd-01.c
+@@ -0,0 +1,19 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zba -mabi=lp64 -O2" } */
++
++long test_1(long a, long b)
++{
++  return a + (b << 1);
++}
++long test_2(long a, long b)
++{
++  return a + (b << 2);
++}
++long test_3(long a, long b)
++{
++  return a + (b << 3);
++}
++
++/* { dg-final { scan-assembler-times "sh1add" 1 } } */
++/* { dg-final { scan-assembler-times "sh2add" 1 } } */
++/* { dg-final { scan-assembler-times "sh3add" 1 } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zba-shNadd-02.c b/gcc/testsuite/gcc.target/riscv/zba-shNadd-02.c
+new file mode 100644
+index 00000000000..f025849dc27
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zba-shNadd-02.c
+@@ -0,0 +1,19 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv32gc_zba -mabi=ilp32 -O2" } */
++
++long test_1(long a, long b)
++{
++  return a + (b << 1);
++}
++long test_2(long a, long b)
++{
++  return a + (b << 2);
++}
++long test_3(long a, long b)
++{
++  return a + (b << 3);
++}
++
++/* { dg-final { scan-assembler-times "sh1add" 1 } } */
++/* { dg-final { scan-assembler-times "sh2add" 1 } } */
++/* { dg-final { scan-assembler-times "sh3add" 1 } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zba-shNadd-03.c b/gcc/testsuite/gcc.target/riscv/zba-shNadd-03.c
+new file mode 100644
+index 00000000000..ef75e7fc486
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zba-shNadd-03.c
+@@ -0,0 +1,31 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zba -mabi=lp64 -O2" } */
++
++/* RV64 only.  */
++int foos(short *x, int n){
++  return x[n];
++}
++int fooi(int *x, int n){
++  return x[n];
++}
++int fooll(long long *x, int n){
++  return x[n];
++}
++
++/* RV64 only.  */
++int ufoos(short *x, unsigned int n){
++  return x[n];
++}
++int ufooi(int *x, unsigned int n){
++  return x[n];
++}
++int ufooll(long long *x, unsigned int n){
++  return x[n];
++}
++
++/* { dg-final { scan-assembler-times "sh1add\t" 1 } } */
++/* { dg-final { scan-assembler-times "sh2add\t" 1 } } */
++/* { dg-final { scan-assembler-times "sh3add\t" 1 } } */
++/* { dg-final { scan-assembler-times "sh3add.uw" 1 } } */
++/* { dg-final { scan-assembler-times "sh3add.uw" 1 } } */
++/* { dg-final { scan-assembler-times "sh3add.uw" 1 } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zba-slliuw.c b/gcc/testsuite/gcc.target/riscv/zba-slliuw.c
+new file mode 100644
+index 00000000000..55ebc1c81ce
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zba-slliuw.c
+@@ -0,0 +1,11 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zba -mabi=lp64 -O2" } */
++
++long
++foo (long i)
++{
++  return (long)(unsigned int)i << 10;
++}
++/* XXX: This pattern need combine improvement or intermediate instruction
++ *      from zbs.   */
++/* { dg-final { scan-assembler-not "slli.uw" } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zba-zextw.c b/gcc/testsuite/gcc.target/riscv/zba-zextw.c
+new file mode 100644
+index 00000000000..e8cccd0e374
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zba-zextw.c
+@@ -0,0 +1,10 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zba_zbs -mabi=lp64 -O2" } */
++
++long
++foo (long i)
++{
++  return (long)(unsigned int)i;
++}
++/* XXX: This pattern require combine improvement.   */
++/* { dg-final { scan-assembler-not "slli.uw" } } */
+\ No newline at end of file
+-- 
+2.33.1
+

+ 119 - 0
recipes-devtools/gcc/gcc/0018-Cost-model-for-zba-extension.patch

@@ -0,0 +1,119 @@
+From b58a42aac28becb118a8482d41c4188e00ad0c3a Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Thu, 18 Nov 2021 14:55:04 +0800
+Subject: [PATCH 18/26] Cost model for zba extension
+
+---
+ gcc/config/riscv/riscv.c | 82 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 82 insertions(+)
+
+diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
+index 17cdf705c32..7d5e22d9fe2 100644
+--- a/gcc/config/riscv/riscv.c
++++ b/gcc/config/riscv/riscv.c
+@@ -1680,6 +1680,10 @@ riscv_extend_cost (rtx op, bool unsigned_p)
+     /* We can use ANDI.  */
+     return COSTS_N_INSNS (1);
+ 
++  /* ZBA provide zext.w.  */
++  if (TARGET_ZBA && TARGET_64BIT && unsigned_p && GET_MODE (op) == SImode)
++    return COSTS_N_INSNS (1);
++
+   if (!unsigned_p && GET_MODE (op) == SImode)
+     /* We can use SEXT.W.  */
+     return COSTS_N_INSNS (1);
+@@ -1753,6 +1757,22 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN
+       return false;
+ 
+     case AND:
++      /* slli.uw pattern for zba.  */
++      if (TARGET_ZBA && TARGET_64BIT && mode == DImode
++	  && GET_CODE (XEXP (x, 0)) == ASHIFT)
++	{
++	  rtx and_rhs = XEXP (x, 1);
++	  rtx ashift_lhs = XEXP (XEXP (x, 0), 0);
++	  rtx ashift_rhs = XEXP (XEXP (x, 0), 1);
++	  if (REG_P (ashift_lhs)
++	      && CONST_INT_P (ashift_rhs)
++	      && CONST_INT_P (and_rhs)
++	      && ((INTVAL (and_rhs) >> INTVAL (ashift_rhs)) == 0xffffffff))
++	    *total = COSTS_N_INSNS (1);
++	    return true;
++	}
++      gcc_fallthrough ();
++
+     case IOR:
+     case XOR:
+       /* Double-word operations use two single-word operations.  */
+@@ -1844,6 +1864,68 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN
+ 
+     case MINUS:
+     case PLUS:
++      /* add.uw pattern for zba.  */
++      if (TARGET_ZBA
++	  && (TARGET_64BIT && (mode == DImode))
++	  && GET_CODE (XEXP (x, 0)) == ZERO_EXTEND
++	  && REG_P (XEXP (XEXP (x, 0), 0))
++	  && GET_MODE (XEXP (XEXP (x, 0), 0)) == SImode)
++	{
++	  *total = COSTS_N_INSNS (1);
++	  return true;
++	}
++      /* shNadd pattern for zba.  */
++      if (TARGET_ZBA
++	  && ((!TARGET_64BIT && (mode == SImode)) ||
++	      (TARGET_64BIT && (mode == DImode)))
++	  && (GET_CODE (XEXP (x, 0)) == ASHIFT)
++	  && REG_P (XEXP (XEXP (x, 0), 0))
++	  && CONST_INT_P (XEXP (XEXP (x, 0), 0))
++	  && IN_RANGE (INTVAL (XEXP (XEXP (x, 0), 0)), 1, 3))
++	{
++	  *total = COSTS_N_INSNS (1);
++	  return true;
++	}
++      /* shNadd.uw pattern for zba.
++	 [(set (match_operand:DI 0 "register_operand" "=r")
++	       (plus:DI
++		 (and:DI (ashift:DI (match_operand:DI 1 "register_operand" "r")
++				    (match_operand:QI 2 "immediate_operand" "I"))
++			 (match_operand 3 "immediate_operand" ""))
++		 (match_operand:DI 4 "register_operand" "r")))]
++	 "TARGET_64BIT && TARGET_ZBA
++	  && (INTVAL (operands[2]) >= 1) && (INTVAL (operands[2]) <= 3)
++	  && (INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff"
++      */
++      if (TARGET_ZBA
++	  && (TARGET_64BIT && (mode == DImode))
++	  && (GET_CODE (XEXP (x, 0)) == AND)
++	  && (REG_P (XEXP (x, 1))))
++	{
++	  do {
++	    rtx and_lhs = XEXP (XEXP (x, 0), 0);
++	    rtx and_rhs = XEXP (XEXP (x, 0), 1);
++	    if (GET_CODE (and_lhs) != ASHIFT)
++	      break;
++	    if (!CONST_INT_P (and_rhs))
++	      break;
++
++	    rtx ashift_lhs = XEXP (and_lhs, 0);
++	    rtx ashift_rhs = XEXP (and_lhs, 1);
++
++	    if (!CONST_INT_P (ashift_rhs)
++		|| !IN_RANGE (INTVAL (ashift_rhs), 1, 3))
++	      break;
++
++	    if (CONST_INT_P (and_rhs)
++		&& ((INTVAL (and_rhs) >> INTVAL (ashift_rhs)) == 0xffffffff))
++	      {
++		*total = COSTS_N_INSNS (1);
++		return true;
++	      }
++	  } while (false);
++	}
++
+       if (float_mode_p)
+ 	*total = tune_param->fp_add[mode == DFmode];
+       else
+-- 
+2.33.1
+

+ 50 - 0
recipes-devtools/gcc/gcc/0018-export-CPP.patch

@@ -0,0 +1,50 @@
+From b6e229a13aebfbb3fe38c216fd51b68bf71cfa9c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Feb 2015 09:40:59 +0000
+Subject: [PATCH] export CPP
+
+The OE environment sets and exports CPP as being the target gcc. When
+building gcc-cross-canadian for a mingw targetted sdk, the following can be found
+in build.x86_64-pokysdk-mingw32.i586-poky-linux/build-x86_64-linux/libiberty/config.log:
+
+configure:3641: checking for _FILE_OFFSET_BITS value needed for large files
+configure:3666: gcc  -c -isystem/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe  conftest.c >&5
+configure:3666: $? = 0
+configure:3698: result: no
+configure:3786: checking how to run the C preprocessor
+configure:3856: result: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32
+configure:3876: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 conftest.c
+configure:3876: $? = 0
+
+Note this is a *build* target (in build-x86_64-linux) so it should be
+using the host "gcc", not x86_64-pokysdk-mingw32-gcc. Since the mingw32
+headers are very different, using the wrong cpp is a real problem. It is leaking
+into configure through the CPP variable. Ultimately this leads to build
+failures related to not being able to include a process.h file for pem-unix.c.
+
+The fix is to ensure we export a sane CPP value into the build
+environment when using build targets. We could define a CPP_FOR_BUILD value which may be
+the version which needs to be upstreamed but for now, this fix is good enough to
+avoid the problem.
+
+RP 22/08/2013
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 047be0255e2..af19589fa95 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -149,6 +149,7 @@ BUILD_EXPORTS = \
+ 	AR="$(AR_FOR_BUILD)"; export AR; \
+ 	AS="$(AS_FOR_BUILD)"; export AS; \
+ 	CC="$(CC_FOR_BUILD)"; export CC; \
++	CPP="$(CC_FOR_BUILD) -E"; export CPP; \
+ 	CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CXX="$(CXX_FOR_BUILD)"; export CXX; \

+ 57 - 0
recipes-devtools/gcc/gcc/0019-Ensure-target-gcc-headers-can-be-included.patch

@@ -0,0 +1,57 @@
+From 9b4eb0e18a953d79d20c78d3ba741af6d71ab9ca Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 20 Feb 2015 10:25:11 +0000
+Subject: [PATCH] Ensure target gcc headers can be included
+
+There are a few headers installed as part of the OpenEmbedded
+gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe
+built for the target architecture, these are within the target
+sysroot and not cross/nativesdk; thus they weren't able to be
+found by gcc with the existing search paths. Add support for
+picking up these headers under the sysroot supplied on the gcc
+command line in order to resolve this.
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/Makefile.in  | 2 ++
+ gcc/cppdefault.c | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 59c45c81393..9b17d120aa1 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -630,6 +630,7 @@ libexecdir = @libexecdir@
+ 
+ # Directory in which the compiler finds libraries etc.
+ libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
++libsubdir_target = $(target_noncanonical)/$(version)
+ # Directory in which the compiler finds executables
+ libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
+ # Directory in which all plugin resources are installed
+@@ -3016,6 +3017,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
+ 
+ PREPROCESSOR_DEFINES = \
+   -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
++  -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \
+   -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
+   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+   -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
+diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
+index c503d14fc3f..d54d6ce0076 100644
+--- a/gcc/cppdefault.c
++++ b/gcc/cppdefault.c
+@@ -64,6 +64,10 @@ const struct default_include cpp_include_defaults[]
+     /* This is the dir for gcc's private headers.  */
+     { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
+ #endif
++#ifdef GCC_INCLUDE_SUBDIR_TARGET
++    /* This is the dir for gcc's private headers under the specified sysroot.  */
++    { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 },
++#endif
+ #ifdef LOCAL_INCLUDE_DIR
+     /* /usr/local/include comes before the fixincluded header files.  */
+     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },

+ 274 - 0
recipes-devtools/gcc/gcc/0019-Implement-instruction-patterns-for-ZBB-extension.patch

@@ -0,0 +1,274 @@
+From adb47e7bb51c1725f36b9b92ba5b0bd2f7a1d74d Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Thu, 18 Nov 2021 15:16:54 +0800
+Subject: [PATCH 19/26] Implement instruction patterns for ZBB extension
+
+---
+ gcc/config/riscv/riscv.md                     | 21 ++++++++++---
+ .../gcc.target/riscv/zbb-andn-orn-xnor-01.c   | 21 +++++++++++++
+ .../gcc.target/riscv/zbb-andn-orn-xnor-02.c   | 21 +++++++++++++
+ gcc/testsuite/gcc.target/riscv/zbb-min-max.c  | 31 +++++++++++++++++++
+ .../gcc.target/riscv/zbb-rol-ror-01.c         | 16 ++++++++++
+ .../gcc.target/riscv/zbb-rol-ror-02.c         | 16 ++++++++++
+ .../gcc.target/riscv/zbb-rol-ror-03.c         | 17 ++++++++++
+ gcc/testsuite/gcc.target/riscv/zbbw.c         | 25 +++++++++++++++
+ 8 files changed, 163 insertions(+), 5 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbb-andn-orn-xnor-01.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbb-andn-orn-xnor-02.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbb-min-max.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbb-rol-ror-01.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbb-rol-ror-02.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbb-rol-ror-03.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbbw.c
+
+diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md
+index 34702af3aff..143a83eec83 100644
+--- a/gcc/config/riscv/riscv.md
++++ b/gcc/config/riscv/riscv.md
+@@ -170,7 +170,7 @@
+ (define_attr "type"
+   "unknown,branch,jump,call,load,fpload,store,fpstore,
+    mtc,mfc,const,arith,logical,shift,slt,imul,idiv,move,fmove,fadd,fmul,
+-   fmadd,fdiv,fcmp,fcvt,fsqrt,multi,auipc,sfb_alu,nop,ghost,bitmanip"
++   fmadd,fdiv,fcmp,fcvt,fsqrt,multi,auipc,sfb_alu,nop,ghost,bitmanip,rotate"
+   (cond [(eq_attr "got" "load") (const_string "load")
+ 
+ 	 ;; If a doubleword move uses these expensive instructions,
+@@ -1081,11 +1081,17 @@
+   [(set_attr "move_type" "shift_shift,load")
+    (set_attr "mode" "DI")])
+ 
+-(define_insn_and_split "zero_extendhi<GPR:mode>2"
++(define_expand "zero_extendhi<GPR:mode>2"
++  [(set (match_operand:GPR    0 "register_operand")
++	(zero_extend:GPR
++	    (match_operand:HI 1 "nonimmediate_operand")))]
++  "")
++
++(define_insn_and_split "*zero_extendhi<GPR:mode>2"
+   [(set (match_operand:GPR    0 "register_operand"     "=r,r")
+ 	(zero_extend:GPR
+ 	    (match_operand:HI 1 "nonimmediate_operand" " r,m")))]
+-  ""
++  "!TARGET_ZBB"
+   "@
+    #
+    lhu\t%0,%1"
+@@ -1132,11 +1138,16 @@
+   [(set_attr "move_type" "move,load")
+    (set_attr "mode" "DI")])
+ 
+-(define_insn_and_split "extend<SHORT:mode><SUPERQI:mode>2"
++(define_expand "extend<SHORT:mode><SUPERQI:mode>2"
++  [(set (match_operand:SUPERQI 0 "register_operand")
++	(sign_extend:SUPERQI (match_operand:SHORT 1 "nonimmediate_operand")))]
++  "")
++
++(define_insn_and_split "*extend<SHORT:mode><SUPERQI:mode>2"
+   [(set (match_operand:SUPERQI   0 "register_operand"     "=r,r")
+ 	(sign_extend:SUPERQI
+ 	    (match_operand:SHORT 1 "nonimmediate_operand" " r,m")))]
+-  ""
++  "!TARGET_ZBB"
+   "@
+    #
+    l<SHORT:size>\t%0,%1"
+diff --git a/gcc/testsuite/gcc.target/riscv/zbb-andn-orn-xnor-01.c b/gcc/testsuite/gcc.target/riscv/zbb-andn-orn-xnor-01.c
+new file mode 100644
+index 00000000000..0037dea5647
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbb-andn-orn-xnor-01.c
+@@ -0,0 +1,21 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbb -mabi=lp64 -O2" } */
++
++unsigned long long foo1(unsigned long long rs1, unsigned long long rs2)
++{
++return rs1 & ~rs2;
++}
++
++unsigned long long foo2(unsigned long long rs1, unsigned long long rs2)
++{
++return rs1 | ~rs2;
++}
++
++unsigned long long foo3(unsigned long long rs1, unsigned long long rs2)
++{
++return rs1 ^ ~rs2;
++}
++
++/* { dg-final { scan-assembler-times "andn" 2 } } */
++/* { dg-final { scan-assembler-times "orn" 2 } } */
++/* { dg-final { scan-assembler-times "xnor" 2 } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbb-andn-orn-xnor-02.c b/gcc/testsuite/gcc.target/riscv/zbb-andn-orn-xnor-02.c
+new file mode 100644
+index 00000000000..b0c1e40c554
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbb-andn-orn-xnor-02.c
+@@ -0,0 +1,21 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv32gc_zbb -mabi=ilp32 -O2" } */
++
++unsigned int foo1(unsigned int rs1, unsigned int rs2)
++{
++return rs1 & ~rs2;
++}
++
++unsigned int foo2(unsigned  int rs1, unsigned  int rs2)
++{
++return rs1 | ~rs2;
++}
++
++unsigned int foo3(unsigned int rs1, unsigned int rs2)
++{
++return rs1 ^ ~rs2;
++}
++
++/* { dg-final { scan-assembler-times "andn" 2 } } */
++/* { dg-final { scan-assembler-times "orn" 2 } } */
++/* { dg-final { scan-assembler-times "xnor" 2 } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbb-min-max.c b/gcc/testsuite/gcc.target/riscv/zbb-min-max.c
+new file mode 100644
+index 00000000000..dc72bb4ad71
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbb-min-max.c
+@@ -0,0 +1,31 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbb -mabi=lp64 -O2" } */
++
++long
++foo1 (long i, long j)
++{
++  return i < j ? i : j;
++}
++
++long
++foo2 (long i, long j)
++{
++  return i > j ? i : j;
++}
++
++unsigned long
++foo3 (unsigned long i, unsigned long j)
++{
++  return i < j ? i : j;
++}
++
++unsigned long
++foo4 (unsigned long i, unsigned long j)
++{
++  return i > j ? i : j;
++}
++
++/* { dg-final { scan-assembler-times "min" 3 } } */
++/* { dg-final { scan-assembler-times "max" 3 } } */
++/* { dg-final { scan-assembler-times "minu" 1 } } */
++/* { dg-final { scan-assembler-times "maxu" 1 } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbb-rol-ror-01.c b/gcc/testsuite/gcc.target/riscv/zbb-rol-ror-01.c
+new file mode 100644
+index 00000000000..958966289df
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbb-rol-ror-01.c
+@@ -0,0 +1,16 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbb -mabi=lp64 -O2" } */
++
++unsigned long foo1(unsigned long rs1, unsigned long rs2)
++{
++    long shamt = rs2 & (64 - 1);
++    return (rs1 << shamt) | (rs1 >> ((64 - shamt) & (64 - 1)));
++}
++unsigned long foo2(unsigned long rs1, unsigned long rs2)
++{
++    unsigned long shamt = rs2 & (64 - 1);
++    return (rs1 >> shamt) | (rs1 << ((64 - shamt) & (64 - 1)));
++}
++
++/* { dg-final { scan-assembler-times "rol" 2 } } */
++/* { dg-final { scan-assembler-times "ror" 2 } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbb-rol-ror-02.c b/gcc/testsuite/gcc.target/riscv/zbb-rol-ror-02.c
+new file mode 100644
+index 00000000000..24b482f2145
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbb-rol-ror-02.c
+@@ -0,0 +1,16 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv32gc_zbb -mabi=ilp32 -O2" } */
++
++unsigned int foo1(unsigned int rs1, unsigned int rs2)
++{
++    unsigned int shamt = rs2 & (32 - 1);
++    return (rs1 << shamt) | (rs1 >> ((32 - shamt) & (32 - 1)));
++}
++unsigned int foo2(unsigned int rs1, unsigned int rs2)
++{
++    unsigned int shamt = rs2 & (32 - 1);
++    return (rs1 >> shamt) | (rs1 << ((32 - shamt) & (32 - 1)));
++}
++
++/* { dg-final { scan-assembler-times "rol" 2 } } */
++/* { dg-final { scan-assembler-times "ror" 2 } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbb-rol-ror-03.c b/gcc/testsuite/gcc.target/riscv/zbb-rol-ror-03.c
+new file mode 100644
+index 00000000000..ffde7c9cd58
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbb-rol-ror-03.c
+@@ -0,0 +1,17 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbb -mabi=lp64 -O2" } */
++
++/* RV64 only*/
++unsigned int rol(unsigned int rs1, unsigned int rs2)
++{
++    int shamt = rs2 & (32 - 1);
++    return (rs1 << shamt) | (rs1 >> ((64 - shamt) & (32 - 1)));
++}
++unsigned int ror(unsigned int rs1, unsigned int rs2)
++{
++    int shamt = rs2 & (64 - 1);
++    return (rs1 >> shamt) | (rs1 << ((32 - shamt) & (32 - 1)));
++}
++
++/* { dg-final { scan-assembler-times "rolw" 1 } } */
++/* { dg-final { scan-assembler-times "rorw" 1 } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbbw.c b/gcc/testsuite/gcc.target/riscv/zbbw.c
+new file mode 100644
+index 00000000000..ed88ca5cceb
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbbw.c
+@@ -0,0 +1,25 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbb -mabi=lp64 -O2" } */
++
++int
++clz (int i)
++{
++  return __builtin_clz (i);
++}
++
++int
++ctz (int i)
++{
++  return __builtin_ctz (i);
++}
++
++int
++popcount (int i)
++{
++  return __builtin_popcount (i);
++}
++
++
++/* { dg-final { scan-assembler-times "clzw" 1 } } */
++/* { dg-final { scan-assembler-times "ctzw" 1 } } */
++/* { dg-final { scan-assembler-times "cpopw" 1 } } */
+\ No newline at end of file
+-- 
+2.33.1
+

+ 48 - 0
recipes-devtools/gcc/gcc/0020-Cost-model-for-zbb-extension.patch

@@ -0,0 +1,48 @@
+From c1eaf07b4e8a7ea6c3f053003a8ebd9a1e933f22 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Thu, 18 Nov 2021 15:37:45 +0800
+Subject: [PATCH 20/26] Cost model for zbb extension
+
+---
+ gcc/config/riscv/riscv.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
+index 7d5e22d9fe2..bf91d8c7371 100644
+--- a/gcc/config/riscv/riscv.c
++++ b/gcc/config/riscv/riscv.c
+@@ -1684,6 +1684,16 @@ riscv_extend_cost (rtx op, bool unsigned_p)
+   if (TARGET_ZBA && TARGET_64BIT && unsigned_p && GET_MODE (op) == SImode)
+     return COSTS_N_INSNS (1);
+ 
++  /* ZBB provide zext.h, sext.b and sext.h.  */
++  if (TARGET_ZBB)
++    {
++      if (!unsigned_p && GET_MODE (op) == QImode)
++	return COSTS_N_INSNS (1);
++
++      if (GET_MODE (op) == HImode)
++	return COSTS_N_INSNS (1);
++    }
++
+   if (!unsigned_p && GET_MODE (op) == SImode)
+     /* We can use SEXT.W.  */
+     return COSTS_N_INSNS (1);
+@@ -1775,6 +1785,14 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN
+ 
+     case IOR:
+     case XOR:
++      /* orn, andn and xorn pattern for zbb.  */
++      if (TARGET_ZBB
++	  && GET_CODE (XEXP (x, 0)) == NOT)
++	{
++	  *total = riscv_binary_cost (x, 1, 2);
++	  return true;
++	}
++
+       /* Double-word operations use two single-word operations.  */
+       *total = riscv_binary_cost (x, 1, 2);
+       return false;
+-- 
+2.33.1
+

+ 35 - 0
recipes-devtools/gcc/gcc/0020-Don-t-search-host-directory-during-relink-if-inst_pr.patch

@@ -0,0 +1,35 @@
+From cd09adb1e7f2a7e81a9f595a17c36f24911b90ac Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 3 Mar 2015 08:21:19 +0000
+Subject: [PATCH] Don't search host directory during "relink" if $inst_prefix
+ is provided
+
+http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html
+
+Upstream-Status: Submitted
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ ltmain.sh | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index 9ebc7e3d1e0..7ea79fa8be6 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -6004,12 +6004,13 @@ func_mode_link ()
+ 	      fi
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
++	      # Default if $libdir is not relative to the prefix:
+ 	      add_dir="-L$libdir"
+-	      # Try looking first in the location we're being installed to.
++
+ 	      if test -n "$inst_prefix_dir"; then
+ 		case $libdir in
+ 		  [\\/]*)
+-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		    add_dir="-L$inst_prefix_dir$libdir"
+ 		    ;;
+ 		esac
+ 	      fi

+ 26 - 0
recipes-devtools/gcc/gcc/0021-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch

@@ -0,0 +1,26 @@
+From 7faad21154a76b200efcced9e12945057c94dff3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 28 Apr 2015 23:15:27 -0700
+Subject: [PATCH] Use SYSTEMLIBS_DIR replacement instead of hardcoding
+ base_libdir
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/aarch64/aarch64-linux.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
+index 7f2529a2a1d..5303b39186f 100644
+--- a/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -21,7 +21,7 @@
+ #ifndef GCC_AARCH64_LINUX_H
+ #define GCC_AARCH64_LINUX_H
+ 
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
++#define GLIBC_DYNAMIC_LINKER  SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"

+ 108 - 0
recipes-devtools/gcc/gcc/0021-Use-li-and-rori-to-load-constants.patch

@@ -0,0 +1,108 @@
+From b302f25e1f472cfe8b8e1867fc7499757c6ec4f0 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Thu, 18 Nov 2021 15:47:00 +0800
+Subject: [PATCH 21/26] Use li and rori to load constants
+
+---
+ gcc/config/riscv/riscv.c                     | 41 ++++++++++++++++++++
+ gcc/testsuite/gcc.target/riscv/zbb-li-rotr.c | 35 +++++++++++++++++
+ 2 files changed, 76 insertions(+)
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbb-li-rotr.c
+
+diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
+index bf91d8c7371..9e45c1ff9be 100644
+--- a/gcc/config/riscv/riscv.c
++++ b/gcc/config/riscv/riscv.c
+@@ -439,6 +439,47 @@ riscv_build_integer_1 (struct riscv_integer_op codes[RISCV_MAX_INTEGER_OPS],
+ 	}
+     }
+ 
++  if (cost > 2 && TARGET_64BIT && TARGET_ZBB)
++    {
++      int leading_ones = clz_hwi (~value);
++      int trailing_ones = ctz_hwi (~value);
++
++      /* If all bits are one except a few that are zero, and the zero bits
++	 are within a range of 11 bits, and at least one of the upper 32-bits
++	 is a zero, then we can generate a constant by loading a small
++	 negative constant and rotating.  */
++      if (leading_ones < 32
++	  && ((64 - leading_ones - trailing_ones) < 12))
++	{
++	  codes[0].code = UNKNOWN;
++	  /* The sign-bit might be zero, so just rotate to be safe.  */
++	  codes[0].value = (((unsigned HOST_WIDE_INT) value >> trailing_ones)
++			    | (value << (64 - trailing_ones)));
++	  codes[1].code = ROTATERT;
++	  codes[1].value = 64 - trailing_ones;
++	  cost = 2;
++	}
++      /* Handle the case where the 11 bit range of zero bits wraps around.  */
++      else
++	{
++	  int upper_trailing_ones = ctz_hwi (~value >> 32);
++	  int lower_leading_ones = clz_hwi (~value << 32);
++
++	  if (upper_trailing_ones < 32 && lower_leading_ones < 32
++	      && ((64 - upper_trailing_ones - lower_leading_ones) < 12))
++	    {
++	      codes[0].code = UNKNOWN;
++	      /* The sign-bit might be zero, so just rotate to be safe.  */
++	      codes[0].value = ((value << (32 - upper_trailing_ones))
++				| ((unsigned HOST_WIDE_INT) value
++				   >> (32 + upper_trailing_ones)));
++	      codes[1].code = ROTATERT;
++	      codes[1].value = 32 - upper_trailing_ones;
++	      cost = 2;
++	    }
++	}
++    }
++
+   gcc_assert (cost <= RISCV_MAX_INTEGER_OPS);
+   return cost;
+ }
+diff --git a/gcc/testsuite/gcc.target/riscv/zbb-li-rotr.c b/gcc/testsuite/gcc.target/riscv/zbb-li-rotr.c
+new file mode 100644
+index 00000000000..ab8138cd874
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbb-li-rotr.c
+@@ -0,0 +1,35 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbb -mabi=lp64 -O2" } */
++
++long
++li_rori (void)
++{
++  return 0xffff77ffffffffffL;
++}
++
++long
++li_rori_2 (void)
++{
++  return 0x77ffffffffffffffL;
++}
++
++long
++li_rori_3 (void)
++{
++  return 0xfffffffeefffffffL;
++}
++
++long
++li_rori_4 (void)
++{
++  return 0x5ffffffffffffff5L;
++}
++
++long
++li_rori_5 (void)
++{
++  return 0xaffffffffffffffaL;
++}
++
++
++/* { dg-final { scan-assembler-times "rori\t" 5 } } */
+\ No newline at end of file
+-- 
+2.33.1
+

+ 297 - 0
recipes-devtools/gcc/gcc/0022-Implement-instruction-patterns-for-ZBS-extension.patch

@@ -0,0 +1,297 @@
+From d3bc6ead74d78d367c0d6cc53efc57c05d8133e9 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Thu, 18 Nov 2021 16:08:45 +0800
+Subject: [PATCH 22/26] Implement instruction patterns for ZBS extension
+
+---
+ gcc/config/riscv/predicates.md              | 22 +++++++++++
+ gcc/config/riscv/riscv.c                    | 37 ++++++++++++++++++-
+ gcc/config/riscv/riscv.h                    |  8 ++++
+ gcc/testsuite/gcc.target/riscv/zba-slliuw.c |  4 +-
+ gcc/testsuite/gcc.target/riscv/zbs-bclr.c   | 20 ++++++++++
+ gcc/testsuite/gcc.target/riscv/zbs-bext.c   | 20 ++++++++++
+ gcc/testsuite/gcc.target/riscv/zbs-binv.c   | 20 ++++++++++
+ gcc/testsuite/gcc.target/riscv/zbs-bset.c   | 41 +++++++++++++++++++++
+ 8 files changed, 168 insertions(+), 4 deletions(-)
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbs-bclr.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbs-bext.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbs-binv.c
+ create mode 100644 gcc/testsuite/gcc.target/riscv/zbs-bset.c
+
+diff --git a/gcc/config/riscv/predicates.md b/gcc/config/riscv/predicates.md
+index 23211513554..7a079ebd175 100644
+--- a/gcc/config/riscv/predicates.md
++++ b/gcc/config/riscv/predicates.md
+@@ -74,6 +74,11 @@
+   if (GET_MODE_SIZE (mode) > UNITS_PER_WORD)
+     return false;
+ 
++  /* Check whether the constant can be loaded in a single
++     instruction with zbs extensions.  */
++  if (TARGET_64BIT && TARGET_ZBS && SINGLE_BIT_MASK_OPERAND (INTVAL (op)))
++    return false;
++
+   /* Otherwise check whether the constant can be loaded in a single
+      instruction.  */
+   return !LUI_OPERAND (INTVAL (op)) && !SMALL_OPERAND (INTVAL (op));
+@@ -217,3 +222,20 @@
+ {
+   return riscv_gpr_save_operation_p (op);
+ })
++
++;; Predicates for the ZBS extension.
++(define_predicate "single_bit_mask_operand"
++  (and (match_code "const_int")
++       (match_test "pow2p_hwi (INTVAL (op))")))
++
++(define_predicate "not_single_bit_mask_operand"
++  (and (match_code "const_int")
++       (match_test "pow2p_hwi (~INTVAL (op))")))
++
++(define_predicate "const31_operand"
++  (and (match_code "const_int")
++       (match_test "INTVAL (op) == 31")))
++
++(define_predicate "const63_operand"
++  (and (match_code "const_int")
++       (match_test "INTVAL (op) == 63")))
+\ No newline at end of file
+diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
+index 9e45c1ff9be..0978666a366 100644
+--- a/gcc/config/riscv/riscv.c
++++ b/gcc/config/riscv/riscv.c
+@@ -388,6 +388,14 @@ riscv_build_integer_1 (struct riscv_integer_op codes[RISCV_MAX_INTEGER_OPS],
+       return 1;
+     }
+ 
++  if (TARGET_ZBS && SINGLE_BIT_MASK_OPERAND (value))
++    {
++      /* Simply BSETI.  */
++      codes[0].code = UNKNOWN;
++      codes[0].value = value;
++      return 1;
++    }
++
+   /* End with ADDI.  When constructing HImode constants, do not generate any
+      intermediate value that is not itself a valid HImode constant.  The
+      XORI case below will handle those remaining HImode constants.  */
+@@ -2199,7 +2207,17 @@ riscv_output_move (rtx dest, rtx src)
+ 	  }
+ 
+       if (src_code == CONST_INT)
+-	return "li\t%0,%1";
++  	{
++  	  if (SMALL_OPERAND (INTVAL (src)) || LUI_OPERAND (INTVAL (src)))
++  	    return "li\t%0,%1";
++  
++  	  if (TARGET_ZBS
++  	      && SINGLE_BIT_MASK_OPERAND (INTVAL (src)))
++  	    return "bseti\t%0,zero,%S1";
++  
++  	  /* Should never reach here.  */
++  	  abort ();
++  	}
+ 
+       if (src_code == HIGH)
+ 	return "lui\t%0,%h1";
+@@ -3543,7 +3561,9 @@ riscv_memmodel_needs_release_fence (enum memmodel model)
+    'A'	Print the atomic operation suffix for memory model OP.
+    'F'	Print a FENCE if the memory model requires a release.
+    'z'	Print x0 if OP is zero, otherwise print OP normally.
+-   'i'	Print i if the operand is not a register.  */
++   'i'	Print i if the operand is not a register.
++   'S'	Print shift-index of single-bit mask OP.
++   'T'	Print shift-index of inverted single-bit mask OP.  */
+ 
+ static void
+ riscv_print_operand (FILE *file, rtx op, int letter)
+@@ -3583,6 +3603,19 @@ riscv_print_operand (FILE *file, rtx op, int letter)
+         fputs ("i", file);
+       break;
+ 
++    case 'S':
++      {
++      rtx newop = GEN_INT (ctz_hwi (INTVAL (op)));
++      output_addr_const (file, newop);
++      break;
++      }
++    case 'T':
++      {
++      rtx newop = GEN_INT (ctz_hwi (~INTVAL (op)));
++      output_addr_const (file, newop);
++      break;
++      }
++
+     default:
+       switch (code)
+ 	{
+diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
+index d17096e1dfa..ff6729aedac 100644
+--- a/gcc/config/riscv/riscv.h
++++ b/gcc/config/riscv/riscv.h
+@@ -521,6 +521,14 @@ enum reg_class
+   (((VALUE) | ((1UL<<31) - IMM_REACH)) == ((1UL<<31) - IMM_REACH)	\
+    || ((VALUE) | ((1UL<<31) - IMM_REACH)) + IMM_REACH == 0)
+ 
++/* If this is a single bit mask, then we can load it with bseti.  But this
++   is not useful for any of the low 31 bits because we can use addi or lui
++   to load them.  It is wrong for loading SImode 0x80000000 on rv64 because it
++   needs to be sign-extended.  So we restrict this to the upper 32-bits
++   only.  */
++#define SINGLE_BIT_MASK_OPERAND(VALUE) \
++  (pow2p_hwi (VALUE) && (ctz_hwi (VALUE) >= 32))
++
+ /* Stack layout; function entry, exit and calling.  */
+ 
+ #define STACK_GROWS_DOWNWARD 1
+diff --git a/gcc/testsuite/gcc.target/riscv/zba-slliuw.c b/gcc/testsuite/gcc.target/riscv/zba-slliuw.c
+index 55ebc1c81ce..2c86e446272 100644
+--- a/gcc/testsuite/gcc.target/riscv/zba-slliuw.c
++++ b/gcc/testsuite/gcc.target/riscv/zba-slliuw.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-march=rv64gc_zba -mabi=lp64 -O2" } */
++/* { dg-options "-march=rv64gc_zba_zbs -mabi=lp64 -O2" } */
+ 
+ long
+ foo (long i)
+@@ -8,4 +8,4 @@ foo (long i)
+ }
+ /* XXX: This pattern need combine improvement or intermediate instruction
+  *      from zbs.   */
+-/* { dg-final { scan-assembler-not "slli.uw" } } */
+\ No newline at end of file
++/* { dg-final { scan-assembler "slli.uw" } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbs-bclr.c b/gcc/testsuite/gcc.target/riscv/zbs-bclr.c
+new file mode 100644
+index 00000000000..fdf75b039b9
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbs-bclr.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbs -mabi=lp64 -O2" } */
++
++/* bclr */
++long
++foo0 (long i, long j)
++{
++  return i & ~(1L << j);
++}
++
++/* bclri */
++long
++foo1 (long i)
++{
++  return i & ~(1L << 20);
++}
++
++/* { dg-final { scan-assembler-times "bclr\t" 1 } } */
++/* { dg-final { scan-assembler-times "bclri\t" 1 } } */
++/* { dg-final { scan-assembler-not "andi" } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbs-bext.c b/gcc/testsuite/gcc.target/riscv/zbs-bext.c
+new file mode 100644
+index 00000000000..766a7c4423a
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbs-bext.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbs -mabi=lp64 -O2" } */
++
++/* bext */
++long
++foo0 (long i, long j)
++{
++  return 1L & (i >> j);
++}
++
++/* bexti */
++long
++foo1 (long i)
++{
++  return 1L & (i >> 20);
++}
++
++/* { dg-final { scan-assembler-times "bexti\t" 1 } } */
++/* { dg-final { scan-assembler-times "bext\t" 1 } } */
++/* { dg-final { scan-assembler-not "andi" } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbs-binv.c b/gcc/testsuite/gcc.target/riscv/zbs-binv.c
+new file mode 100644
+index 00000000000..d90a6301103
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbs-binv.c
+@@ -0,0 +1,20 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbs -mabi=lp64 -O2" } */
++
++/* binv */
++long
++foo0 (long i, long j)
++{
++  return i ^ (1L << j);
++}
++
++/* binvi */
++long
++foo1 (long i)
++{
++  return i ^ (1L << 20);
++}
++
++/* { dg-final { scan-assembler-times "binv\t" 1 } } */
++/* { dg-final { scan-assembler-times "binvi\t" 1 } } */
++/* { dg-final { scan-assembler-not "andi" } } */
+\ No newline at end of file
+diff --git a/gcc/testsuite/gcc.target/riscv/zbs-bset.c b/gcc/testsuite/gcc.target/riscv/zbs-bset.c
+new file mode 100644
+index 00000000000..c3107270153
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/riscv/zbs-bset.c
+@@ -0,0 +1,41 @@
++/* { dg-do compile } */
++/* { dg-options "-march=rv64gc_zbs -mabi=lp64 -O2" } */
++
++/* bset */
++long
++sub0 (long i, long j)
++{
++  return i | (1L << j);
++}
++
++/* bset_mask */
++long
++sub1 (long i, long j)
++{
++  return i | (1L << (j & 0x3f));
++}
++
++/* bset_1 */
++long
++sub2 (long i)
++{
++  return 1L << i;
++}
++
++/* bset_1_mask */
++long
++sub3 (long i)
++{
++  return 1L << (i & 0x3f);
++}
++
++/* bseti */
++long
++sub4 (long i)
++{
++  return i | (1L << 20);
++}
++
++/* { dg-final { scan-assembler-times "bset\t" 4 } } */
++/* { dg-final { scan-assembler-times "bseti\t" 1 } } */
++/* { dg-final { scan-assembler-not "andi" } } */
+\ No newline at end of file
+-- 
+2.33.1
+

+ 25 - 0
recipes-devtools/gcc/gcc/0022-aarch64-Add-support-for-musl-ldso.patch

@@ -0,0 +1,25 @@
+From 96aa24a874331a318693e4fccc4bc4e7d3fbad2b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 28 Apr 2015 23:18:39 -0700
+Subject: [PATCH] aarch64: Add support for musl ldso
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/aarch64/aarch64-linux.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
+index 5303b39186f..4bcae7f3110 100644
+--- a/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -24,7 +24,7 @@
+ #define GLIBC_DYNAMIC_LINKER  SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+ 
+ #undef MUSL_DYNAMIC_LINKER
+-#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
++#define MUSL_DYNAMIC_LINKER  SYSTEMLIBS_DIR "ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+ 
+ #undef  ASAN_CC1_SPEC
+ #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"

+ 88 - 0
recipes-devtools/gcc/gcc/0023-Cost-model-for-ZBS-extension.patch

@@ -0,0 +1,88 @@
+From 254eef43b7f99cc3308d02343c603286ba121816 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Thu, 18 Nov 2021 16:13:59 +0800
+Subject: [PATCH 23/26] Cost model for ZBS extension
+
+---
+ gcc/config/riscv/riscv.c | 47 +++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 46 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
+index 0978666a366..61666b8b2f6 100644
+--- a/gcc/config/riscv/riscv.c
++++ b/gcc/config/riscv/riscv.c
+@@ -1830,8 +1830,25 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN
+ 	    *total = COSTS_N_INSNS (1);
+ 	    return true;
+ 	}
+-      gcc_fallthrough ();
++      /* bclri pattern for zbs.  */
++      if (TARGET_ZBS
++	  && not_single_bit_mask_operand (XEXP (x, 1), VOIDmode))
++	{
++	  *total = COSTS_N_INSNS (1);
++	  return true;
++	}
++      /* bclr pattern for zbs.  */
++      if (TARGET_ZBS
++	  && REG_P (XEXP (x, 1))
++	  && GET_CODE (XEXP (x, 0)) == ROTATE
++	  && CONST_INT_P (XEXP ((XEXP (x, 0)), 0))
++	  && INTVAL (XEXP ((XEXP (x, 0)), 0)) == -2)
++	{
++	  *total = COSTS_N_INSNS (1);
++	  return true;
++	}
+ 
++      gcc_fallthrough ();
+     case IOR:
+     case XOR:
+       /* orn, andn and xorn pattern for zbb.  */
+@@ -1842,6 +1859,17 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN
+ 	  return true;
+ 	}
+ 
++      /* bset[i] and binv[i] pattern for zbs.  */
++      if ((GET_CODE (x) == IOR || GET_CODE (x) == XOR)
++	  && TARGET_ZBS
++	  && ((GET_CODE (XEXP (x, 0)) == ASHIFT
++	      && CONST_INT_P (XEXP (XEXP (x, 0), 0)))
++	      || single_bit_mask_operand (XEXP (x, 1), VOIDmode)))
++	{
++	  *total = COSTS_N_INSNS (1);
++	  return true;
++	}
++
+       /* Double-word operations use two single-word operations.  */
+       *total = riscv_binary_cost (x, 1, 2);
+       return false;
+@@ -1857,9 +1885,26 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN
+ 	  *total = COSTS_N_INSNS (SINGLE_SHIFT_COST);
+ 	  return true;
+ 	}
++      /* bext pattern for zbs.  */
++      if (TARGET_ZBS && outer_code == SET
++	  && GET_CODE (XEXP (x, 1)) == CONST_INT
++	  && INTVAL (XEXP (x, 1)) == 1)
++	{
++	  *total = COSTS_N_INSNS (SINGLE_SHIFT_COST);
++	  return true;
++	}
+       return false;
+ 
+     case ASHIFT:
++      /* bset pattern for zbs.  */
++      if (TARGET_ZBS
++	  && CONST_INT_P (XEXP (x, 0))
++	  && INTVAL (XEXP (x, 0)) == 1)
++	{
++	  *total = COSTS_N_INSNS (1);
++	  return true;
++	}
++      gcc_fallthrough ();
+     case ASHIFTRT:
+     case LSHIFTRT:
+       *total = riscv_binary_cost (x, SINGLE_SHIFT_COST,
+-- 
+2.33.1
+

+ 51 - 0
recipes-devtools/gcc/gcc/0023-libcc1-fix-libcc1-s-install-path-and-rpath.patch

@@ -0,0 +1,51 @@
+From 2cfc5ee38b3f5ec1d7965aae0991bcd48b5dc2e6 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Sun, 5 Jul 2015 20:25:18 -0700
+Subject: [PATCH] libcc1: fix libcc1's install path and rpath
+
+* Install libcc1.so and libcc1plugin.so into
+  $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we
+  had done to lto-plugin.
+* Fix bad RPATH iussue:
+  gcc-5.2.0: package gcc-plugins contains bad RPATH /patht/to/tmp/sysroots/qemux86-64/usr/lib64/../lib64 in file
+ /path/to/gcc/5.2.0-r0/packages-split/gcc-plugins/usr/lib64/gcc/x86_64-poky-linux/5.2.0/plugin/libcc1plugin.so.0.0.0
+ [rpaths]
+
+Upstream-Status: Inappropriate [OE configuration]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ libcc1/Makefile.am | 4 ++--
+ libcc1/Makefile.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
+index f148fdd7aa2..0b6eb8f2855 100644
+--- a/libcc1/Makefile.am
++++ b/libcc1/Makefile.am
+@@ -40,8 +40,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
+ 	    $(Wc)$(libiberty_normal)))
+ libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
+ 
+-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
+-cc1libdir = $(libdir)/$(libsuffix)
++cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
++plugindir = $(cc1libdir)
+ 
+ if ENABLE_PLUGIN
+ plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
+diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in
+index 753d435c9cb..455627b0a3b 100644
+--- a/libcc1/Makefile.in
++++ b/libcc1/Makefile.in
+@@ -398,8 +398,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \
+ 	    $(Wc)$(libiberty_normal)))
+ 
+ libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty))
+-plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin
+-cc1libdir = $(libdir)/$(libsuffix)
++cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
++plugindir = $(cc1libdir)
+ @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la
+ @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
+ shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \

+ 31 - 0
recipes-devtools/gcc/gcc/0024-RISC-V-costs-handle-BSWAP.patch

@@ -0,0 +1,31 @@
+From 167a062d1a8162b9441a6c0327722e77c8afa01a Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Sun, 21 Nov 2021 21:56:18 -0800
+Subject: [PATCH 24/26] RISC-V: costs: handle BSWAP
+
+---
+ gcc/config/riscv/riscv.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
+index 61666b8b2f6..8e22e36eaaf 100644
+--- a/gcc/config/riscv/riscv.c
++++ b/gcc/config/riscv/riscv.c
+@@ -2110,6 +2110,14 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN
+       *total = riscv_extend_cost (XEXP (x, 0), GET_CODE (x) == ZERO_EXTEND);
+       return false;
+ 
++    case BSWAP:
++      if (TARGET_ZBB)
++	{
++	  *total = COSTS_N_INSNS (1);
++	  return true;
++	}
++      return false;
++
+     case FLOAT:
+     case UNSIGNED_FLOAT:
+     case FIX:
+-- 
+2.33.1
+

+ 349 - 0
recipes-devtools/gcc/gcc/0024-handle-sysroot-support-for-nativesdk-gcc.patch

@@ -0,0 +1,349 @@
+From 35c084a051bcd6587ebc73e4acb045cb2bdf7e99 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 7 Dec 2015 23:39:54 +0000
+Subject: [PATCH] handle sysroot support for nativesdk-gcc
+
+Being able to build a nativesdk gcc is useful, particularly in cases
+where the host compiler may be of an incompatible version (or a 32
+bit compiler is needed).
+
+Sadly, building nativesdk-gcc is not straight forward. We install
+nativesdk-gcc into a relocatable location and this means that its
+library locations can change. "Normal" sysroot support doesn't help
+in this case since the values of paths like "libdir" change, not just
+base root directory of the system.
+
+In order to handle this we do two things:
+
+a) Add %r into spec file markup which can be used for injected paths
+   such as SYSTEMLIBS_DIR (see gcc_multilib_setup()).
+b) Add other paths which need relocation into a .gccrelocprefix section
+   which the relocation code will notice and adjust automatically.
+
+Upstream-Status: Inappropriate
+RP 2015/7/28
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Added PREFIXVAR and EXEC_PREFIXVAR to support runtime relocation.  Without
+these as part of the gccrelocprefix the system can't do runtime relocation
+if the executable is moved.  (These paths were missed in the original
+implementation.)
+
+Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
+---
+ gcc/c-family/c-opts.c |  4 +--
+ gcc/cppdefault.c      | 63 ++++++++++++++++++++++++++-----------------
+ gcc/cppdefault.h      | 13 ++++-----
+ gcc/gcc.c             | 20 +++++++++-----
+ gcc/incpath.c         | 12 ++++-----
+ gcc/prefix.c          |  6 +++--
+ 6 files changed, 70 insertions(+), 48 deletions(-)
+
+diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
+index bd15b9cd902..2bd667e3f58 100644
+--- a/gcc/c-family/c-opts.c
++++ b/gcc/c-family/c-opts.c
+@@ -1436,8 +1436,8 @@ add_prefixed_path (const char *suffix, incpath_kind chain)
+   size_t prefix_len, suffix_len;
+ 
+   suffix_len = strlen (suffix);
+-  prefix     = iprefix ? iprefix : cpp_GCC_INCLUDE_DIR;
+-  prefix_len = iprefix ? strlen (iprefix) : cpp_GCC_INCLUDE_DIR_len;
++  prefix     = iprefix ? iprefix : GCC_INCLUDE_DIRVAR;
++  prefix_len = iprefix ? strlen (iprefix) : strlen(GCC_INCLUDE_DIRVAR) - 7;
+ 
+   path = (char *) xmalloc (prefix_len + suffix_len + 1);
+   memcpy (path, prefix, prefix_len);
+diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
+index d54d6ce0076..784a92a0c24 100644
+--- a/gcc/cppdefault.c
++++ b/gcc/cppdefault.c
+@@ -35,6 +35,30 @@
+ # undef CROSS_INCLUDE_DIR
+ #endif
+ 
++static char GPLUSPLUS_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_INCLUDE_DIR;
++char GCC_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GCC_INCLUDE_DIR;
++static char GPLUSPLUS_TOOL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_TOOL_INCLUDE_DIR;
++static char GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = GPLUSPLUS_BACKWARD_INCLUDE_DIR;
++static char STANDARD_STARTFILE_PREFIX_2VAR[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET;
++#ifdef LOCAL_INCLUDE_DIR
++static char LOCAL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = LOCAL_INCLUDE_DIR;
++#endif
++#ifdef PREFIX_INCLUDE_DIR
++static char PREFIX_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX_INCLUDE_DIR;
++#endif
++#ifdef FIXED_INCLUDE_DIR
++static char FIXED_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = FIXED_INCLUDE_DIR;
++#endif
++#ifdef CROSS_INCLUDE_DIR
++static char CROSS_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = CROSS_INCLUDE_DIR;
++#endif
++#ifdef TOOL_INCLUDE_DIR
++static char TOOL_INCLUDE_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = TOOL_INCLUDE_DIR;
++#endif
++#ifdef NATIVE_SYSTEM_HEADER_DIR
++static char NATIVE_SYSTEM_HEADER_DIRVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = NATIVE_SYSTEM_HEADER_DIR;
++#endif
++
+ const struct default_include cpp_include_defaults[]
+ #ifdef INCLUDE_DEFAULTS
+ = INCLUDE_DEFAULTS;
+@@ -42,17 +66,17 @@ const struct default_include cpp_include_defaults[]
+ = {
+ #ifdef GPLUSPLUS_INCLUDE_DIR
+     /* Pick up GNU C++ generic include files.  */
+-    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,
++    { GPLUSPLUS_INCLUDE_DIRVAR, "G++", 1, 1,
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
+ #endif
+ #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR
+     /* Pick up GNU C++ target-dependent include files.  */
+-    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,
++    { GPLUSPLUS_TOOL_INCLUDE_DIRVAR, "G++", 1, 1,
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },
+ #endif
+ #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR
+     /* Pick up GNU C++ backward and deprecated include files.  */
+-    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,
++    { GPLUSPLUS_BACKWARD_INCLUDE_DIRVAR, "G++", 1, 1,
+       GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
+ #endif
+ #ifdef GPLUSPLUS_LIBCXX_INCLUDE_DIR
+@@ -62,23 +86,23 @@ const struct default_include cpp_include_defaults[]
+ #endif
+ #ifdef GCC_INCLUDE_DIR
+     /* This is the dir for gcc's private headers.  */
+-    { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
++    { GCC_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0 },
+ #endif
+ #ifdef GCC_INCLUDE_SUBDIR_TARGET
+     /* This is the dir for gcc's private headers under the specified sysroot.  */
+-    { STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 },
++    { STANDARD_STARTFILE_PREFIX_2VAR, "GCC", 0, 0, 1, 0 },
+ #endif
+ #ifdef LOCAL_INCLUDE_DIR
+     /* /usr/local/include comes before the fixincluded header files.  */
+-    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
+-    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
++    { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 2 },
++    { LOCAL_INCLUDE_DIRVAR, 0, 0, 1, 1, 0 },
+ #endif
+ #ifdef PREFIX_INCLUDE_DIR
+-    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0 },
++    { PREFIX_INCLUDE_DIRVAR, 0, 0, 1, 0, 0 },
+ #endif
+ #ifdef FIXED_INCLUDE_DIR
+     /* This is the dir for fixincludes.  */
+-    { FIXED_INCLUDE_DIR, "GCC", 0, 0, 0,
++    { FIXED_INCLUDE_DIRVAR, "GCC", 0, 0, 0,
+       /* A multilib suffix needs adding if different multilibs use
+ 	 different headers.  */
+ #ifdef SYSROOT_HEADERS_SUFFIX_SPEC
+@@ -90,33 +114,24 @@ const struct default_include cpp_include_defaults[]
+ #endif
+ #ifdef CROSS_INCLUDE_DIR
+     /* One place the target system's headers might be.  */
+-    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0 },
++    { CROSS_INCLUDE_DIRVAR, "GCC", 0, 0, 0, 0 },
+ #endif
+ #ifdef TOOL_INCLUDE_DIR
+     /* Another place the target system's headers might be.  */
+-    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 },
++    { TOOL_INCLUDE_DIRVAR, "BINUTILS", 0, 1, 0, 0 },
+ #endif
+ #ifdef NATIVE_SYSTEM_HEADER_DIR
+     /* /usr/include comes dead last.  */
+-    { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 2 },
+-    { NATIVE_SYSTEM_HEADER_DIR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 },
++    { NATIVE_SYSTEM_HEADER_DIRVAR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 2 },
++    { NATIVE_SYSTEM_HEADER_DIRVAR, NATIVE_SYSTEM_HEADER_COMPONENT, 0, 0, 1, 0 },
+ #endif
+     { 0, 0, 0, 0, 0, 0 }
+   };
+ #endif /* no INCLUDE_DEFAULTS */
+ 
+-#ifdef GCC_INCLUDE_DIR
+-const char cpp_GCC_INCLUDE_DIR[] = GCC_INCLUDE_DIR;
+-const size_t cpp_GCC_INCLUDE_DIR_len = sizeof GCC_INCLUDE_DIR - 8;
+-#else
+-const char cpp_GCC_INCLUDE_DIR[] = "";
+-const size_t cpp_GCC_INCLUDE_DIR_len = 0;
+-#endif
+-
+ /* The configured prefix.  */
+-const char cpp_PREFIX[] = PREFIX;
+-const size_t cpp_PREFIX_len = sizeof PREFIX - 1;
+-const char cpp_EXEC_PREFIX[] = STANDARD_EXEC_PREFIX;
++char PREFIXVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX;
++char EXEC_PREFIXVAR[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_EXEC_PREFIX;
+ 
+ /* This value is set by cpp_relocated at runtime */
+ const char *gcc_exec_prefix;
+diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
+index fd3c655db1c..20669ac427d 100644
+--- a/gcc/cppdefault.h
++++ b/gcc/cppdefault.h
+@@ -33,7 +33,8 @@
+ 
+ struct default_include
+ {
+-  const char *const fname;	/* The name of the directory.  */
++  const char *fname;     /* The name of the directory.  */
++
+   const char *const component;	/* The component containing the directory
+ 				   (see update_path in prefix.c) */
+   const char cplusplus;		/* When this is non-zero, we should only
+@@ -55,17 +56,13 @@ struct default_include
+ };
+ 
+ extern const struct default_include cpp_include_defaults[];
+-extern const char cpp_GCC_INCLUDE_DIR[];
+-extern const size_t cpp_GCC_INCLUDE_DIR_len;
++extern char GCC_INCLUDE_DIRVAR[] __attribute__ ((section (".gccrelocprefix")));
+ 
+ /* The configure-time prefix, i.e., the value supplied as the argument
+    to --prefix=.  */
+-extern const char cpp_PREFIX[];
++extern char PREFIXVAR[] __attribute__ ((section (".gccrelocprefix")));
+ /* The length of the configure-time prefix.  */
+-extern const size_t cpp_PREFIX_len;
+-/* The configure-time execution prefix.  This is typically the lib/gcc
+-   subdirectory of cpp_PREFIX.  */
+-extern const char cpp_EXEC_PREFIX[];
++extern char EXEC_PREFIXVAR[] __attribute__ ((section (".gccrelocprefix")));
+ /* The run-time execution prefix.  This is typically the lib/gcc
+    subdirectory of the actual installation.  */
+ extern const char *gcc_exec_prefix;
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 8737bae5353..aa6fbe43965 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -252,6 +252,8 @@ FILE *report_times_to_file = NULL;
+ #endif
+ static const char *target_system_root = DEFAULT_TARGET_SYSTEM_ROOT;
+ 
++static char target_relocatable_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = SYSTEMLIBS_DIR;
++
+ /* Nonzero means pass the updated target_system_root to the compiler.  */
+ 
+ static int target_system_root_changed;
+@@ -568,6 +570,7 @@ or with constant text in a single argument.
+  %G     process LIBGCC_SPEC as a spec.
+  %R     Output the concatenation of target_system_root and
+         target_sysroot_suffix.
++ %r     Output the base path target_relocatable_prefix
+  %S     process STARTFILE_SPEC as a spec.  A capital S is actually used here.
+  %E     process ENDFILE_SPEC as a spec.  A capital E is actually used here.
+  %C     process CPP_SPEC as a spec.
+@@ -1621,10 +1624,10 @@ static const char *gcc_libexec_prefix;
+    gcc_exec_prefix is set because, in that case, we know where the
+    compiler has been installed, and use paths relative to that
+    location instead.  */
+-static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
+-static const char *const standard_libexec_prefix = STANDARD_LIBEXEC_PREFIX;
+-static const char *const standard_bindir_prefix = STANDARD_BINDIR_PREFIX;
+-static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
++static char standard_exec_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_EXEC_PREFIX;
++static char standard_libexec_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_LIBEXEC_PREFIX;
++static char standard_bindir_prefix[4096] __attribute__ ((section (".gccrelocprefix"))) = STANDARD_BINDIR_PREFIX;
++static char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
+ 
+ /* For native compilers, these are well-known paths containing
+    components that may be provided by the system.  For cross
+@@ -1632,9 +1635,9 @@ static const char *const standard_startfile_prefix = STANDARD_STARTFILE_PREFIX;
+ static const char *md_exec_prefix = MD_EXEC_PREFIX;
+ static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;
+ static const char *md_startfile_prefix_1 = MD_STARTFILE_PREFIX_1;
+-static const char *const standard_startfile_prefix_1
++static char standard_startfile_prefix_1[4096] __attribute__ ((section (".gccrelocprefix")))
+   = STANDARD_STARTFILE_PREFIX_1;
+-static const char *const standard_startfile_prefix_2
++static char standard_startfile_prefix_2[4096] __attribute__ ((section (".gccrelocprefix")))
+   = STANDARD_STARTFILE_PREFIX_2;
+ 
+ /* A relative path to be used in finding the location of tools
+@@ -6564,6 +6567,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
+ 	      }
+ 	    break;
+ 
++          case 'r':
++              obstack_grow (&obstack, target_relocatable_prefix,
++		      strlen (target_relocatable_prefix));
++            break;
++
+ 	  case 'S':
+ 	    value = do_spec_1 (startfile_spec, 0, NULL);
+ 	    if (value != 0)
+diff --git a/gcc/incpath.c b/gcc/incpath.c
+index fbfc0ce03b8..a82e543428b 100644
+--- a/gcc/incpath.c
++++ b/gcc/incpath.c
+@@ -131,7 +131,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
+   int relocated = cpp_relocated ();
+   size_t len;
+ 
+-  if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
++  if (iprefix && (len = strlen(GCC_INCLUDE_DIRVAR) - 7) != 0)
+     {
+       /* Look for directories that start with the standard prefix.
+ 	 "Translate" them, i.e. replace /usr/local/lib/gcc... with
+@@ -146,7 +146,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
+ 		 now.  */
+ 	      if (sysroot && p->add_sysroot)
+ 		continue;
+-	      if (!filename_ncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
++	      if (!filename_ncmp (p->fname, GCC_INCLUDE_DIRVAR, len))
+ 		{
+ 		  char *str = concat (iprefix, p->fname + len, NULL);
+ 		  if (p->multilib == 1 && imultilib)
+@@ -187,7 +187,7 @@ add_standard_paths (const char *sysroot, const char *iprefix,
+ 	      free (sysroot_no_trailing_dir_separator);
+ 	    }
+ 	  else if (!p->add_sysroot && relocated
+-		   && !filename_ncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len))
++		   && !filename_ncmp (p->fname, PREFIXVAR, strlen(PREFIXVAR)))
+ 	    {
+  	      static const char *relocated_prefix;
+ 	      char *ostr;
+@@ -204,12 +204,12 @@ add_standard_paths (const char *sysroot, const char *iprefix,
+ 		  dummy = concat (gcc_exec_prefix, "dummy", NULL);
+ 		  relocated_prefix
+ 		    = make_relative_prefix (dummy,
+-					    cpp_EXEC_PREFIX,
+-					    cpp_PREFIX);
++					    EXEC_PREFIXVAR,
++					    PREFIXVAR);
+ 		  free (dummy);
+ 		}
+ 	      ostr = concat (relocated_prefix,
+-			     p->fname + cpp_PREFIX_len,
++			     p->fname + strlen(PREFIXVAR),
+ 			     NULL);
+ 	      str = update_path (ostr, p->component);
+ 	      free (ostr);
+diff --git a/gcc/prefix.c b/gcc/prefix.c
+index 747c09de638..f728638dc65 100644
+--- a/gcc/prefix.c
++++ b/gcc/prefix.c
+@@ -72,7 +72,9 @@ License along with GCC; see the file COPYING3.  If not see
+ #include "prefix.h"
+ #include "common/common-target.h"
+ 
+-static const char *std_prefix = PREFIX;
++char PREFIXVAR1[4096] __attribute__ ((section (".gccrelocprefix"))) = PREFIX;
++
++static const char *std_prefix = PREFIXVAR1;
+ 
+ static const char *get_key_value (char *);
+ static char *translate_name (char *);
+@@ -212,7 +214,7 @@ translate_name (char *name)
+ 	prefix = getenv (key);
+ 
+       if (prefix == 0)
+-	prefix = PREFIX;
++	prefix = PREFIXVAR1;
+ 
+       /* We used to strip trailing DIR_SEPARATORs here, but that can
+ 	 sometimes yield a result with no separator when one was coded

+ 54 - 0
recipes-devtools/gcc/gcc/0025-RISC-V-costs-support-shift-and-add-in-strength-reduc.patch

@@ -0,0 +1,54 @@
+From a545eb2c28726d0a574a7c6953a809362f6237e6 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Tue, 23 Nov 2021 11:41:12 +0800
+Subject: [PATCH 25/26] RISC-V: costs: support shift-and-add in
+ strength-reduction
+
+---
+ gcc/config/riscv/riscv.c | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
+index 8e22e36eaaf..f832fb44d7e 100644
+--- a/gcc/config/riscv/riscv.c
++++ b/gcc/config/riscv/riscv.c
+@@ -393,6 +393,15 @@ riscv_build_integer_1 (struct riscv_integer_op codes[RISCV_MAX_INTEGER_OPS],
+       /* Simply BSETI.  */
+       codes[0].code = UNKNOWN;
+       codes[0].value = value;
++
++      /* RISC-V sign-extends all 32bit values that life in a 32bit
++	 register.  To avoid paradoxes, we thus need to use the
++	 sign-extended (negative) representation for the value, if we
++	 want to build 0x80000000 in SImode.  This will then expand
++	 to an ADDI/LI instruction.  */
++      if (mode == SImode && value == 0x80000000)
++	    codes[0].value = -2147483648;
++
+       return 1;
+     }
+ 
+@@ -1998,6 +2007,20 @@ riscv_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno ATTRIBUTE_UN
+ 	  *total = COSTS_N_INSNS (1);
+ 	  return true;
+ 	}
++    /* Before strength-reduction, the shNadd can be expressed as the addition
++	 of a multiplication with a power-of-two.  If this case is not handled,
++	 the strength-reduction in expmed.c will calculate an inflated cost. */
++      if (TARGET_ZBA
++	  && ((!TARGET_64BIT && (mode == SImode)) ||
++	      (TARGET_64BIT && (mode == DImode)))
++	  && (GET_CODE (XEXP (x, 0)) == MULT)
++	  && REG_P (XEXP (XEXP (x, 0), 0))
++	  && CONST_INT_P (XEXP (XEXP (x, 0), 1))
++	  && IN_RANGE (pow2p_hwi (INTVAL (XEXP (XEXP (x, 0), 1))), 1, 3))
++	{
++	  *total = COSTS_N_INSNS (1);
++	  return true;
++	}
+       /* shNadd.uw pattern for zba.
+ 	 [(set (match_operand:DI 0 "register_operand" "=r")
+ 	       (plus:DI
+-- 
+2.33.1
+

+ 99 - 0
recipes-devtools/gcc/gcc/0025-Search-target-sysroot-gcc-version-specific-dirs-with.patch

@@ -0,0 +1,99 @@
+From c55e24459370ad96577496ecd87475e3a9de7dad Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 7 Dec 2015 23:41:45 +0000
+Subject: [PATCH] Search target sysroot gcc version specific dirs with
+ multilib.
+
+We install the gcc libraries (such as crtbegin.p) into
+<sysroot><libdir>/<target-sys>/5.2.0/
+which is a default search path for GCC (aka multi_suffix in the
+code below). <target-sys> is 'machine' in gcc's terminology. We use
+these directories so that multiple gcc versions could in theory
+co-exist on target.
+
+We only want to build one gcc-cross-canadian per arch and have this work
+for all multilibs. <target-sys> can be handled by mapping the multilib
+<target-sys> to the one used by gcc-cross-canadian, e.g.
+mips64-polkmllib32-linux
+is symlinked to by mips64-poky-linux.
+
+The default gcc search path in the target sysroot for a "lib64" mutlilib
+is:
+
+<sysroot>/lib32/mips64-poky-linux/5.2.0/
+<sysroot>/lib32/../lib64/
+<sysroot>/usr/lib32/mips64-poky-linux/5.2.0/
+<sysroot>/usr/lib32/../lib64/
+<sysroot>/lib32/
+<sysroot>/usr/lib32/
+
+which means that the lib32 crtbegin.o will be found and the lib64 ones
+will not which leads to compiler failures.
+
+This patch injects a multilib version of that path first so the lib64
+binaries can be found first. With this change the search path becomes:
+
+<sysroot>/lib32/../lib64/mips64-poky-linux/5.2.0/
+<sysroot>/lib32/mips64-poky-linux/5.2.0/
+<sysroot>/lib32/../lib64/
+<sysroot>/usr/lib32/../lib64/mips64-poky-linux/5.2.0/
+<sysroot>/usr/lib32/mips64-poky-linux/5.2.0/
+<sysroot>/usr/lib32/../lib64/
+<sysroot>/lib32/
+<sysroot>/usr/lib32/
+
+Upstream-Status: Pending
+RP 2015/7/31
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/gcc.c | 29 ++++++++++++++++++++++++++++-
+ 1 file changed, 28 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index aa6fbe43965..f8a71a13826 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -2811,7 +2811,7 @@ for_each_path (const struct path_prefix *paths,
+       if (path == NULL)
+ 	{
+ 	  len = paths->max_len + extra_space + 1;
+-	  len += MAX (MAX (suffix_len, multi_os_dir_len), multiarch_len);
++	  len += MAX ((suffix_len + multi_os_dir_len), multiarch_len);
+ 	  path = XNEWVEC (char, len);
+ 	}
+ 
+@@ -2823,6 +2823,33 @@ for_each_path (const struct path_prefix *paths,
+ 	  /* Look first in MACHINE/VERSION subdirectory.  */
+ 	  if (!skip_multi_dir)
+ 	    {
++	      if (!(pl->os_multilib ? skip_multi_os_dir : skip_multi_dir))
++	        {
++	          const char *this_multi;
++	          size_t this_multi_len;
++
++	          if (pl->os_multilib)
++		    {
++		      this_multi = multi_os_dir;
++		      this_multi_len = multi_os_dir_len;
++		    }
++	          else
++		    {
++		      this_multi = multi_dir;
++		      this_multi_len = multi_dir_len;
++		    }
++
++	          /* Look in multilib MACHINE/VERSION subdirectory first */
++	          if (this_multi_len)
++	            {
++		      memcpy (path + len, this_multi, this_multi_len + 1);
++	              memcpy (path + len + this_multi_len, multi_suffix, suffix_len + 1);
++	              ret = callback (path, callback_info);
++	                if (ret)
++		          break;
++	            }
++	        }
++
+ 	      memcpy (path + len, multi_suffix, suffix_len + 1);
+ 	      ret = callback (path, callback_info);
+ 	      if (ret)

+ 134 - 0
recipes-devtools/gcc/gcc/0026-Fix-various-_FOR_BUILD-and-related-variables.patch

@@ -0,0 +1,134 @@
+From cd5db101e3c4e72248f988a67ce28be8e24f66d4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 7 Dec 2015 23:42:45 +0000
+Subject: [PATCH] Fix various _FOR_BUILD and related variables
+
+When doing a FOR_BUILD thing, you have to override CFLAGS with
+CFLAGS_FOR_BUILD. And if you use C++, you also have to override
+CXXFLAGS with CXXFLAGS_FOR_BUILD.
+Without this, when building for mingw, you end up trying to use
+the mingw headers for a host build.
+
+The same goes for other variables as well, such as CPPFLAGS,
+CPP, and GMPINC.
+
+Upstream-Status: Pending
+
+Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.in      | 6 ++++++
+ Makefile.tpl     | 5 +++++
+ gcc/Makefile.in  | 2 +-
+ gcc/configure    | 2 +-
+ gcc/configure.ac | 2 +-
+ 5 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index af19589fa95..d0116a23e1a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -152,6 +152,7 @@ BUILD_EXPORTS = \
+ 	CPP="$(CC_FOR_BUILD) -E"; export CPP; \
+ 	CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
++	CPPFLAGS="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \
+ 	CXX="$(CXX_FOR_BUILD)"; export CXX; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+ 	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
+@@ -171,6 +172,9 @@ BUILD_EXPORTS = \
+ # built for the build system to override those in BASE_FLAGS_TO_PASS.
+ EXTRA_BUILD_FLAGS = \
+ 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
++	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
++	CPP="$(CC_FOR_BUILD) -E" \
++	CPPFLAGS="$(CPPFLAGS_FOR_BUILD)" \
+ 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+ 
+ # This is the list of directories to built for the host system.
+@@ -188,6 +192,7 @@ HOST_SUBDIR = @host_subdir@
+ HOST_EXPORTS = \
+ 	$(BASE_EXPORTS) \
+ 	CC="$(CC)"; export CC; \
++	CPP="$(CC) -E"; export CPP; \
+ 	ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
+ 	CFLAGS="$(CFLAGS)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+@@ -776,6 +781,7 @@ BASE_FLAGS_TO_PASS = \
+ 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+ 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+ 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
++	"CXXFLAGS_FOR_BUILD=$(CXXFLAGS_FOR_BUILD)" \
+ 	"EXPECT=$(EXPECT)" \
+ 	"FLEX=$(FLEX)" \
+ 	"INSTALL=$(INSTALL)" \
+diff --git a/Makefile.tpl b/Makefile.tpl
+index 6e0337fb48f..4fcac93d3d8 100644
+--- a/Makefile.tpl
++++ b/Makefile.tpl
+@@ -154,6 +154,7 @@ BUILD_EXPORTS = \
+ 	CC="$(CC_FOR_BUILD)"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
++	CPPFLAGS="$(CPPFLAGS_FOR_BUILD)"; export CPPFLAGS; \
+ 	CXX="$(CXX_FOR_BUILD)"; export CXX; \
+ 	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+ 	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
+@@ -173,6 +174,9 @@ BUILD_EXPORTS = \
+ # built for the build system to override those in BASE_FLAGS_TO_PASS.
+ EXTRA_BUILD_FLAGS = \
+ 	CFLAGS="$(CFLAGS_FOR_BUILD)" \
++	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)" \
++	CPP="$(CC_FOR_BUILD) -E" \
++	CPPFLAGS="$(CPPFLAGS_FOR_BUILD)" \
+ 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"
+ 
+ # This is the list of directories to built for the host system.
+@@ -190,6 +194,7 @@ HOST_SUBDIR = @host_subdir@
+ HOST_EXPORTS = \
+ 	$(BASE_EXPORTS) \
+ 	CC="$(CC)"; export CC; \
++	CPP="$(CC) -E"; export CPP; \
+ 	ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
+ 	CFLAGS="$(CFLAGS)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 9b17d120aa1..3053d05903c 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -820,7 +820,7 @@ BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ BUILD_NO_PIE_FLAG = @BUILD_NO_PIE_FLAG@
+ BUILD_LDFLAGS += $(BUILD_NO_PIE_FLAG)
+ BUILD_CPPFLAGS= -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
+-		-I$(srcdir)/../include @INCINTL@ $(CPPINC) $(CPPFLAGS)
++		-I$(srcdir)/../include @INCINTL@ $(CPPINC) $(CPPFLAGS_FOR_BUILD)
+ 
+ # Actual name to use when installing a native compiler.
+ GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
+diff --git a/gcc/configure b/gcc/configure
+index e663052cad2..b0906aa3e96 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -12699,7 +12699,7 @@ else
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+ 	CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
+ 	LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+-	GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \
++	GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+ 		${enable_obsolete+--enable-obsolete="$enable_obsolete"} \
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 2b84875b028..bfbd8946e8a 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -2023,7 +2023,7 @@ else
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+ 	CXX="${CXX_FOR_BUILD}" CXXFLAGS="${CXXFLAGS_FOR_BUILD}" \
+ 	LD="${LD_FOR_BUILD}" LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+-	GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \
++	GMPINC="" CPPFLAGS="${CPPFLAGS_FOR_BUILD} -DGENERATOR_FILE" \
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+ 		${enable_obsolete+--enable-obsolete="$enable_obsolete"} \

+ 35 - 0
recipes-devtools/gcc/gcc/0026-RISC-V-bitmanip-fix-constant-loading-for-1ULL-31-in-.patch

@@ -0,0 +1,35 @@
+From 4ecb7207eb15ac1a955cd6333d24bf7eecd33213 Mon Sep 17 00:00:00 2001
+From: "yilun.xie" <yilun.xie@starfivetech.com>
+Date: Tue, 23 Nov 2021 13:55:44 +0800
+Subject: [PATCH 26/26] RISC-V: bitmanip: fix constant-loading for (1ULL << 31)
+ in DImode
+
+---
+ gcc/config/riscv/riscv.h | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h
+index ff6729aedac..27ecc4830b2 100644
+--- a/gcc/config/riscv/riscv.h
++++ b/gcc/config/riscv/riscv.h
+@@ -521,13 +521,10 @@ enum reg_class
+   (((VALUE) | ((1UL<<31) - IMM_REACH)) == ((1UL<<31) - IMM_REACH)	\
+    || ((VALUE) | ((1UL<<31) - IMM_REACH)) + IMM_REACH == 0)
+ 
+-/* If this is a single bit mask, then we can load it with bseti.  But this
+-   is not useful for any of the low 31 bits because we can use addi or lui
+-   to load them.  It is wrong for loading SImode 0x80000000 on rv64 because it
+-   needs to be sign-extended.  So we restrict this to the upper 32-bits
+-   only.  */
+-#define SINGLE_BIT_MASK_OPERAND(VALUE) \
+-  (pow2p_hwi (VALUE) && (ctz_hwi (VALUE) >= 32))
++/* If this is a single bit mask, then we can load it with bseti.  Special
++   handling of SImode 0x80000000 on RV64 is done in riscv_build_integer_1. */
++#define SINGLE_BIT_MASK_OPERAND(VALUE)					\
++  (pow2p_hwi (VALUE))
+ 
+ /* Stack layout; function entry, exit and calling.  */
+ 
+-- 
+2.33.1
+

+ 25 - 0
recipes-devtools/gcc/gcc/0027-nios2-Define-MUSL_DYNAMIC_LINKER.patch

@@ -0,0 +1,25 @@
+From 9bbce1b5a10caf636eee137e5a229e5434a6c8f5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 2 Feb 2016 10:26:10 -0800
+Subject: [PATCH] nios2: Define MUSL_DYNAMIC_LINKER
+
+Upstream-Status: Pending
+
+Signed-off-by: Marek Vasut <marex@denx.de>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/nios2/linux.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gcc/config/nios2/linux.h b/gcc/config/nios2/linux.h
+index 08edf1521f6..15696d86241 100644
+--- a/gcc/config/nios2/linux.h
++++ b/gcc/config/nios2/linux.h
+@@ -30,6 +30,7 @@
+ #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1"
++#define MUSL_DYNAMIC_LINKER  "/lib/ld-musl-nios2.so.1"
+ 
+ #undef LINK_SPEC
+ #define LINK_SPEC LINK_SPEC_ENDIAN \

+ 84 - 0
recipes-devtools/gcc/gcc/0028-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch

@@ -0,0 +1,84 @@
+From 745a2ac7825c73102b888226c54397d21512f86b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 27 Jun 2017 18:10:54 -0700
+Subject: [PATCH] Add ssp_nonshared to link commandline for musl targets
+
+when -fstack-protector options are enabled we need to
+link with ssp_shared on musl since it does not provide
+the __stack_chk_fail_local() so essentially it provides
+libssp but not libssp_nonshared something like
+TARGET_LIBC_PROVIDES_SSP_BUT_NOT_SSP_NONSHARED
+ where-as for glibc the needed symbols
+are already present in libc_nonshared library therefore
+we do not need any library helper on glibc based systems
+but musl needs the libssp_noshared from gcc
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/linux.h          |  7 +++++++
+ gcc/config/rs6000/linux.h   | 10 ++++++++++
+ gcc/config/rs6000/linux64.h | 10 ++++++++++
+ 3 files changed, 27 insertions(+)
+
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index 87efc5f69fe..3c7b7c538b9 100644
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -195,6 +195,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+     { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
+     { 0, 0, 0, 0, 0, 0 }				\
+   }
++#ifdef TARGET_LIBC_PROVIDES_SSP
++#undef LINK_SSP_SPEC
++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
++		       "|fstack-protector-strong|fstack-protector-explicit" \
++		       ":-lssp_nonshared}"
++#endif
++
+ #endif
+ 
+ #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
+diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
+index 47c9d9ac0b6..d065f88b377 100644
+--- a/gcc/config/rs6000/linux.h
++++ b/gcc/config/rs6000/linux.h
+@@ -94,6 +94,16 @@
+ 					 " -m elf32ppclinux")
+ #endif
+ 
++/* link libssp_nonshared.a with musl */
++#if DEFAULT_LIBC == LIBC_MUSL
++#ifdef TARGET_LIBC_PROVIDES_SSP
++#undef LINK_SSP_SPEC
++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
++		       "|fstack-protector-strong|fstack-protector-explicit" \
++		       ":-lssp_nonshared}"
++#endif
++#endif
++
+ #undef LINK_OS_LINUX_SPEC
+ #define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \
+   %{!static-pie: \
+diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
+index a11e01faa3d..ce464f3626b 100644
+--- a/gcc/config/rs6000/linux64.h
++++ b/gcc/config/rs6000/linux64.h
+@@ -369,6 +369,16 @@ extern int dot_symbols;
+ 					   " -m elf64ppc")
+ #endif
+ 
++/* link libssp_nonshared.a with musl */
++#if DEFAULT_LIBC == LIBC_MUSL
++#ifdef TARGET_LIBC_PROVIDES_SSP
++#undef LINK_SSP_SPEC
++#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
++		       "|fstack-protector-strong|fstack-protector-explicit" \
++		       ":-lssp_nonshared}"
++#endif
++#endif
++
+ #define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
+   %{!static-pie: \
+     %{rdynamic:-export-dynamic} \

+ 26 - 0
recipes-devtools/gcc/gcc/0029-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch

@@ -0,0 +1,26 @@
+From 695adb4dffb23c6f5cbc757e05cf4187a2bd6528 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 4 May 2016 21:11:34 -0700
+Subject: [PATCH] Link libgcc using LDFLAGS, not just SHLIB_LDFLAGS
+
+Upstream-Status: Pending
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libgcc/config/t-slibgcc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgcc/config/t-slibgcc b/libgcc/config/t-slibgcc
+index c59b43b7b69..ca4c141f526 100644
+--- a/libgcc/config/t-slibgcc
++++ b/libgcc/config/t-slibgcc
+@@ -32,7 +32,7 @@ SHLIB_INSTALL_SOLINK = $(LN_S) $(SHLIB_SONAME) \
+ 	$(DESTDIR)$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
+ 
+ SHLIB_LINK = $(CC) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
+-	$(SHLIB_LDFLAGS) \
++	$(LDFLAGS) $(SHLIB_LDFLAGS) \
+ 	-o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \
+ 	$(SHLIB_OBJS) $(SHLIB_LC) && \
+ 	rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \

+ 88 - 0
recipes-devtools/gcc/gcc/0030-sync-gcc-stddef.h-with-musl.patch

@@ -0,0 +1,88 @@
+From a9173429ae256c4b4a3ab4d758a6adf42f8c4239 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 3 Feb 2017 12:56:00 -0800
+Subject: [PATCH] sync gcc stddef.h with musl
+
+musl defines ptrdiff_t size_t and wchar_t
+so dont define them here if musl is definining them
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/ginclude/stddef.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
+index 66619fe43b1..3f843d6f365 100644
+--- a/gcc/ginclude/stddef.h
++++ b/gcc/ginclude/stddef.h
+@@ -128,6 +128,7 @@ _TYPE_wchar_t;
+ #ifndef ___int_ptrdiff_t_h
+ #ifndef _GCC_PTRDIFF_T
+ #ifndef _PTRDIFF_T_DECLARED /* DragonFly */
++#ifndef __DEFINED_ptrdiff_t /* musl */
+ #define _PTRDIFF_T
+ #define _T_PTRDIFF_
+ #define _T_PTRDIFF
+@@ -137,10 +138,12 @@ _TYPE_wchar_t;
+ #define ___int_ptrdiff_t_h
+ #define _GCC_PTRDIFF_T
+ #define _PTRDIFF_T_DECLARED
++#define __DEFINED_ptrdiff_t /* musl */
+ #ifndef __PTRDIFF_TYPE__
+ #define __PTRDIFF_TYPE__ long int
+ #endif
+ typedef __PTRDIFF_TYPE__ ptrdiff_t;
++#endif /* __DEFINED_ptrdiff_t */
+ #endif /* _PTRDIFF_T_DECLARED */
+ #endif /* _GCC_PTRDIFF_T */
+ #endif /* ___int_ptrdiff_t_h */
+@@ -178,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__	/* BeOS */
+ #define __SIZE_T__	/* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -194,6 +198,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if defined (__FreeBSD__) \
+   || defined(__DragonFly__) \
+   || defined(__FreeBSD_kernel__) \
+@@ -228,6 +233,7 @@ typedef long ssize_t;
+ #endif /* _SIZE_T */
+ #endif /* __SIZE_T__ */
+ #endif /* __size_t__ */
++#endif /* __DEFINED_size_t */
+ #undef	__need_size_t
+ #endif /* _STDDEF_H or __need_size_t.  */
+ 
+@@ -257,6 +263,7 @@ typedef long ssize_t;
+ #ifndef ___int_wchar_t_h
+ #ifndef __INT_WCHAR_T_H
+ #ifndef _GCC_WCHAR_T
++#ifndef __DEFINED_wchar_t /* musl */
+ #define __wchar_t__	/* BeOS */
+ #define __WCHAR_T__	/* Cray Unicos/Mk */
+ #define _WCHAR_T
+@@ -272,6 +279,7 @@ typedef long ssize_t;
+ #define __INT_WCHAR_T_H
+ #define _GCC_WCHAR_T
+ #define _WCHAR_T_DECLARED
++#define __DEFINED_wchar_t /* musl */
+ 
+ /* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_
+    instead of _WCHAR_T_, and _BSD_RUNE_T_ (which, unlike the other
+@@ -337,6 +345,7 @@ typedef __WCHAR_TYPE__ wchar_t;
+ #endif
+ #endif /* __WCHAR_T__ */
+ #endif /* __wchar_t__ */
++#endif /* __DEFINED_wchar_t musl */
+ #undef	__need_wchar_t
+ #endif /* _STDDEF_H or __need_wchar_t.  */
+ 

+ 57 - 0
recipes-devtools/gcc/gcc/0031-fix-segmentation-fault-in-precompiled-header-generat.patch

@@ -0,0 +1,57 @@
+From 3d59f763b824ac11f8360931092baf0bc1719562 Mon Sep 17 00:00:00 2001
+From: Juro Bystricky <juro.bystricky@intel.com>
+Date: Mon, 19 Mar 2018 22:31:20 -0700
+Subject: [PATCH] fix segmentation fault in precompiled header generation
+
+Prevent a segmentation fault which occurs when using incorrect
+structure trying to access name of some named operators, such as
+CPP_NOT, CPP_AND etc. "token->val.node.spelling" cannot be used in
+those cases, as is may not be initialized at all.
+
+[YOCTO #11738]
+
+Upstream-Status: Pending
+
+Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libcpp/lex.c | 26 +++++++++++++++++++++-----
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/libcpp/lex.c b/libcpp/lex.c
+index 06bcc31c87e..24bed9a35fa 100644
+--- a/libcpp/lex.c
++++ b/libcpp/lex.c
+@@ -3531,11 +3531,27 @@ cpp_spell_token (cpp_reader *pfile, const cpp_token *token,
+     spell_ident:
+     case SPELL_IDENT:
+       if (forstring)
+-	{
+-	  memcpy (buffer, NODE_NAME (token->val.node.spelling),
+-		  NODE_LEN (token->val.node.spelling));
+-	  buffer += NODE_LEN (token->val.node.spelling);
+-	}
++        {
++          if (token->type == CPP_NAME)
++            {
++              memcpy (buffer, NODE_NAME (token->val.node.spelling),
++                    NODE_LEN (token->val.node.spelling));
++              buffer += NODE_LEN (token->val.node.spelling);
++              break;
++            }
++          /* NAMED_OP, cannot use node.spelling */
++          if (token->flags & NAMED_OP)
++            {
++              const char *str = cpp_named_operator2name (token->type);
++              if (str)
++                {
++                  size_t len = strlen(str);
++                  memcpy(buffer, str, len);
++                  buffer += len;
++                }
++              break;
++            }
++        }
+       else
+ 	buffer = _cpp_spell_ident_ucns (buffer, token->val.node.node);
+       break;

+ 255 - 0
recipes-devtools/gcc/gcc/0032-Fix-for-testsuite-failure.patch

@@ -0,0 +1,255 @@
+From bb171ef618f8892bd56e57ae41ecb6e02caa8173 Mon Sep 17 00:00:00 2001
+From: RAGHUNATH LOLUR <raghunath.lolur@kpit.com>
+Date: Wed, 6 Dec 2017 22:52:26 -0800
+Subject: [PATCH] Fix for testsuite failure
+
+2017-11-16  Raghunath Lolur  <raghunath.lolur@kpit.com>
+
+	* gcc.dg/pr56275.c: If SSE is disabled, ensure that
+	"-mfpmath" is not set to use SSE. Set "-mfpmath=387".
+	* gcc.dg/pr68306.c: Likewise
+	* gcc.dg/pr68306-2.c: Likewise
+	* gcc.dg/pr68306-3.c: Likewise
+	* gcc.dg/pr69634.c: Likewise
+	* gcc.target/i386/amd64-abi-1.c: Likewise
+	* gcc.target/i386/funcspec-6.c: Likewise
+	* gcc.target/i386/interrupt-387-err-1.c: Likewise
+	* gcc.target/i386/isa-14.c: Likewise
+	* gcc.target/i386/pr44948-2b.c: Likewise
+	* gcc.target/i386/pr53425-1.c: Likewise
+	* gcc.target/i386/pr53425-2.c: Likewise
+	* gcc.target/i386/pr55247.c: Likewise
+	* gcc.target/i386/pr59644.c: Likewise
+	* gcc.target/i386/pr62120.c: Likewise
+	* gcc.target/i386/pr70467-1.c: Likewise
+	* gcc.target/i386/warn-vect-op-1.c: Likewise
+
+If -Wall, -Werror are used during compilation various test cases fail
+to compile.
+
+If SSE is disabled, be sure to -mfpmath=387 to resolve this.
+
+This patch removes the changes to Changelog from the original patch.
+This will help us avoid conflicts.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+---
+ gcc/testsuite/gcc.dg/pr56275.c                      | 2 +-
+ gcc/testsuite/gcc.dg/pr68306-2.c                    | 2 +-
+ gcc/testsuite/gcc.dg/pr68306-3.c                    | 2 +-
+ gcc/testsuite/gcc.dg/pr68306.c                      | 2 +-
+ gcc/testsuite/gcc.dg/pr69634.c                      | 2 +-
+ gcc/testsuite/gcc.target/i386/amd64-abi-1.c         | 2 +-
+ gcc/testsuite/gcc.target/i386/funcspec-6.c          | 1 +
+ gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c | 2 +-
+ gcc/testsuite/gcc.target/i386/isa-14.c              | 2 +-
+ gcc/testsuite/gcc.target/i386/pr44948-2b.c          | 2 +-
+ gcc/testsuite/gcc.target/i386/pr53425-1.c           | 2 +-
+ gcc/testsuite/gcc.target/i386/pr53425-2.c           | 2 +-
+ gcc/testsuite/gcc.target/i386/pr55247.c             | 2 +-
+ gcc/testsuite/gcc.target/i386/pr59644.c             | 2 +-
+ gcc/testsuite/gcc.target/i386/pr62120.c             | 2 +-
+ gcc/testsuite/gcc.target/i386/pr70467-1.c           | 2 +-
+ gcc/testsuite/gcc.target/i386/warn-vect-op-1.c      | 2 +-
+ 17 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/gcc/testsuite/gcc.dg/pr56275.c b/gcc/testsuite/gcc.dg/pr56275.c
+index b901bb2b199..a4f6c95e1a1 100644
+--- a/gcc/testsuite/gcc.dg/pr56275.c
++++ b/gcc/testsuite/gcc.dg/pr56275.c
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O2" } */
+-/* { dg-additional-options "-mno-sse" { target { i?86-*-* x86_64-*-* } } } */
++/* { dg-additional-options "-mno-sse -mfpmath=387" { target { i?86-*-* x86_64-*-* } } } */
+ 
+ typedef long long v2tw __attribute__ ((vector_size (2 * sizeof (long long))));
+ 
+diff --git a/gcc/testsuite/gcc.dg/pr68306-2.c b/gcc/testsuite/gcc.dg/pr68306-2.c
+index 4672ebe7987..2a368c484b6 100644
+--- a/gcc/testsuite/gcc.dg/pr68306-2.c
++++ b/gcc/testsuite/gcc.dg/pr68306-2.c
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O3" } */
+-/* { dg-additional-options "-mno-sse -mno-mmx" { target i?86-*-* x86_64-*-* } } */
++/* { dg-additional-options "-mno-sse -mno-mmx -mfpmath=387" { target i?86-*-* x86_64-*-* } } */
+ 
+ struct {
+     int tz_minuteswest;
+diff --git a/gcc/testsuite/gcc.dg/pr68306-3.c b/gcc/testsuite/gcc.dg/pr68306-3.c
+index f5a8c102cf8..df3390c64c2 100644
+--- a/gcc/testsuite/gcc.dg/pr68306-3.c
++++ b/gcc/testsuite/gcc.dg/pr68306-3.c
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O3" } */
+-/* { dg-additional-options "-mno-sse -mno-mmx" { target i?86-*-* x86_64-*-* } } */
++/* { dg-additional-options "-mno-sse -mno-mmx -mfpmath=387" { target i?86-*-* x86_64-*-* } } */
+ /* { dg-additional-options "-mno-altivec -mno-vsx" { target powerpc*-*-* } } */
+ 
+ extern void fn2();
+diff --git a/gcc/testsuite/gcc.dg/pr68306.c b/gcc/testsuite/gcc.dg/pr68306.c
+index 54e5b40f221..0813389e2c1 100644
+--- a/gcc/testsuite/gcc.dg/pr68306.c
++++ b/gcc/testsuite/gcc.dg/pr68306.c
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O3" } */
+-/* { dg-additional-options "-mno-sse -mno-mmx" { target i?86-*-* x86_64-*-* } } */
++/* { dg-additional-options "-mno-sse -mno-mmx -mfpmath=387" { target i?86-*-* x86_64-*-* } } */
+ 
+ enum powerpc_pmc_type { PPC_PMC_IBM };
+ struct {
+diff --git a/gcc/testsuite/gcc.dg/pr69634.c b/gcc/testsuite/gcc.dg/pr69634.c
+index 60a56149463..bcc23f9ccd6 100644
+--- a/gcc/testsuite/gcc.dg/pr69634.c
++++ b/gcc/testsuite/gcc.dg/pr69634.c
+@@ -1,6 +1,6 @@
+ /* { dg-do compile } */
+ /* { dg-options "-O2 -fno-dce -fschedule-insns -fno-tree-vrp -fcompare-debug -Wno-psabi" } */
+-/* { dg-additional-options "-mno-sse" { target i?86-*-* x86_64-*-* } } */
++/* { dg-additional-options "-mno-sse -mfpmath=387" { target i?86-*-* x86_64-*-* } } */
+ /* { dg-require-effective-target scheduling } */
+ 
+ typedef unsigned short u16;
+diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-1.c b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
+index 69fde57bf06..7f1f1c03edf 100644
+--- a/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
++++ b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile { target { ! ia32 } } } */
+-/* { dg-options "-mno-sse" } */
++/* { dg-options "-mno-sse -mfpmath=387" } */
+ /* { dg-additional-options "-mabi=sysv" { target *-*-mingw* } } */
+ 
+ double foo(void) { return 0; }	/* { dg-error "SSE disabled" } */
+diff --git a/gcc/testsuite/gcc.target/i386/funcspec-6.c b/gcc/testsuite/gcc.target/i386/funcspec-6.c
+index ea896b7ebfd..bf15569b826 100644
+--- a/gcc/testsuite/gcc.target/i386/funcspec-6.c
++++ b/gcc/testsuite/gcc.target/i386/funcspec-6.c
+@@ -1,6 +1,7 @@
+ /* Test whether all of the 64-bit function specific options are accepted
+    without error.  */
+ /* { dg-do compile { target { ! ia32 } } } */
++/* { dg-additional-options "-mfpmath=387" } */
+ 
+ #include "funcspec-56.inc"
+ 
+diff --git a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c
+index 8561a3c26d6..6377f814645 100644
+--- a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c
++++ b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mgeneral-regs-only -mno-cld -mno-iamcu -m80387" } */
++/* { dg-options "-O2 -mgeneral-regs-only -mno-cld -mno-iamcu -m80387 -mfpmath=387" } */
+ 
+ typedef unsigned int uword_t __attribute__ ((mode (__word__)));
+ 
+diff --git a/gcc/testsuite/gcc.target/i386/isa-14.c b/gcc/testsuite/gcc.target/i386/isa-14.c
+index 5d49e6e77fe..1de2db92bdd 100644
+--- a/gcc/testsuite/gcc.target/i386/isa-14.c
++++ b/gcc/testsuite/gcc.target/i386/isa-14.c
+@@ -1,5 +1,5 @@
+ /* { dg-do run } */
+-/* { dg-options "-march=x86-64 -msse4a -mfma4 -mno-sse" } */
++/* { dg-options "-march=x86-64 -msse4a -mfma4 -mno-sse -mfpmath=387" } */
+ 
+ extern void abort (void);
+ 
+diff --git a/gcc/testsuite/gcc.target/i386/pr44948-2b.c b/gcc/testsuite/gcc.target/i386/pr44948-2b.c
+index fa1769b62fb..f79fb12726f 100644
+--- a/gcc/testsuite/gcc.target/i386/pr44948-2b.c
++++ b/gcc/testsuite/gcc.target/i386/pr44948-2b.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-O -mno-sse -Wno-psabi -mtune=generic" } */
++/* { dg-options "-O -mno-sse -Wno-psabi -mtune=generic -mfpmath=387" } */
+ 
+ struct A
+ { 
+diff --git a/gcc/testsuite/gcc.target/i386/pr53425-1.c b/gcc/testsuite/gcc.target/i386/pr53425-1.c
+index 2e89ff7d81d..6339bf6b736 100644
+--- a/gcc/testsuite/gcc.target/i386/pr53425-1.c
++++ b/gcc/testsuite/gcc.target/i386/pr53425-1.c
+@@ -1,6 +1,6 @@
+ /* PR target/53425 */
+ /* { dg-do compile { target { ! ia32 } } } */
+-/* { dg-options "-O2 -mno-sse" } */
++/* { dg-options "-O2 -mno-sse -mfpmath=387" } */
+ /* { dg-skip-if "no SSE vector" { x86_64-*-mingw* } } */
+ 
+ typedef double __v2df __attribute__ ((__vector_size__ (16)));
+diff --git a/gcc/testsuite/gcc.target/i386/pr53425-2.c b/gcc/testsuite/gcc.target/i386/pr53425-2.c
+index 61f6283dbe9..2c5a55f0ac3 100644
+--- a/gcc/testsuite/gcc.target/i386/pr53425-2.c
++++ b/gcc/testsuite/gcc.target/i386/pr53425-2.c
+@@ -1,6 +1,6 @@
+ /* PR target/53425 */
+ /* { dg-do compile { target { ! ia32 } } } */
+-/* { dg-options "-O2 -mno-sse" } */
++/* { dg-options "-O2 -mno-sse -mfpmath=387" } */
+ /* { dg-skip-if "no SSE vector" { x86_64-*-mingw* } } */
+ 
+ typedef float __v2sf __attribute__ ((__vector_size__ (8)));
+diff --git a/gcc/testsuite/gcc.target/i386/pr55247.c b/gcc/testsuite/gcc.target/i386/pr55247.c
+index 23366d0909d..9810e3abb76 100644
+--- a/gcc/testsuite/gcc.target/i386/pr55247.c
++++ b/gcc/testsuite/gcc.target/i386/pr55247.c
+@@ -1,6 +1,6 @@
+ /* { dg-do compile { target { ! ia32 } } } */
+ /* { dg-require-effective-target maybe_x32 } */
+-/* { dg-options "-O2 -mno-sse -mno-mmx -mx32 -maddress-mode=long" } */
++/* { dg-options "-O2 -mno-sse -mno-mmx -mx32 -maddress-mode=long -mfpmath=387" } */
+ 
+ typedef unsigned int uint32_t;
+ typedef uint32_t Elf32_Word;
+diff --git a/gcc/testsuite/gcc.target/i386/pr59644.c b/gcc/testsuite/gcc.target/i386/pr59644.c
+index 96006b3e338..4287e4538bf 100644
+--- a/gcc/testsuite/gcc.target/i386/pr59644.c
++++ b/gcc/testsuite/gcc.target/i386/pr59644.c
+@@ -1,6 +1,6 @@
+ /* PR target/59644 */
+ /* { dg-do run { target lp64 } } */
+-/* { dg-options "-O2 -ffreestanding -mno-sse -mpreferred-stack-boundary=3 -maccumulate-outgoing-args -mno-red-zone" } */
++/* { dg-options "-O2 -ffreestanding -mno-sse -mpreferred-stack-boundary=3 -maccumulate-outgoing-args -mno-red-zone -mfpmath=387" } */
+ 
+ /* This test uses __builtin_trap () instead of e.g. abort,
+    because due to -mpreferred-stack-boundary=3 it should not call
+diff --git a/gcc/testsuite/gcc.target/i386/pr62120.c b/gcc/testsuite/gcc.target/i386/pr62120.c
+index 28d85d37712..c93266bd4bc 100644
+--- a/gcc/testsuite/gcc.target/i386/pr62120.c
++++ b/gcc/testsuite/gcc.target/i386/pr62120.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile } */
+-/* { dg-options "-mno-sse" } */
++/* { dg-options "-mno-sse -mfpmath=387" } */
+ 
+ void foo ()
+ {
+diff --git a/gcc/testsuite/gcc.target/i386/pr70467-1.c b/gcc/testsuite/gcc.target/i386/pr70467-1.c
+index 4e112c88d07..bcfb396a68d 100644
+--- a/gcc/testsuite/gcc.target/i386/pr70467-1.c
++++ b/gcc/testsuite/gcc.target/i386/pr70467-1.c
+@@ -1,6 +1,6 @@
+ /* PR rtl-optimization/70467 */
+ /* { dg-do compile } */
+-/* { dg-options "-O2 -mno-sse" } */
++/* { dg-options "-O2 -mno-sse -mfpmath=387" } */
+ 
+ void foo (unsigned long long *);
+ 
+diff --git a/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c b/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c
+index 6cda1534311..26e37f5b8ba 100644
+--- a/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c
++++ b/gcc/testsuite/gcc.target/i386/warn-vect-op-1.c
+@@ -1,5 +1,5 @@
+ /* { dg-do compile { target { ! ia32 } } }  */
+-/* { dg-options "-mno-sse -Wvector-operation-performance" }  */
++/* { dg-options "-mno-sse -Wvector-operation-performance -mfpmath=387" }  */
+ #define vector(elcount, type)  \
+ __attribute__((vector_size((elcount)*sizeof(type)))) type
+ 

+ 39 - 0
recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch

@@ -0,0 +1,39 @@
+From 0b900d6410b7c1938e86eceb87b032fd538566a9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 6 Jun 2018 12:10:22 -0700
+Subject: [PATCH] Re-introduce spe commandline options
+
+This should ensure that we keep accepting
+spe options
+
+Upstream-Status: Inappropriate [SPE port is removed from rs600 port]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/rs6000/rs6000.opt | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
+index 0dbdf753673..b273eb65c35 100644
+--- a/gcc/config/rs6000/rs6000.opt
++++ b/gcc/config/rs6000/rs6000.opt
+@@ -352,6 +352,19 @@ mdebug=
+ Target RejectNegative Joined
+ -mdebug=	Enable debug output.
+ 
++; PPC SPE ABI
++mspe
++Target Var(rs6000_spe) Save
++Generate SPE SIMD instructions on E500.
++
++mabi=spe
++Target RejectNegative Var(rs6000_spe_abi) Save
++Use the SPE ABI extensions.
++
++mabi=no-spe
++Target RejectNegative Var(rs6000_spe_abi, 0)
++Do not use the SPE ABI extensions.
++
+ ; Altivec ABI
+ mabi=altivec
+ Target RejectNegative Var(rs6000_altivec_abi) Save

+ 83 - 0
recipes-devtools/gcc/gcc/0034-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch

@@ -0,0 +1,83 @@
+From ea9154338cb3acbd75945fddde4202e73c20dd1a Mon Sep 17 00:00:00 2001
+From: Szabolcs Nagy <nsz@port70.net>
+Date: Sat, 24 Oct 2015 20:09:53 +0000
+Subject: [PATCH] libgcc_s: Use alias for __cpu_indicator_init instead of
+ symver
+
+Adapter from
+
+https://gcc.gnu.org/ml/gcc-patches/2015-05/msg00899.html
+
+This fix was debated but hasnt been applied gcc upstream since
+they expect musl to support '@' in symbol versioning which is
+a sun/gnu versioning extention. This patch however avoids the
+need for the '@' symbols at all
+
+libgcc/Changelog:
+
+2015-05-11  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* config/i386/cpuinfo.c (__cpu_indicator_init_local): Add.
+	(__cpu_indicator_init@GCC_4.8.0, __cpu_model@GCC_4.8.0): Remove.
+
+	* config/i386/t-linux (HOST_LIBGCC2_CFLAGS): Remove -DUSE_ELF_SYMVER.
+
+gcc/Changelog:
+
+2015-05-11  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* config/i386/i386-expand.c (ix86_expand_builtin): Make __builtin_cpu_init
+	call __cpu_indicator_init_local instead of __cpu_indicator_init.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/i386/i386-expand.c | 4 ++--
+ libgcc/config/i386/cpuinfo.c  | 6 +++---
+ libgcc/config/i386/t-linux    | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
+index ac69eed4d32..ffaa44a16fc 100644
+--- a/gcc/config/i386/i386-expand.c
++++ b/gcc/config/i386/i386-expand.c
+@@ -11038,10 +11038,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
+     {
+     case IX86_BUILTIN_CPU_INIT:
+       {
+-	/* Make it call __cpu_indicator_init in libgcc. */
++	/* Make it call __cpu_indicator_init_local in libgcc.a. */
+ 	tree call_expr, fndecl, type;
+         type = build_function_type_list (integer_type_node, NULL_TREE); 
+-	fndecl = build_fn_decl ("__cpu_indicator_init", type);
++	fndecl = build_fn_decl ("__cpu_indicator_init_local", type);
+ 	call_expr = build_call_expr (fndecl, 0); 
+ 	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
+       }
+diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
+index ef463848f9d..1a3de052c80 100644
+--- a/libgcc/config/i386/cpuinfo.c
++++ b/libgcc/config/i386/cpuinfo.c
+@@ -63,7 +63,7 @@ __cpu_indicator_init (void)
+ 			     __cpu_features2);
+ }
+ 
+-#if defined SHARED && defined USE_ELF_SYMVER
+-__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
+-__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
++#ifndef SHARED
++int __cpu_indicator_init_local (void)
++  __attribute__ ((weak, alias ("__cpu_indicator_init")));
+ #endif
+diff --git a/libgcc/config/i386/t-linux b/libgcc/config/i386/t-linux
+index 8506a635790..564296f788e 100644
+--- a/libgcc/config/i386/t-linux
++++ b/libgcc/config/i386/t-linux
+@@ -3,5 +3,5 @@
+ # t-slibgcc-elf-ver and t-linux
+ SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
+ 
+-HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER $(CET_FLAGS)
++HOST_LIBGCC2_CFLAGS += -mlong-double-80 $(CET_FLAGS)
+ CRTSTUFF_T_CFLAGS += $(CET_FLAGS)

+ 182 - 0
recipes-devtools/gcc/gcc/0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch

@@ -0,0 +1,182 @@
+From 520411cf364ee4b0b5a8f0857498aaabd790afb3 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Tue, 10 Mar 2020 08:26:53 -0700
+Subject: [PATCH] gentypes/genmodes: Do not use __LINE__ for maintaining
+ reproducibility
+
+Inserting line numbers into generated code means its not always reproducible wth
+differing versions of host gcc. Void the issue by not adding these.
+
+Upstream-Status: Inappropriate [OE Reproducibility specific]
+
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/gengtype.c |  6 +++---
+ gcc/genmodes.c | 32 ++++++++++++++++----------------
+ 2 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/gcc/gengtype.c b/gcc/gengtype.c
+index 5f50242e857..cbaca9b8cd0 100644
+--- a/gcc/gengtype.c
++++ b/gcc/gengtype.c
+@@ -991,7 +991,7 @@ create_field_at (pair_p next, type_p type, const char *name, options_p opt,
+ /* Create a fake field with the given type and name.  NEXT is the next
+    field in the chain.  */
+ #define create_field(next,type,name) \
+-    create_field_all (next,type,name, 0, this_file, __LINE__)
++    create_field_all (next,type,name, 0, this_file, 0)
+ 
+ /* Like create_field, but the field is only valid when condition COND
+    is true.  */
+@@ -1024,7 +1024,7 @@ create_optional_field_ (pair_p next, type_p type, const char *name,
+ }
+ 
+ #define create_optional_field(next,type,name,cond)	\
+-       create_optional_field_(next,type,name,cond,__LINE__)
++       create_optional_field_(next,type,name,cond,0)
+ 
+ /* Reverse a linked list of 'struct pair's in place.  */
+ pair_p
+@@ -5189,7 +5189,7 @@ main (int argc, char **argv)
+       /* These types are set up with #define or else outside of where
+          we can see them.  We should initialize them before calling
+          read_input_list.  */
+-#define POS_HERE(Call) do { pos.file = this_file; pos.line = __LINE__; \
++#define POS_HERE(Call) do { pos.file = this_file; pos.line = 0; \
+ 	Call;} while (0)
+       POS_HERE (do_scalar_typedef ("CUMULATIVE_ARGS", &pos));
+       POS_HERE (do_scalar_typedef ("REAL_VALUE_TYPE", &pos));
+diff --git a/gcc/genmodes.c b/gcc/genmodes.c
+index c268ebc4c6e..4361f3f1563 100644
+--- a/gcc/genmodes.c
++++ b/gcc/genmodes.c
+@@ -438,7 +438,7 @@ complete_all_modes (void)
+ }
+ 
+ /* For each mode in class CLASS, construct a corresponding complex mode.  */
+-#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, __LINE__)
++#define COMPLEX_MODES(C) make_complex_modes (MODE_##C, __FILE__, 0)
+ static void
+ make_complex_modes (enum mode_class cl,
+ 		    const char *file, unsigned int line)
+@@ -497,7 +497,7 @@ make_complex_modes (enum mode_class cl,
+    having as many components as necessary.  ORDER is the sorting order
+    of the mode, with smaller numbers indicating a higher priority.  */
+ #define VECTOR_MODES_WITH_PREFIX(PREFIX, C, W, ORDER) \
+-  make_vector_modes (MODE_##C, #PREFIX, W, ORDER, __FILE__, __LINE__)
++  make_vector_modes (MODE_##C, #PREFIX, W, ORDER, __FILE__, 0)
+ #define VECTOR_MODES(C, W) VECTOR_MODES_WITH_PREFIX (V, C, W, 0)
+ static void ATTRIBUTE_UNUSED
+ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width,
+@@ -549,7 +549,7 @@ make_vector_modes (enum mode_class cl, const char *prefix, unsigned int width,
+ /* Create a vector of booleans called NAME with COUNT elements and
+    BYTESIZE bytes in total.  */
+ #define VECTOR_BOOL_MODE(NAME, COUNT, BYTESIZE) \
+-  make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, __LINE__)
++  make_vector_bool_mode (#NAME, COUNT, BYTESIZE, __FILE__, 0)
+ static void ATTRIBUTE_UNUSED
+ make_vector_bool_mode (const char *name, unsigned int count,
+ 		       unsigned int bytesize, const char *file,
+@@ -571,7 +571,7 @@ make_vector_bool_mode (const char *name, unsigned int count,
+ /* Input.  */
+ 
+ #define _SPECIAL_MODE(C, N) \
+-  make_special_mode (MODE_##C, #N, __FILE__, __LINE__)
++  make_special_mode (MODE_##C, #N, __FILE__, 0)
+ #define RANDOM_MODE(N) _SPECIAL_MODE (RANDOM, N)
+ #define CC_MODE(N) _SPECIAL_MODE (CC, N)
+ 
+@@ -584,7 +584,7 @@ make_special_mode (enum mode_class cl, const char *name,
+ 
+ #define INT_MODE(N, Y) FRACTIONAL_INT_MODE (N, -1U, Y)
+ #define FRACTIONAL_INT_MODE(N, B, Y) \
+-  make_int_mode (#N, B, Y, __FILE__, __LINE__)
++  make_int_mode (#N, B, Y, __FILE__, 0)
+ 
+ static void
+ make_int_mode (const char *name,
+@@ -611,16 +611,16 @@ make_opaque_mode (const char *name,
+ }
+ 
+ #define FRACT_MODE(N, Y, F) \
+-	make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, __LINE__)
++	make_fixed_point_mode (MODE_FRACT, #N, Y, 0, F, __FILE__, 0)
+ 
+ #define UFRACT_MODE(N, Y, F) \
+-	make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, __LINE__)
++	make_fixed_point_mode (MODE_UFRACT, #N, Y, 0, F, __FILE__, 0)
+ 
+ #define ACCUM_MODE(N, Y, I, F) \
+-	make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, __LINE__)
++	make_fixed_point_mode (MODE_ACCUM, #N, Y, I, F, __FILE__, 0)
+ 
+ #define UACCUM_MODE(N, Y, I, F) \
+-	make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, __LINE__)
++	make_fixed_point_mode (MODE_UACCUM, #N, Y, I, F, __FILE__, 0)
+ 
+ /* Create a fixed-point mode by setting CL, NAME, BYTESIZE, IBIT, FBIT,
+    FILE, and LINE.  */
+@@ -641,7 +641,7 @@ make_fixed_point_mode (enum mode_class cl,
+ 
+ #define FLOAT_MODE(N, Y, F)             FRACTIONAL_FLOAT_MODE (N, -1U, Y, F)
+ #define FRACTIONAL_FLOAT_MODE(N, B, Y, F) \
+-  make_float_mode (#N, B, Y, #F, __FILE__, __LINE__)
++  make_float_mode (#N, B, Y, #F, __FILE__, 0)
+ 
+ static void
+ make_float_mode (const char *name,
+@@ -658,7 +658,7 @@ make_float_mode (const char *name,
+ #define DECIMAL_FLOAT_MODE(N, Y, F)	\
+ 	FRACTIONAL_DECIMAL_FLOAT_MODE (N, -1U, Y, F)
+ #define FRACTIONAL_DECIMAL_FLOAT_MODE(N, B, Y, F)	\
+-  make_decimal_float_mode (#N, B, Y, #F, __FILE__, __LINE__)
++  make_decimal_float_mode (#N, B, Y, #F, __FILE__, 0)
+ 
+ static void
+ make_decimal_float_mode (const char *name,
+@@ -673,7 +673,7 @@ make_decimal_float_mode (const char *name,
+ }
+ 
+ #define RESET_FLOAT_FORMAT(N, F) \
+-  reset_float_format (#N, #F, __FILE__, __LINE__)
++  reset_float_format (#N, #F, __FILE__, 0)
+ static void ATTRIBUTE_UNUSED
+ reset_float_format (const char *name, const char *format,
+ 		    const char *file, unsigned int line)
+@@ -694,7 +694,7 @@ reset_float_format (const char *name, const char *format,
+ 
+ /* __intN support.  */
+ #define INT_N(M,PREC)				\
+-  make_int_n (#M, PREC, __FILE__, __LINE__)
++  make_int_n (#M, PREC, __FILE__, 0)
+ static void ATTRIBUTE_UNUSED
+ make_int_n (const char *m, int bitsize,
+             const char *file, unsigned int line)
+@@ -723,7 +723,7 @@ make_int_n (const char *m, int bitsize,
+ /* Partial integer modes are specified by relation to a full integer
+    mode.  */
+ #define PARTIAL_INT_MODE(M,PREC,NAME)				\
+-  make_partial_integer_mode (#M, #NAME, PREC, __FILE__, __LINE__)
++  make_partial_integer_mode (#M, #NAME, PREC, __FILE__, 0)
+ static void ATTRIBUTE_UNUSED
+ make_partial_integer_mode (const char *base, const char *name,
+ 			   unsigned int precision,
+@@ -750,7 +750,7 @@ make_partial_integer_mode (const char *base, const char *name,
+ /* A single vector mode can be specified by naming its component
+    mode and the number of components.  */
+ #define VECTOR_MODE(C, M, N) \
+-  make_vector_mode (MODE_##C, #M, N, __FILE__, __LINE__);
++  make_vector_mode (MODE_##C, #M, N, __FILE__, 0);
+ static void ATTRIBUTE_UNUSED
+ make_vector_mode (enum mode_class bclass,
+ 		  const char *base,
+@@ -793,7 +793,7 @@ make_vector_mode (enum mode_class bclass,
+ 
+ /* Adjustability.  */
+ #define _ADD_ADJUST(A, M, X, C1, C2) \
+-  new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, __LINE__)
++  new_adjust (#M, &adj_##A, #A, #X, MODE_##C1, MODE_##C2, __FILE__, 0)
+ 
+ #define ADJUST_NUNITS(M, X)    _ADD_ADJUST (nunits, M, X, RANDOM, RANDOM)
+ #define ADJUST_BYTESIZE(M, X)  _ADD_ADJUST (bytesize, M, X, RANDOM, RANDOM)

+ 26 - 0
recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch

@@ -0,0 +1,26 @@
+From 96d895c8d5dc895d24fe37aa2b4f201a2566b4cc Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 12 May 2020 10:39:09 -0700
+Subject: [PATCH] mingw32: Enable operation_not_supported
+
+Fixes nativesdk build errors on mingw32 gcc-runtime
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libstdc++-v3/config/os/mingw32/error_constants.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libstdc++-v3/config/os/mingw32/error_constants.h b/libstdc++-v3/config/os/mingw32/error_constants.h
+index eca06a97014..933cfab49cf 100644
+--- a/libstdc++-v3/config/os/mingw32/error_constants.h
++++ b/libstdc++-v3/config/os/mingw32/error_constants.h
+@@ -107,7 +107,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
+ #ifdef EPERM
+       operation_not_permitted = 		EPERM,
+ #endif
+-//    operation_not_supported = 		EOPNOTSUPP,
++      operation_not_supported = 		EOPNOTSUPP,
+ #ifdef EWOULDBLOCK
+       operation_would_block = 			EWOULDBLOCK,
+ #endif

+ 42 - 0
recipes-devtools/gcc/gcc/0037-libatomic-Do-not-enforce-march-on-aarch64.patch

@@ -0,0 +1,42 @@
+From 36d4fdbc99e69f9d70a29e2bada40cc3c1534557 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 13 May 2020 15:10:38 -0700
+Subject: [PATCH] libatomic: Do not enforce march on aarch64
+
+OE passes the right options via gcc compiler cmdline via TUNE_CCARGS
+this can conflict between -mcpu settings and -march setting here, since
+-mcpu will translate into an appropriate -march, lets depend on that
+instead of setting it explicitly
+
+Upstream-Status: Inappropriate [OE-Specific]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libatomic/Makefile.am | 1 -
+ libatomic/Makefile.in | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
+index 0f3cd6f7121..c8124c1d5aa 100644
+--- a/libatomic/Makefile.am
++++ b/libatomic/Makefile.am
+@@ -125,7 +125,6 @@ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix _$(s)_.lo,$(SIZEOBJS)))
+ ## On a target-specific basis, include alternates to be selected by IFUNC.
+ if HAVE_IFUNC
+ if ARCH_AARCH64_LINUX
+-IFUNC_OPTIONS	     = -march=armv8-a+lse
+ libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS)))
+ endif
+ if ARCH_ARM_LINUX
+diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
+index 0a51bd55f01..6d5b1581706 100644
+--- a/libatomic/Makefile.in
++++ b/libatomic/Makefile.in
+@@ -432,7 +432,6 @@ M_SRC = $(firstword $(filter %/$(M_FILE), $(all_c_files)))
+ libatomic_la_LIBADD = $(foreach s,$(SIZES),$(addsuffix \
+ 	_$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \
+ 	$(am__append_3) $(am__append_4)
+-@ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse
+ @ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64
+ @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586
+ @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16

+ 14 - 0
recipes-devtools/gcc/gcc_11.1.bb

@@ -0,0 +1,14 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require gcc-target.inc
+
+# Building with thumb enabled on armv4t armv5t fails with
+# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7438:(.text.unlikely+0x2fa): relocation truncated to fit: R_ARM_THM_CALL against symbol `fancy_abort(char const*, int, char const*)' defined in .glue_7 section in linker stubs
+# | gcc-4.8.1-r0/gcc-4.8.1/gcc/cp/decl.c:7442:(.text.unlikely+0x318): additional relocation overflows omitted from the output
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"
+
+ARMFPARCHEXT:armv6 = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
+ARMFPARCHEXT:armv7a = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
+ARMFPARCHEXT:armv7ve = "${@'+fp' if d.getVar('TARGET_FPU') == 'hard' else ''}"
+
+BBCLASSEXTEND = "nativesdk"

+ 160 - 0
recipes-devtools/gcc/libgcc-common.inc

@@ -0,0 +1,160 @@
+BPN = "libgcc"
+
+require gcc-configure-common.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+do_configure () {
+	install -d ${D}${base_libdir} ${D}${libdir}
+	mkdir -p ${B}/${BPN}
+	mkdir -p ${B}/${TARGET_SYS}/${BPN}/
+	cd ${B}/${BPN}
+	chmod a+x ${S}/${BPN}/configure
+	relpath=${@os.path.relpath("${S}/${BPN}", "${B}/${BPN}")}
+	$relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+}
+EXTRACONFFUNCS += "extract_stashed_builddir"
+do_configure[depends] += "${COMPILERDEP}"
+
+do_compile () {
+	cd ${B}/${BPN}
+	oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/${BPN}/
+}
+
+do_install () {
+	cd ${B}/${BPN}
+	oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/${BPN}/ install
+
+	# Move libgcc_s into /lib
+	mkdir -p ${D}${base_libdir}
+	if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
+		mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
+	else
+		mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
+	fi
+
+	# install the runtime in /usr/lib/ not in /usr/lib/gcc on target
+	# so that cross-gcc can find it in the sysroot
+
+	mv ${D}${libdir}/gcc/* ${D}${libdir}
+	rm -rf ${D}${libdir}/gcc/
+	# unwind.h is installed here which is shipped in gcc-cross
+	# as well as target gcc and they are identical so we dont
+	# ship one with libgcc here
+	rm -rf ${D}${libdir}/${TARGET_SYS}/${BINV}/include
+}
+
+do_install:append:libc-baremetal () {
+	rmdir ${D}${base_libdir}
+}
+do_install:append:libc-newlib () {
+	rmdir ${D}${base_libdir}
+}
+
+# No rpm package is actually created but -dev depends on it, avoid dnf error
+RDEPENDS:${PN}-dev:libc-baremetal = ""
+RDEPENDS:${PN}-dev:libc-newlib = ""
+
+BBCLASSEXTEND = "nativesdk"
+
+addtask multilib_install after do_install before do_package do_populate_sysroot
+# this makes multilib gcc files findable for target gcc
+# e.g.
+#    /usr/lib/i586-pokymllib32-linux/4.7/
+# by creating this symlink to it
+#    /usr/lib64/x86_64-poky-linux/4.7/32
+
+fakeroot python do_multilib_install() {
+    import re
+
+    multilibs = d.getVar('MULTILIB_VARIANTS')
+    if not multilibs or bb.data.inherits_class('nativesdk', d):
+        return
+
+    binv = d.getVar('BINV')
+
+    mlprefix = d.getVar('MLPREFIX')
+    if ('%slibgcc' % mlprefix) != d.getVar('PN'):
+        return
+
+    if mlprefix:
+        orig_tune = d.getVar('DEFAULTTUNE_MULTILIB_ORIGINAL')
+        orig_tune_params = get_tune_parameters(orig_tune, d)
+        orig_tune_baselib = orig_tune_params['baselib']
+        orig_tune_bitness = orig_tune_baselib.replace('lib', '')
+        if not orig_tune_bitness:
+            orig_tune_bitness = '32'
+
+        src = '../../../' + orig_tune_baselib + '/' + \
+            d.getVar('TARGET_SYS_MULTILIB_ORIGINAL') + '/' + binv + '/'
+
+        dest = d.getVar('D') + d.getVar('libdir') + '/' + \
+            d.getVar('TARGET_SYS') + '/' + binv + '/' + orig_tune_bitness
+
+        if os.path.lexists(dest):
+            os.unlink(dest)
+        os.symlink(src, dest)
+        return
+
+
+    for ml in multilibs.split():
+        tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml)
+        if not tune:
+            bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml)
+            continue
+
+        tune_parameters = get_tune_parameters(tune, d)
+        tune_baselib = tune_parameters['baselib']
+        if not tune_baselib:
+            bb.warn("Tune %s doesn't have a baselib set. Skipping..." % tune)
+            continue
+
+        tune_arch = tune_parameters['arch']
+        tune_bitness = tune_baselib.replace('lib', '')
+        if not tune_bitness:
+            tune_bitness = '32' # /lib => 32bit lib
+
+        tune_abiextension = tune_parameters['abiextension']
+        if tune_abiextension:
+            libcextension = '-gnu' + tune_abiextension
+        else:
+            libcextension = ''
+
+        src = '../../../' + tune_baselib + '/' + \
+            tune_arch + d.getVar('TARGET_VENDOR') + 'ml' + ml + \
+            '-' + d.getVar('TARGET_OS') + libcextension +  '/' + binv + '/'
+
+        dest = d.getVar('D') + d.getVar('libdir') + '/' + \
+            d.getVar('TARGET_SYS') + '/' + binv + '/' + tune_bitness
+
+        if os.path.lexists(dest):
+            os.unlink(dest)
+        os.symlink(src, dest)
+}
+
+def get_original_os(d):
+    vendoros = d.expand('${TARGET_ARCH}${ORIG_TARGET_VENDOR}-${TARGET_OS}')
+    for suffix in [d.getVar('ABIEXTENSION'), d.getVar('LIBCEXTENSION')]:
+        if suffix and vendoros.endswith(suffix):
+            vendoros = vendoros[:-len(suffix)]
+    # Arm must use linux-gnueabi not linux as only the former is accepted by gcc
+    if vendoros.startswith("arm-") and not vendoros.endswith("-gnueabi"):
+        vendoros = vendoros + "-gnueabi"
+    return vendoros
+
+ORIG_TARGET_VENDOR := "${TARGET_VENDOR}"
+BASETARGET_SYS = "${@get_original_os(d)}"
+
+addtask extra_symlinks after do_multilib_install before do_package do_populate_sysroot
+fakeroot python do_extra_symlinks() {
+    if bb.data.inherits_class('nativesdk', d):
+        return
+
+    targetsys = d.getVar('BASETARGET_SYS')
+
+    if targetsys != d.getVar('TARGET_SYS'):
+        dest = d.getVar('D') + d.getVar('libdir') + '/' + targetsys
+        src = d.getVar('TARGET_SYS')
+        if not os.path.lexists(dest) and os.path.lexists(d.getVar('D') + d.getVar('libdir')):
+            os.symlink(src, dest)
+}

+ 60 - 0
recipes-devtools/gcc/libgcc-initial.inc

@@ -0,0 +1,60 @@
+#
+# Notes on the way the OE cross toolchain now works
+#
+# We need a libgcc to build glibc. Tranditionally we therefore built
+# a non-threaded and non-shared compiler (gcc-cross-initial), then use
+# that to build libgcc-initial which is used to build glibc which we can
+# then build gcc-cross and libgcc against.
+#
+# We were able to drop the glibc dependency from gcc-cross, with two tweaks:
+
+# a) specify the minimum glibc version to support in a configure option
+# b) create a dummy limits.h file so that later when glibc creates one,
+#    the headers structure has support for it. We can do this with a simple
+#    empty file
+#
+# Once gcc-cross is libc independent, we can use it to build both
+# libgcc-initial and then later libgcc.
+#
+# libgcc-initial is tricky as we need to imitate the non-threaded and
+# non-shared case. We can do that by hacking the threading mode back to
+# "single" even if gcc reports "posix" and disable libc presence for the
+# libgcc-intial build. We have to create the dummy limits.h to avoid
+# compiler errors from a missing header.
+#
+# glibc will fail to link with libgcc-initial due to a missing "exception
+# handler" capable libgcc (libgcc_eh.a). Since we know glibc doesn't need
+# any exception handler, we can safely symlink to libgcc.a.
+#
+
+require libgcc-common.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}gcc"
+
+LICENSE = "GPL-3.0-with-GCC-exception"
+
+PACKAGES = ""
+
+EXTRA_OECONF += "--disable-shared"
+
+inherit nopackages
+
+# We really only want this built by things that need it, not any recrdeptask
+deltask do_build
+
+do_configure:prepend () {
+	install -d ${STAGING_INCDIR}
+	touch ${STAGING_INCDIR}/limits.h
+	sed -i -e 's#INHIBIT_LIBC_CFLAGS =.*#INHIBIT_LIBC_CFLAGS = -Dinhibit_libc#' ${B}/gcc/libgcc.mvars
+	sed -i -e 's#inhibit_libc = false#inhibit_libc = true#' ${B}/gcc/Makefile
+}
+
+do_configure:append () {
+	sed -i -e 's#thread_header = .*#thread_header = gthr-single.h#' ${B}/${BPN}/Makefile
+	sed -i -e '/^libgcc_tm_defines = $/a fp128_dec_funcs =' ${B}/${BPN}/Makefile
+	sed -i -e '/^libgcc_tm_defines = $/a fp128_decstr_funcs =' ${B}/${BPN}/Makefile
+}
+
+do_install:append () {
+	ln -s libgcc.a ${D}${libdir}/${TARGET_SYS}/${BINV}/libgcc_eh.a
+}

+ 5 - 0
recipes-devtools/gcc/libgcc-initial_11.1.bb

@@ -0,0 +1,5 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require libgcc-initial.inc
+
+# Building with thumb enabled on armv6t fails
+ARM_INSTRUCTION_SET:armv6 = "arm"

+ 53 - 0
recipes-devtools/gcc/libgcc.inc

@@ -0,0 +1,53 @@
+require libgcc-common.inc
+
+DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ virtual/${MLPREFIX}libc"
+
+do_install:append:class-target () {
+	if [ "${TCLIBC}" != "glibc" ]; then
+		case "${TARGET_OS}" in
+			"linux-musl" | "linux-*spe") extra_target_os="linux";;
+			"linux-musleabi") extra_target_os="linux-gnueabi";;
+			*) extra_target_os="linux";;
+		esac
+		if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then
+			ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os
+		fi
+	fi
+	if [ -n "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" ]; then
+		case "${TARGET_OS}" in
+			"linux-musleabi") extra_target_os="linux-musleabihf";;
+			"linux-gnueabi") extra_target_os="linux-gnueabihf";;
+		esac
+		if [ ! -e ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os ]; then
+			ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os
+		fi
+	fi
+}
+
+PACKAGES = "\
+    ${PN} \
+    ${PN}-dev \
+    ${PN}-dbg \
+"
+
+# All libgcc source is marked with the exception.
+#
+LICENSE:${PN} = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception"
+
+
+FILES:${PN}-dev = "\
+    ${base_libdir}/libgcc*.so \
+    ${@oe.utils.conditional('BASETARGET_SYS', '${TARGET_SYS}', '', '${libdir}/${BASETARGET_SYS}', d)} \
+    ${libdir}/${TARGET_SYS}/${BINV}* \
+    ${libdir}/${TARGET_ARCH}${TARGET_VENDOR}* \
+"
+
+do_package[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+
+INSANE_SKIP:${PN}-dev = "staticdev"
+

+ 5 - 0
recipes-devtools/gcc/libgcc_11.1.bb

@@ -0,0 +1,5 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require libgcc.inc
+
+# Building with thumb enabled on armv6t fails
+ARM_INSTRUCTION_SET:armv6 = "arm"

+ 83 - 0
recipes-devtools/gcc/libgfortran.inc

@@ -0,0 +1,83 @@
+require gcc-configure-common.inc
+
+EXTRA_OECONF_PATHS = "\
+    --with-sysroot=/not/exist \
+    --with-build-sysroot=${STAGING_DIR_TARGET} \
+"
+
+do_configure () {
+	for target in libbacktrace libgfortran
+	do
+		rm -rf ${B}/${TARGET_SYS}/$target/
+		mkdir -p ${B}/${TARGET_SYS}/$target/
+		cd ${B}/${TARGET_SYS}/$target/
+		chmod a+x ${S}/$target/configure
+		relpath=${@os.path.relpath("${S}", "${B}/${TARGET_SYS}")}
+		../$relpath/$target/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+		# Easiest way to stop bad RPATHs getting into the library since we have a
+		# broken libtool here
+		sed -i -e 's/hardcode_into_libs=yes/hardcode_into_libs=no/' ${B}/${TARGET_SYS}/$target/libtool
+	done
+}
+EXTRACONFFUNCS += "extract_stashed_builddir"
+do_configure[depends] += "${COMPILERDEP}"
+
+do_compile () {
+	for target in libbacktrace libgfortran
+	do
+		cd ${B}/${TARGET_SYS}/$target/
+		oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/$target/
+	done
+}
+
+do_install () {
+	cd ${B}/${TARGET_SYS}/libgfortran/
+	oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/libgfortran/ install
+	if [ -d ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude ]; then
+		rmdir --ignore-fail-on-non-empty -p ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+	fi
+	if [ -d ${D}${infodir} ]; then
+		rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
+	fi
+	chown -R root:root ${D}
+}
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = "gcc-runtime gcc-cross-${TARGET_ARCH}"
+
+BBCLASSEXTEND = "nativesdk"
+
+PACKAGES = "\
+    ${PN}-dbg \
+    libgfortran \
+    libgfortran-dev \
+    libgfortran-staticdev \
+"
+
+LICENSE:${PN} = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dev = "GPL-3.0-with-GCC-exception"
+LICENSE:${PN}-dbg = "GPL-3.0-with-GCC-exception"
+
+FILES:${PN} = "${libdir}/libgfortran.so.*"
+FILES:${PN}-dev = "\
+    ${libdir}/libgfortran*.so \
+    ${libdir}/libgfortran.spec \
+    ${libdir}/libgfortran.la \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/libgfortranbegin.* \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/libcaf_single* \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude/ \
+    ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ \
+"
+FILES:${PN}-staticdev = "${libdir}/libgfortran.a"
+
+INSANE_SKIP:${MLPREFIX}libgfortran-dev = "staticdev"
+
+do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata"
+
+python __anonymous () {
+    f = d.getVar("FORTRAN")
+    if "fortran" not in f:
+        raise bb.parse.SkipRecipe("libgfortran needs fortran support to be enabled in the compiler")
+}

+ 3 - 0
recipes-devtools/gcc/libgfortran_11.1.bb

@@ -0,0 +1,3 @@
+require recipes-devtools/gcc/gcc-${PV}.inc
+require libgfortran.inc
+