gcc-plugins: fix gcc 11 indigestion with plugins...
PATCH v2 1/1 gcc-plugins: fix gcc 11 indigestion with plugins...
Fedora Rawhide has started including gcc 11,and the g++ compiler throws a wobbly when it hits scripts/gcc-plugins:
HOSTCXX scripts/gcc-plugins/latent_entropy_plugin.so
In file included from /usr/include/c++/11/type_traits:35,
from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/system.h:244,
from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/gcc-plugin.h:28,
from scripts/gcc-plugins/gcc-common.h:7,
from scripts/gcc-plugins/latent_entropy_plugin.c:78:/usr/include/c++/11/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO
C++ 2011 standard. This support must be enabled with the -std=c++11 or -std=gnu++11 compiler options.
32 | #error This file requires compiler and library support \
Patch is more complicated than would otherwise be needed, because older gcc (4.9, 5.4) have gnu++11 but throw an error due to a gcc bug
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69959
---
scripts/gcc-plugins/Makefile +5 -2
@@ -21,10 +21,13 @@ always-y += $(GCC_PLUGIN) GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin) +# need gnu++11 for gcc 11, but 4.9 and 5.4 need gnu++98 +GCC_FLAVOR = $(call cc-ifversion, -ge, 1100, 11, 98) + 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++$(GCC_FLAVOR) \ -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \ - -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \ + -ggdb -Wno-narrowing -Wno-unused-variable \ -Wno-format-diag plugin_ldflags = -shared
Quoted 29 lines · Valdis Klētnieks
Fedora Rawhide has started including gcc 11,and the g++ compiler throws a wobbly when it hits
scripts/gcc-plugins:HOSTCXX
scripts/gcc-plugins/latent_entropy_plugin.so
In file included from/usr/include/c++/11/type_traits:35,from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/system.h:244, from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/gcc-plugin.h:28, from scripts/gcc-plugins/gcc-common.h:7, from scripts/gcc-plugins/latent_entropy_plugin.c:78:
/usr/include/c++/11/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO
C++ 2011 standard. This support must be enabled with the -std=c++11 or -std=gnu++11 compiler options.
32 | #error This file requires compiler and library support \Patch is more complicated than would otherwise be needed, because older gcc (4.9, 5.4) have gnu++11 but throw an error due to a gcc bug
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69959Signed-off-by Valdis Kletnieks <[email protected]>---
scripts/gcc-plugins/Makefile +2
-0@@ -21,10 +21,13 @@ always-y += $(GCC_PLUGIN) GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin) +# need gnu++11 for gcc 11, but 4.9 and 5.4 need gnu++98 +GCC_FLAVOR = $(call cc-ifversion, -ge, 1100, 11, 98)
scripts/gcc-plugins/Makefile always-y += $(GCC_PLUGIN) · line 33
Quoted 10 lines
scripts/gcc-plugins/Makefile +3
-2+ 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++$(GCC_FLAVOR) \ -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \ - -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \ + -ggdb -Wno-narrowing -Wno-unused-variable \ -Wno-format-diag plugin_ldflags = -shared
The first patch has already been merged into Linus' tree, so this probably should be an incremental fix on top, with a Fixes: tag.
Signature · 1 line
Josh
Quoted 39 lines · Josh Poimboeuf
Quoted 38 lines · Valdis Klētnieks
Fedora Rawhide has started including gcc 11,and the g++ compiler throws a wobbly when it hits
scripts/gcc-plugins:HOSTCXX
scripts/gcc-plugins/latent_entropy_plugin.so
In file included from/usr/include/c++/11/type_traits:35,from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/system.h:244, from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/gcc-plugin.h:28, from scripts/gcc-plugins/gcc-common.h:7, from scripts/gcc-plugins/latent_entropy_plugin.c:78:
/usr/include/c++/11/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO
C++ 2011 standard. This support must be enabled with the -std=c++11 or -std=gnu++11 compiler options.
32 | #error This file requires compiler and library support \Patch is more complicated than would otherwise be needed, because older gcc (4.9, 5.4) have gnu++11 but throw an error due to a gcc bug
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69959Signed-off-by Valdis Kletnieks <[email protected]>---
scripts/gcc-plugins/Makefile +5
-2@@ -21,10 +21,13 @@ always-y += $(GCC_PLUGIN) GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin) +# need gnu++11 for gcc 11, but 4.9 and 5.4 need gnu++98 +GCC_FLAVOR = $(call cc-ifversion, -ge, 1100, 11, 98) + 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++$(GCC_FLAVOR) \ -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \ - -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \ + -ggdb -Wno-narrowing -Wno-unused-variable \ -Wno-format-diag
Quoted 4 lines
scripts/gcc-plugins/Makefile always-y += $(GCC_PLUGIN) · line 33
Quoted 1 line
scripts/gcc-plugins/Makefile +0
-0plugin_ldflags = -sharedThe first patch has already been merged into Linus' tree, so this probably should be an incremental fix on top, with a Fixes: tag.
Yes, please. :)
Signature · 1 line
Kees Cook
Quoted 2 lines · Josh Poimboeuf
The first patch has already been merged into Linus' tree, so this probably should be an incremental fix on top, with a Fixes: tag.
Gaah. v3 in a moment. :)