lkml.org 
[lkml]   [2018]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 067/143] kbuild: set no-integrated-as before incl. arch Makefile
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 0f0e8de334c54c38818a4a5390a39aa09deff5bf ]

    In order to make sure compiler flag detection for ARM works
    correctly the no-integrated-as flags need to be set before
    including the arch specific Makefile.

    Fixes: cfe17c9bbe6a ("kbuild: move cc-option and cc-disable-warning after incl. arch Makefile")
    Signed-off-by: Stefan Agner <stefan@agner.ch>
    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    Makefile | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/Makefile b/Makefile
    index 16d1a18496fb..8cc08595b760 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -487,6 +487,8 @@ CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN)
    endif
    KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
    KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
    +KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
    +KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
    endif

    RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
    @@ -721,8 +723,6 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
    # See modpost pattern 2
    KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
    KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
    -KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
    -KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
    else

    # These warnings generated too much noise in a regular build.
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-02 20:26    [W:4.078 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site