lkml.org 
[lkml]   [2022]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 082/130] Makefile: Set retpoline cflags based on CONFIG_CC_IS_{CLANG,GCC}
    Date
    From: Ben Hutchings <ben@decadent.org.uk>

    This was done as part of commit 7d73c3e9c51400d3e0e755488050804e4d44737a
    "Makefile: remove stale cc-option checks" upstream, and is needed to
    support backporting further retpoline changes.

    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    Makefile | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    --- a/Makefile
    +++ b/Makefile
    @@ -670,12 +670,14 @@ ifdef CONFIG_FUNCTION_TRACER
    CC_FLAGS_FTRACE := -pg
    endif

    -RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
    -RETPOLINE_VDSO_CFLAGS_GCC := -mindirect-branch=thunk-inline -mindirect-branch-register
    -RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk
    -RETPOLINE_VDSO_CFLAGS_CLANG := -mretpoline
    -RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))
    -RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_VDSO_CFLAGS_CLANG)))
    +ifdef CONFIG_CC_IS_GCC
    +RETPOLINE_CFLAGS := $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register)
    +RETPOLINE_VDSO_CFLAGS := $(call cc-option,-mindirect-branch=thunk-inline -mindirect-branch-register)
    +endif
    +ifdef CONFIG_CC_IS_CLANG
    +RETPOLINE_CFLAGS := -mretpoline-external-thunk
    +RETPOLINE_VDSO_CFLAGS := -mretpoline
    +endif
    export RETPOLINE_CFLAGS
    export RETPOLINE_VDSO_CFLAGS


    \
     
     \ /
      Last update: 2022-07-12 20:55    [W:4.058 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site