open-power · shenki · Mar 15, 2022 · Mar 15, 2022 · Mar 17, 2022 · Mar 17, 2022
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "buildroot"]
 	path = buildroot
-	branch = 2021.02-op-build
+	branch = 2022.02-op-build
 	url = https://github.com/open-power/buildroot
diff --git a/buildroot b/buildroot
diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig
@@ -1,9 +1,8 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/blackbird-patches"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -18,7 +17,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/denali_defconfig b/openpower/configs/denali_defconfig
@@ -1,6 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_VERSION_2_32_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
@@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.50"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/mihawk_defconfig b/openpower/configs/mihawk_defconfig
@@ -1,9 +1,8 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/mihawk-patches"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -18,7 +17,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/mowgli_defconfig b/openpower/configs/mowgli_defconfig
@@ -1,8 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -17,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/nicole_defconfig b/openpower/configs/nicole_defconfig
@@ -1,8 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -16,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/opal_defconfig b/openpower/configs/opal_defconfig
@@ -1,6 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -13,7 +13,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig
@@ -1,9 +1,8 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
-BR2_BINUTILS_VERSION_2_32_X=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
++BR2_BINUTILS_VERSION_2_32_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -18,7 +17,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.50"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
@@ -1,8 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -17,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
@@ -1,8 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -17,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/swift_defconfig b/openpower/configs/swift_defconfig
@@ -1,8 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -17,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
@@ -1,8 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -17,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
@@ -1,8 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_8_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -17,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
@@ -1,6 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.68"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.28"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

diff --git a/openpower/package/hostboot-p10/0001-util-Fix-unique_ptr-with-GCC-9.patch b/openpower/package/hostboot-p10/0001-util-Fix-unique_ptr-with-GCC-9.patch
@@ -0,0 +1,27 @@
+From fd9ca28d5fd2a4428add2e4c04b3514d5d1dae3f Mon Sep 17 00:00:00 2001
+From: Joel Stanley <joel@linux.ibm.com>
+Date: Thu, 17 Mar 2022 12:46:15 +1030
+Subject: [PATCH 1/4] util: Fix unique_ptr with GCC 9
+
+Change-Id: I08ead07fe5b587b43e06410b31dbfdba54d9a442
+Signed-off-by: Joel Stanley <joel@linux.ibm.com>
+---
+ src/include/util/impl/unique_ptr.H | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/include/util/impl/unique_ptr.H b/src/include/util/impl/unique_ptr.H
+index 689794330196..5c486526b81b 100644
+--- a/src/include/util/impl/unique_ptr.H
++++ b/src/include/util/impl/unique_ptr.H
+@@ -402,7 +402,7 @@ namespace std
+              * @return        Value of T::operator[](i)
+              */
+             template<typename Index, typename X = T>
+-            typename enable_if<is_array<X>::value, decltype(declval<X>()[declval<Index>()])>::type
++            typename enable_if<is_array<X>::value, decltype(declval<X>()[declval<Index>()])>::type&
+             operator[](const Index i)
+             {
+                 return iv_ptr[i];
+-- 
+2.35.1
+
diff --git a/openpower/package/hostboot-p10/0002-utilmisc-Fix-build-error-with-GCC-10.patch b/openpower/package/hostboot-p10/0002-utilmisc-Fix-build-error-with-GCC-10.patch
@@ -0,0 +1,96 @@
+From 6fbd93ed7307402027aa336fc6dc512022e7baeb Mon Sep 17 00:00:00 2001
+From: Joel Stanley <joel@linux.ibm.com>
+Date: Thu, 17 Mar 2022 14:00:52 +1030
+Subject: [PATCH 2/4] utilmisc: Fix build error with GCC 10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From when this was introduced (2737de709eae) it wasn't commented why it
+was done this way. Clean it up.
+
+utilmisc.C:31:6: error: ‘bool Util::isSimics()’ specifies less restrictive attribute than its target ‘bool Util::__isSimicsRunning()’: ‘nothrow’ [-Werror=missing-attributes]
+   31 | bool isSimics() __attribute__((alias("__isSimicsRunning")));
+      |      ^~~~~~~~
+utilmisc.C:34:6: note: ‘bool Util::isSimics()’ target declared here
+   34 | bool __isSimicsRunning()
+      |      ^~~~~~~~~~~~~~~~~
+utilmisc.C:48:6: error: ‘bool Util::isQmeModelEnabled()’ specifies less restrictive attribute than its target ‘bool Util::__isQmeEnabled()’: ‘nothrow’ [-Werror=missing-attributes]
+   48 | bool isQmeModelEnabled() __attribute__((alias("__isQmeEnabled")));
+      |      ^~~~~~~~~~~~~~~~~
+utilmisc.C:51:6: note: ‘bool Util::isQmeModelEnabled()’ target declared here
+   51 | bool __isQmeEnabled()
+      |      ^~~~~~~~~~~~~~
+
+Change-Id: Id5291022b09dca6789175d69e54a30d55f1bde13
+Signed-off-by: Joel Stanley <joel@linux.ibm.com>
+---
+ src/lib/utilmisc.C | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/lib/utilmisc.C b/src/lib/utilmisc.C
+index b3ca1ac04c53..85665c824487 100644
+--- a/src/lib/utilmisc.C
++++ b/src/lib/utilmisc.C
+@@ -28,8 +28,7 @@
+ namespace Util
+ {
+
+-bool isSimics() __attribute__((alias("__isSimicsRunning")));
+-extern "C" bool __isSimicsRunning() NEVER_INLINE;
++bool __isSimicsRunning() NEVER_INLINE;
+
+ bool __isSimicsRunning()
+ {
+@@ -40,12 +39,11 @@ bool __isSimicsRunning()
+
+ bool isSimicsRunning()
+ {
+-    static bool simics = isSimics();
++    static bool simics = __isSimicsRunning();
+     return simics;
+ }
+
+
+-bool isQmeModelEnabled() __attribute__((alias("__isQmeEnabled")));
+ extern "C" bool __isQmeEnabled() NEVER_INLINE;
+
+ bool __isQmeEnabled()
+@@ -58,7 +56,7 @@ bool __isQmeEnabled()
+ bool requiresSecondaryCoreWorkaround()
+ {
+     static const auto required =
+-        isSimicsRunning() && !isQmeModelEnabled();
++        isSimicsRunning() && !__isQmeEnabled();
+     return required;
+ }
+
+@@ -86,10 +84,14 @@ void setIsConsoleStarted()
+     g_isConsoleStarted = true;
+ }
+
+-bool isMultiprocSupported() __attribute__((alias("__isMultiprocSupported")));
+ extern "C" bool __isMultiprocSupported() NEVER_INLINE;
+
+-bool __isMultiprocSupported()
++bool __isMulitprocSupported()
++{
++	return MAGIC_INST_CHECK_FEATURE(MAGIC_FEATURE__MULTIPROC);
++}
++
++bool isMultiprocSupported()
+ {
+     bool multiprocSupport = true;
+
+@@ -98,7 +100,7 @@ bool __isMultiprocSupported()
+ #else
+     if (isSimicsRunning())
+     {
+-        multiprocSupport = MAGIC_INST_CHECK_FEATURE(MAGIC_FEATURE__MULTIPROC);
++        multiprocSupport = __isMulitprocSupported();
+     }
+ #endif
+
+-- 
+2.35.1
+