From patchwork Tue Aug 21 06:48:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 144684 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4896613ljj; Mon, 20 Aug 2018 23:49:46 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyfyXtQzAiqLxm1YfEX5S9UWVjhqP/Y5ak7ozL617qo2Hwg8uUw2KSV23Aoo2t8gjkBel7D X-Received: by 2002:a17:902:8486:: with SMTP id c6-v6mr49022135plo.105.1534834186379; Mon, 20 Aug 2018 23:49:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534834186; cv=none; d=google.com; s=arc-20160816; b=f66EAQ586Zg8BzYs6pf2xzFsEldE8UwajN6jk0pIPgINWC0bfNcWOCbYbSxkgvIlW3 29eVi/xfyAWT1t2ZrkpbvCo7BvnaDnMuYLKYSL6yc7SdDYxIKHi5MHPhFqMCZ2MN9pBC ygWfwzc8E2QWuZB4yEtPxbAzau+JIZvI8JVANRckpSqMwdO0WvW4V1UVZtjsUvDrtqqa ASDxR/2zkxN8gPeGXXHnYrJ406aq4FO4K0I82f10+gm6iq6Cwxa7HySf7EavLC/Gcpq6 BSpu6/MwdRsdqoCOj1ikTcpPtfBjvUkLHotayxOTYNb4oFtG1STGqT8RZXJ48WK6+7VN xl3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=9uIc3QcRIoszUTUNj1elJxtIjS/bvNPoEAYdfC6wQMo=; b=Isg8jeOoiheVN6OHUCLEwRqH2E6g2Ep5IPngIDTWD9KBlauKbQxD6jQg3u93upyRMu 68Fqu9l2Lr11WJXVkknX3iVUpn0r45Ur9eQx3oB4WwOft1Vxfpq/b+ObsVxDutbE/bLL hNtzlOtYw/wBoeTVmXU7ZMy7YmSmvnPkSRo5QLYTnZN7Nl4g/sljEhCRs3LqJ+r19K6L dtffj9vSjVQEKpaUiu7H+UhiiqQKDdvJPoNaWd8u7pKOdlpaf0R5rE9YU6UuK9fKyP9P Zdy1aRvg9cPcyNBIeDThB+B8Et7HW7jvFO3gSrtpIiWx4pFmkiBpYOGnIApe86FzRi72 L2Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UmEeRRMf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y3-v6si11344348pgg.266.2018.08.20.23.49.46; Mon, 20 Aug 2018 23:49:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UmEeRRMf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726719AbeHUKIe (ORCPT + 32 others); Tue, 21 Aug 2018 06:08:34 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:21560 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726253AbeHUKIe (ORCPT ); Tue, 21 Aug 2018 06:08:34 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id w7L6mA2a011149; Tue, 21 Aug 2018 15:48:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com w7L6mA2a011149 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1534834091; bh=9uIc3QcRIoszUTUNj1elJxtIjS/bvNPoEAYdfC6wQMo=; h=From:To:Cc:Subject:Date:From; b=UmEeRRMfhdIXBj4PwpHMiXaYXAJPUiHjpQHU6e+88e6QSguJcFCC8SFJUX0XE5U6j zbDEjyvGU9OBGO/KqVdkvzU6dWNfh3bIu3kFtt6YA30nZjRCON05uOvSkmlBVrovww dahF3OYScp1Stvin9T6lLuGRRuiBoF64WZCDEhhTkIe838QNOtTy/m5o5PqFUoOdAM mTnQCHHLiiWpbP6QT02+pd5+WNUNEWjL+igRgVowT2CFMlSiXH/6cqgTM0hjJyT03f FyJu5d08hWSYaXjLqYgh8C+FwPhsGVX0GA0kHWFNfDTV2BN94j2dUcGJyQpUgkiS9I xOBQl7+2+/MQg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Linus Torvalds Cc: Kees Cook , Nick Desaulniers , Joe Perches , Jonathan Corbet , Masahiro Yamada , Arnd Bergmann , David Woodhouse , linux-kernel@vger.kernel.org, Thomas Gleixner , Will Deacon , Geert Uytterhoeven , Ingo Molnar , Andrew Morton Subject: [PATCH] compiler-gcc: get back Clang build Date: Tue, 21 Aug 2018 15:48:08 +0900 Message-Id: <1534834088-15835-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit cafa0010cd51 ("Raise the minimum required gcc version to 4.6") missed the fact that is included by Clang as well as by GCC. Clang actually defines __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__ and it looks like GCC 4.2.1. $ scripts/gcc-version.sh -p clang 040201 If you try to build the kernel with Clang, you will get the "Sorry, your compiler is too old - please upgrade it." followed by a bunch of "unknown attribute" warnings. Add !defined(__clang__) to the minimum version check. Also, revive the version test blocks for versions >= 4.2.1 in order to disable features not supported by Clang. Fixes: cafa0010cd51 ("Raise the minimum required gcc version to 4.6") Signed-off-by: Masahiro Yamada --- include/linux/compiler-gcc.h | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) -- 2.7.4 Tested-by: Nick Desaulniers diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 250b9b7..8e41fd2 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -10,7 +10,7 @@ + __GNUC_MINOR__ * 100 \ + __GNUC_PATCHLEVEL__) -#if GCC_VERSION < 40600 +#if !defined(__clang__) && GCC_VERSION < 40600 # error Sorry, your compiler is too old - please upgrade it. #endif @@ -163,7 +163,16 @@ #define __used __attribute__((__used__)) #define __compiler_offsetof(a, b) \ __builtin_offsetof(a, b) +#define __compiletime_object_size(obj) __builtin_object_size(obj, 0) +/* + * GCC version specific checks + * + * Keep the version checks for 4.2.1 or newer + * because Clang defines GCC_VERSION as 40201 + */ + +#if GCC_VERSION >= 40300 /* Mark functions as cold. gcc will assume any path leading to a call * to them will be unlikely. This means a lot of manual unlikely()s * are unnecessary now for any paths leading to the usual suspects @@ -182,15 +191,20 @@ #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) +#ifndef __CHECKER__ +# define __compiletime_warning(message) __attribute__((warning(message))) +# define __compiletime_error(message) __attribute__((error(message))) +#endif /* __CHECKER__ */ +#endif /* GCC_VERSION >= 40300 */ + +#if GCC_VERSION >= 40400 #define __optimize(level) __attribute__((__optimize__(level))) #define __nostackprotector __optimize("no-stack-protector") +#endif /* GCC_VERSION >= 40400 */ -#define __compiletime_object_size(obj) __builtin_object_size(obj, 0) +#if GCC_VERSION >= 40500 #ifndef __CHECKER__ -#define __compiletime_warning(message) __attribute__((warning(message))) -#define __compiletime_error(message) __attribute__((error(message))) - #ifdef LATENT_ENTROPY_PLUGIN #define __latent_entropy __attribute__((latent_entropy)) #endif @@ -232,6 +246,9 @@ #define randomized_struct_fields_end } __randomize_layout; #endif +#endif /* GCC_VERSION >= 40500 */ + +#if GCC_VERSION >= 40600 /* * When used with Link Time Optimization, gcc can optimize away C functions or * variables which are referenced only from assembly code. __visible tells the @@ -240,7 +257,7 @@ */ #define __visible __attribute__((externally_visible)) -/* gcc version specific checks */ +#endif /* GCC_VERSION >= 40600 */ #if GCC_VERSION >= 40900 && !defined(__CHECKER__) /* @@ -274,8 +291,10 @@ * folding in __builtin_bswap*() (yet), so don't set these for it. */ #if defined(CONFIG_ARCH_USE_BUILTIN_BSWAP) && !defined(__CHECKER__) +#if GCC_VERSION >= 40400 #define __HAVE_BUILTIN_BSWAP32__ #define __HAVE_BUILTIN_BSWAP64__ +#endif #if GCC_VERSION >= 40800 #define __HAVE_BUILTIN_BSWAP16__ #endif @@ -327,9 +346,12 @@ #define __diag_GCC_warn warning #define __diag_GCC_error error +/* Compilers before gcc-4.6 do not understand "#pragma GCC diagnostic push" */ +#if GCC_VERSION >= 40600 #define __diag_str1(s) #s #define __diag_str(s) __diag_str1(s) #define __diag(s) _Pragma(__diag_str(GCC diagnostic s)) +#endif #if GCC_VERSION >= 80000 #define __diag_GCC_8(s) __diag(s)