linux-lts/trunk/0002-gcc-plugins-modern-gcc-plugin-infrastructure-requres.patch

   1 From 50b29ce228d0622eae2b9854c5e4b9334c540a7a Mon Sep 17 00:00:00 2001
   2 From: Levente Polyak <levente@leventepolyak.net>
   3 Date: Thu, 1 Sep 2021 22:19:19 +0200
   4 Subject: [PATCH] gcc-plugins: modern gcc plugin infrastructure requres c++11
   5  std
   6
   7 Bump the used std to c++11 to avoid detection failure. This fixes the
   8 support check on modern gcc plugin infrastructure that requires a
   9 minimum standard of c++11 to compile.
  10
  11 This effectively requires GCC 4.8.1.
  12
  13 Signed-off-by: Levente Polyak <levente@leventepolyak.net>
  14 ---
  15  scripts/gcc-plugin.sh | 2 +-
  16  1 file changed, 1 insertion(+), 1 deletion(-)
  17
  18 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
  19 index b79fd0bea838..7abc00f60a8b 100755
  20 --- a/scripts/gcc-plugin.sh
  21 +++ b/scripts/gcc-plugin.sh
  22 @@ -8,7 +8,7 @@ srctree=$(dirname "$0")
  23  gccplugins_dir=$($* -print-file-name=plugin)
  24
  25  # we need a c++ compiler that supports the designated initializer GNU extension
  26 -$HOSTCC -c -x c++ -std=gnu++98 - -fsyntax-only -I $srctree/gcc-plugins -I $gccplugins_dir/include 2>/dev/null <<EOF
  27 +$HOSTCC -c -x c++ -std=gnu++11 - -fsyntax-only -I $srctree/gcc-plugins -I $gccplugins_dir/include 2>/dev/null <<EOF
  28  #include "gcc-common.h"
  29  class test {
  30  public:
  31 --
  32 2.33.0
  33
  34 commit 67a5a68013056cbcf0a647e36cb6f4622fb6a470
  35 Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
  36 Date:   Sat Dec 26 13:21:58 2020 -0500
  37
  38     gcc-plugins: fix gcc 11 indigestion with plugins...
  39
  40     Fedora Rawhide has started including gcc 11,and the g++ compiler
  41     throws a wobbly when it hits scripts/gcc-plugins:
  42
  43       HOSTCXX scripts/gcc-plugins/latent_entropy_plugin.so
  44     In file included from /usr/include/c++/11/type_traits:35,
  45                      from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/system.h:244,
  46                      from /usr/lib/gcc/x86_64-redhat-linux/11/plugin/include/gcc-plugin.h:28,
  47                      from scripts/gcc-plugins/gcc-common.h:7,
  48                      from scripts/gcc-plugins/latent_entropy_plugin.c:78:
  49     /usr/include/c++/11/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO
  50      C++ 2011 standard. This support must be enabled with the -std=c++11 or -std=gnu++11 compiler options.
  51        32 | #error This file requires compiler and library support \
  52
  53     In fact, it works just fine with c++11, which has been in gcc since 4.8,
  54     and we now require 4.9 as a minimum.
  55
  56     Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
  57     Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
  58     Signed-off-by: Kees Cook <keescook@chromium.org>
  59     Link: https://lore.kernel.org/r/82487.1609006918@turing-police
  60
  61 diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile
  62 index d66949bfeba4..b5487cce69e8 100644
  63 --- a/scripts/gcc-plugins/Makefile
  64 +++ b/scripts/gcc-plugins/Makefile
  65 @@ -22,9 +22,9 @@ always-y += $(GCC_PLUGIN)
  66  GCC_PLUGINS_DIR = $(shell $(CC) -print-file-name=plugin)
  67
  68  plugin_cxxflags        = -Wp,-MMD,$(depfile) $(KBUILD_HOSTCXXFLAGS) -fPIC \
  69 -                  -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++98 \
  70 +                  -I $(GCC_PLUGINS_DIR)/include -I $(obj) -std=gnu++11 \
  71                    -fno-rtti -fno-exceptions -fasynchronous-unwind-tables \
  72 -                  -ggdb -Wno-narrowing -Wno-unused-variable -Wno-c++11-compat \
  73 +                  -ggdb -Wno-narrowing -Wno-unused-variable \
  74                    -Wno-format-diag
  75
  76  plugin_ldflags = -shared