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;
Message-ID: <7bbf0a3c97f817c81df2316fca0ec88d5a6b4302.camel@perches.com>
Subject: Re: [PATCH] compiler-gcc: get back Clang build
From:   Joe Perches <joe@perches.com>
To:     Masahiro Yamada <yamada.masahiro@socionext.com>,
        Linus Torvalds <torvalds@linux-foundation.org>
Cc:     Kees Cook <keescook@chromium.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Jonathan Corbet <corbet@lwn.net>,
        Arnd Bergmann <arnd@arndb.de>,
        David Woodhouse <dwmw@amazon.co.uk>,
        linux-kernel@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
        Will Deacon <will.deacon@arm.com>,
        Geert Uytterhoeven <geert@linux-m68k.org>,
        Ingo Molnar <mingo@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Date:   Tue, 21 Aug 2018 03:39:43 -0700
In-Reply-To: <1534834088-15835-1-git-send-email-yamada.masahiro@socionext.com>
References: <1534834088-15835-1-git-send-email-yamada.masahiro@socionext.com>
Content-Type: text/plain; charset="ISO-8859-1"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, 2018-08-21 at 15:48 +0900, Masahiro Yamada wrote:
> Commit cafa0010cd51 ("Raise the minimum required gcc version to 4.6")
> missed the fact that <linux/compiler-gcc.h> 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

Perhaps this would work, but I can't test it as
my clang version doesn't otherwise build a defconfig
and errors out with

$ make CC=clang
arch/x86/Makefile:179: *** Compiler lacks asm-goto support..  Stop.

---
 include/linux/compiler-gcc.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 3e70b7d4e9ed..3a06ad823fa4 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -3,6 +3,23 @@
 #error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."
 #endif
 
+/*
+ * Override clang compiler version #defines
+ *
+ * compiler_types.h always #includes compiler-gcc.h before compiler-clang,h
+ * but clang sets these __GNUC version #defines to 4.2.1.
+ * This breaks the gcc minimum version of 4.6.0, so override the clang
+ * definitions to 4.6.0
+ */
+#ifdef __clang__
+    #undef __GNUC__
+    #undef __GNUC_MINOR__
+    #undef __GNUC_PATCHLEVEL__
+    #define __GNUC__ 4
+    #define __GNUC_MINOR__ 6
+    #define __GNUC_PATCHLEVEL__ 0
+#endif
+