lkml.org 
[lkml]   [2017]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 009/142] MIPS: ip22: Fix ip28 build for modern gcc
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 23ca9b522383d3b9b7991d8586db30118992af4a upstream.

    kernelci reports a failure of the ip28_defconfig build after upgrading its
    gcc version:

    arch/mips/sgi-ip22/Platform:29: *** gcc doesn't support needed option -mr10k-cache-barrier=store. Stop.

    The problem apparently is that the -mr10k-cache-barrier=store option is now
    rejected for CPUs other than r10k. Explicitly including the CPU in the
    check fixes this and is safe because both options were introduced in
    gcc-4.4.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/15049/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    arch/mips/sgi-ip22/Platform | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/mips/sgi-ip22/Platform b/arch/mips/sgi-ip22/Platform
    index b7a4b7e04c38..e8f6b3a42a48 100644
    --- a/arch/mips/sgi-ip22/Platform
    +++ b/arch/mips/sgi-ip22/Platform
    @@ -25,7 +25,7 @@ endif
    # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys
    #
    ifdef CONFIG_SGI_IP28
    - ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n)
    + ifeq ($(call cc-option-yn,-march=r10000 -mr10k-cache-barrier=store), n)
    $(error gcc doesn't support needed option -mr10k-cache-barrier=store)
    endif
    endif
    --
    2.12.2
    \
     
     \ /
      Last update: 2017-04-10 18:15    [W:4.290 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site