Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: Valdis Kletnieks <valdis@vt.edu>
From:   "Valdis =?utf-8?Q?Kl=c4=93tnieks?=" <valdis.kletnieks@vt.edu>
To:     Kees Cook <keescook@chromium.org>
Cc:     linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] gcc-plugins:  fix gcc 11 indigestion with plugins...
Mime-Version: 1.0
Content-Type: multipart/signed; boundary="==_Exmh_1609006918_4356P";
         micalg=pgp-sha1; protocol="application/pgp-signature"
Content-Transfer-Encoding: 7bit
Date:   Sat, 26 Dec 2020 13:21:58 -0500
Message-ID: <82487.1609006918@turing-police>
Precedence: bulk

--==_Exmh_1609006918_4356P
Content-Type: text/plain; charset=us-ascii

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 \

In fact, it works just fine with c++11, which has been in gcc since 4.8,
and we now require 4.9 as a minimum.

Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>

diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile
index d66949bfeba4..b5487cce69e8 100644
--- a/scripts/gcc-plugins/Makefile
+++ b/scripts/gcc-plugins/Makefile
@@ -22,9 +22,9 @@ 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 \
+		   -ggdb -Wno-narrowing -Wno-unused-variable \
 		   -Wno-format-diag

 plugin_ldflags	= -shared


--==_Exmh_1609006918_4356P
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Comment: Exmh version 2.9.0 11/07/2018

iQIVAwUBX+d/RAdmEQWDXROgAQL+QQ//VlQ8W9zmlGGNw9N87wt0a73K7ttGSb7e
ZZZNDroD3jM77BtJBpJ99p/6M98NNMsUktOATnTvUdWMy7JrSenDr0DReZPGdI84
qjRV0XQM0LDx99Osc0D+FuQGuSeLrtyHmFI7bBH893S8SX4DpKjL4614GJ6eespi
qBYFV99f3YgN9RXg6OZSMwTcWKMMcmsE9wyYmR4H02TMr+ajqx1dv+mp9JnmYNhO
/CamaxFicoEPwAYoQHuw2xWVszP4JV8Zta/K5eHnwaOYeXHfkh2qwP1+KbbYTEzL
PSXHQPauO2psGIfxIIBVw8xb6pXrncWc3wzg1D/nr6VVzEDk1c7fwT7DMMnXWO6X
3zsnAk7509L9hdxVbYBFbFby8V47xnDrH4tVvOCvTjzUh8ujFb9K7m89e+hKaOGm
yCfqRUvUy8m9CZJQNOHmzNKvYoOahIEWSjkVIJN0DBiK57y3lLfkA7BU0G73kN49
aj4gpwbzSXe9iEvP1fa8ntq/amrc/nItNFwW0eIMzuMT9aKDIUupqfhD6VWRG4ve
nYBOoeuSaddj0UgpY28q4ZH9Xd2/BZSKKfInYd5Fy8kNfiGilNGWpLeVEJ3QH77q
JMWHW7N1ZxPF4umPhfQ+Pw1eR2EZof+n4Iqv5EWKoJxenNU1Wxw96wyMXJsVm5C7
hm7B40xKJuo=
=F4DK
-----END PGP SIGNATURE-----

--==_Exmh_1609006918_4356P--