From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751433AbdAQP3H (ORCPT ); Tue, 17 Jan 2017 10:29:07 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:54009 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751139AbdAQP24 (ORCPT ); Tue, 17 Jan 2017 10:28:56 -0500 From: Arnd Bergmann To: Ralf Baechle Cc: linux-mips@linux-mips.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 12/13] MIPS: ip22: fix ip28 build for modern gcc Date: Tue, 17 Jan 2017 16:18:46 +0100 Message-Id: <20170117151911.4109452-12-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170117151911.4109452-1-arnd@arndb.de> References: <20170117151911.4109452-1-arnd@arndb.de> X-Provags-ID: V03:K0:D++CXBECm0fPqgmZQ9uQo82wPd+Otq872mb6tfrldDUPZLYip46 noIydWKHri2w2MEytDBD6uNL31iXpfBRLuqAJ0ztjUc/FQpXl8NBCNmJ0sEtPrp8RyicNJr UfhiM1phZO4bThXRTyKSBkGPiVSphfUBemJPbwttZMfRdz2S6Gcxoif5i4H9anhRGpa7Xmb GTRZyf5AB0+2Ny5e5p1Tw== X-UI-Out-Filterresults: notjunk:1;V01:K0:xzPM8xJ6r4Y=:+E54sDfudV26VHynmUab/r yFV6N8DEaupnDhrIRbBUw56j4YHLd88j/1LP7yAK8WGdiAO102FyRl+wlklROYDQ0bpDCnY1k 83mDo7x7Sh66fODC1esAlZNToDHvliWaUWOBDfReOnjJnZP0KNL0bcxzq47domiVeFJRpqDhN 3IjvP4fWk+VJOJsjMPchFG0BNymkGIJLuMGamkSatuQ8snbVf8xz8hhvA/Gld7mzcaG5VGGAm zfRGx87rAFuc22XpH3apfDjcQr/SQRENt3a4+uecDSjX/api9V3hnMZ/ufl3DmSSslUTEL8dt RUv7Kb2EGGU+qiz8JniZopIAthCTxEhrDm5bZfG1bh9u0b/qS9RxSFYRAOg6mfPaxyKBfSCcx 2vIvPPWmwdxUCyjpGdcQBJK6B2YUrujwiPak/NJwb6uGn0rgxpPbmfCgNKMnKvJsjnXKfInb1 d4jCYM3wMpY1SMPODfMVmpBAkPCLvjtg6Vwwp2jPoX3yECex0McjrO5qZVcZWTSSUh/x4apY+ C1SlgJrka1aVEGeeNseK88zDG4sql24DJnQ/8F6AYUCaHa41VZAnTgOBnCfgA7DECTcns928i UYratR96jLKOn8hULvtWpV7XKqMrDJOvEstKXrpARwj20MO2Z/AdN0uw+8fJs8/LVFCcdTvN0 +py9gkduXyzJFXdEdNzc/Ds6djizUaoRnNIZQ2AA75Rsg+ye/iNgdaY2GTq6/nnJRl8s= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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.9.0