lkml.org 
[lkml]   [2020]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 02/39] gcc-common.h: Update for GCC 10
    Date
    From: Frédéric Pierret (fepitre) <frederic.pierret@qubes-os.org>

    [ Upstream commit c7527373fe28f97d8a196ab562db5589be0d34b9 ]

    Remove "params.h" include, which has been dropped in GCC 10.

    Remove is_a_helper() macro, which is now defined in gimple.h, as seen
    when running './scripts/gcc-plugin.sh g++ g++ gcc':

    In file included from <stdin>:1:
    ./gcc-plugins/gcc-common.h:852:13: error: redefinition of ‘static bool is_a_helper<T>::test(U*) [with U = const gimple; T = const ggoto*]’
    852 | inline bool is_a_helper<const ggoto *>::test(const_gimple gs)
    | ^~~~~~~~~~~~~~~~~~~~~~~~~~
    In file included from ./gcc-plugins/gcc-common.h:125,
    from <stdin>:1:
    /usr/lib/gcc/x86_64-redhat-linux/10/plugin/include/gimple.h:1037:1: note: ‘static bool is_a_helper<T>::test(U*) [with U = const gimple; T = const ggoto*]’ previously declared here
    1037 | is_a_helper <const ggoto *>::test (const gimple *gs)
    | ^~~~~~~~~~~~~~~~~~~~~~~~~~~

    Add -Wno-format-diag to scripts/gcc-plugins/Makefile to avoid
    meaningless warnings from error() formats used by plugins:

    scripts/gcc-plugins/structleak_plugin.c: In function ‘int plugin_init(plugin_name_args*, plugin_gcc_version*)’:
    scripts/gcc-plugins/structleak_plugin.c:253:12: warning: unquoted sequence of 2 consecutive punctuation characters ‘'-’ in format [-Wformat-diag]
    253 | error(G_("unknown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
    | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    Signed-off-by: Frédéric Pierret (fepitre) <frederic.pierret@qubes-os.org>
    Link: https://lore.kernel.org/r/20200407113259.270172-1-frederic.pierret@qubes-os.org
    [kees: include -Wno-format-diag for plugin builds]
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    scripts/gcc-plugins/Makefile | 1 +
    scripts/gcc-plugins/gcc-common.h | 4 ++++
    2 files changed, 5 insertions(+)

    diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile
    index e2ff425f4c7ea..c404d7628039e 100644
    --- a/scripts/gcc-plugins/Makefile
    +++ b/scripts/gcc-plugins/Makefile
    @@ -10,6 +10,7 @@ else
    HOST_EXTRACXXFLAGS += -I$(GCC_PLUGINS_DIR)/include -I$(src) -std=gnu++98 -fno-rtti
    HOST_EXTRACXXFLAGS += -fno-exceptions -fasynchronous-unwind-tables -ggdb
    HOST_EXTRACXXFLAGS += -Wno-narrowing -Wno-unused-variable
    + HOST_EXTRACXXFLAGS += -Wno-format-diag
    export HOST_EXTRACXXFLAGS
    endif

    diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
    index 797e3786b415f..01312b1d6294f 100644
    --- a/scripts/gcc-plugins/gcc-common.h
    +++ b/scripts/gcc-plugins/gcc-common.h
    @@ -35,7 +35,9 @@
    #include "ggc.h"
    #include "timevar.h"

    +#if BUILDING_GCC_VERSION < 10000
    #include "params.h"
    +#endif

    #if BUILDING_GCC_VERSION <= 4009
    #include "pointer-set.h"
    @@ -841,6 +843,7 @@ static inline gimple gimple_build_assign_with_ops(enum tree_code subcode, tree l
    return gimple_build_assign(lhs, subcode, op1, op2 PASS_MEM_STAT);
    }

    +#if BUILDING_GCC_VERSION < 10000
    template <>
    template <>
    inline bool is_a_helper<const ggoto *>::test(const_gimple gs)
    @@ -854,6 +857,7 @@ inline bool is_a_helper<const greturn *>::test(const_gimple gs)
    {
    return gs->code == GIMPLE_RETURN;
    }
    +#endif

    static inline gasm *as_a_gasm(gimple stmt)
    {
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-05-14 21:03    [W:4.130 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site