From patchwork Fri May 5 19:47:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98712 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292999qge; Fri, 5 May 2017 12:49:03 -0700 (PDT) X-Received: by 10.98.215.26 with SMTP id b26mr19064575pfh.162.1494013743077; Fri, 05 May 2017 12:49:03 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.49.02; Fri, 05 May 2017 12:49:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755654AbdEETtA (ORCPT + 6 others); Fri, 5 May 2017 15:49:00 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:50311 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754768AbdEETsp (ORCPT ); Fri, 5 May 2017 15:48:45 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MeGdC-1dPtSV3C18-00PrH9; Fri, 05 May 2017 21:48:37 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Ralf Baechle Subject: [PATCH 3.16-stable 83/87] MIPS: ip22: Fix ip28 build for modern gcc Date: Fri, 5 May 2017 21:47:41 +0200 Message-Id: <20170505194745.3627137-84-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:jXR50+s0Juw+AbpmOeZZJTItSLRf4x1Vmrb7GXxRkdHT1SM/nXI FAas18mVsMfvKQgpfX90ufq+BSGRnw5/pKUMsyVXVPwj3akJa3qsHqfaEU98sNZ5tamzV82 Ko9yrCHARAPOKqJyAwRC0we1jolEyISiRmoaMe/eJUx5GBgWgXYoMaFw/bGmC+nHwyYJc6H In/QQAP2v788+UD6TZ3mQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:tQdujVvIEeQ=:9pwUygk3mdeRVnt7Q3Nsnm ZnG0NssN/oXjYrl9o8y/e5RjjVJsMcsRuMFkjDxQzJ2p1Du/JcfSEo134hR4hVW6bLdy3DmaG 8cEhMYBJJuLZp3jE1qfOwjv4OD2v6xsAycdq/AYH/xKY3mhRK3fgb1je5Ifdaa9nBat7vyM5p 6l4BYO2+o3GthaS7L/0YQW10Jt0zdo5/QJ7Y6kQmH6zA44nd3E0VMJnbDDQaZIBrYi35z5XI2 H1fZDxzv99nYxxI9slCcaoptfUitky1I2oFv6ImxyBDqWmu6rs2jgyj7PlHnynfhX77mni1Ww BAP5mqB37ceJNFlfQ1evMlMxPyFNLzLnxenwT+LovOYa3C1t+HUcX0CM5Jfyd1Y/TQQxkOxG3 wEQtovQlfhSsg5lELSHsf9Ge0DoynOpGt/TnWEMpe+7zncUry7yeSAoVmRmrlUmq7o0cWhm5/ dCjTz2qWbFuOq7NZvdXig3kIp0Ts+5uMhSpMAQ/+Ro6Kh92j0TjqWlGz9hBRxQPZGyPZ9lUIL AMn6zFeZyW3CjqQtMZPCYQFl+CPyseOH1TqMXXsKqE1MB8alJkGFmAz5v2XKdFIQX5Dc/pL2R +wHvVr3qBSETHqSh7oULnE9Fh/mwaMvlciq4lD4SqIpqnMvy6gXcLFjNlUFl6EPYjLOEJRK8f bnreAJD0+9TV7RnzOI9F9n2fk5/nu3Sk+oukXGbDJk7HTnwThMm4ZOWDSoRNUGI4EN+M= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit c3ef8bf59deea37d1105ffb771b163d3c322fff7 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 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 Signed-off-by: Arnd Bergmann --- arch/mips/sgi-ip22/Platform | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 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