From 5934d86345c6625560809611322e35f44f3151a4 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Tue, 5 Jan 2021 08:57:39 -0600
Subject: Build fixes

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 gcc11-plugins-fix.patch            | 13 +++++++++++++
 kernel-aarch64-debug-fedora.config |  2 +-
 kernel-aarch64-debug-rhel.config   |  2 +-
 kernel.spec                        |  3 +++
 4 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 gcc11-plugins-fix.patch

diff --git a/gcc11-plugins-fix.patch b/gcc11-plugins-fix.patch
new file mode 100644
index 000000000..caac69117
--- /dev/null
+++ b/gcc11-plugins-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile
+index d66949bfeba4..a6c35d651704 100644
+--- a/scripts/gcc-plugins/Makefile
++++ b/scripts/gcc-plugins/Makefile
+@@ -22,7 +22,7 @@ always-y += $(GCC_PLUGIN)
+ GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin)
+
+ plugin_cxxflags	= -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \
+-		   -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++98 \
++		   -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \
+ 		   -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \
+ 		   -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \
+ 		   -Wno-format-diag
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 2a33d82bb..83fc4b61f 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3269,7 +3269,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KARMA_PARTITION=y
 CONFIG_KASAN_GENERIC=y
-CONFIG_KASAN_HW_TAGS=y
+# CONFIG_KASAN_HW_TAGS is not set
 CONFIG_KASAN_INLINE=y
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_SW_TAGS is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 68567baed..0c3358348 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2599,7 +2599,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_KASAN_GENERIC=y
-CONFIG_KASAN_HW_TAGS=y
+# CONFIG_KASAN_HW_TAGS is not set
 CONFIG_KASAN_INLINE=y
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_SW_TAGS is not set
diff --git a/kernel.spec b/kernel.spec
index 35625247f..a129f8cc9 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -379,6 +379,7 @@ Summary: The Linux kernel
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
+%define use_vdso 0
 %define all_arch_configs kernel-%{version}-ppc64le*.config
 %endif
 
@@ -742,6 +743,7 @@ Source4000: README.rst
 
 Patch1: patch-%{rpmversion}-redhat.patch
 Patch2: secureboot_merge_fix.patch
+Patch3: gcc11-plugins-fix.patch
 %endif
 
 # empty final patch to facilitate testing of kernel patches
@@ -1246,6 +1248,7 @@ cp -a %{SOURCE1} .
 
 ApplyOptionalPatch patch-%{rpmversion}-redhat.patch
 ApplyOptionalPatch secureboot_merge_fix.patch
+ApplyOptionalPatch gcc11-plugins-fix.patch
 %endif
 
 ApplyOptionalPatch linux-kernel-test.patch
-- 
cgit