From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753123AbdHUJ0d (ORCPT <rfc822;w@1wt.eu>);
        Mon, 21 Aug 2017 05:26:33 -0400
Received: from terminus.zytor.com ([65.50.211.136]:38427 "EHLO
        terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752563AbdHUJ0c (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 21 Aug 2017 05:26:32 -0400
Date: Mon, 21 Aug 2017 02:20:52 -0700
From: tip-bot for Matthias Kaehlcke <tipbot@zytor.com>
Message-ID: <tip-9e8730b178a2472fca3123e909d6e69cc8127778@git.kernel.org>
Cc: mka@chromium.org, hpa@zytor.com, keescook@chromium.org,
        ndesaulniers@google.com, ghackmann@google.com,
        torvalds@linux-foundation.org, yamada.masahiro@socionext.com,
        srhines@google.com, arnd@arndb.de, tglx@linutronix.de,
        mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org,
        md@google.com, fengguang.wu@intel.com
Reply-To: tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org,
        ghackmann@google.com, torvalds@linux-foundation.org, arnd@arndb.de,
        srhines@google.com, yamada.masahiro@socionext.com,
        fengguang.wu@intel.com, md@google.com, peterz@infradead.org,
        keescook@chromium.org, ndesaulniers@google.com, mka@chromium.org,
        hpa@zytor.com
In-Reply-To: <20170817182047.176752-1-mka@chromium.org>
References: <20170817182047.176752-1-mka@chromium.org>
To: linux-tip-commits@vger.kernel.org
Subject: [tip:x86/build] x86/build: Use cc-option to validate stack
 alignment parameter
Git-Commit-ID: 9e8730b178a2472fca3123e909d6e69cc8127778
X-Mailer: tip-git-log-daemon
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit-ID:  9e8730b178a2472fca3123e909d6e69cc8127778
Gitweb:     http://git.kernel.org/tip/9e8730b178a2472fca3123e909d6e69cc8127778
Author:     Matthias Kaehlcke <mka@chromium.org>
AuthorDate: Thu, 17 Aug 2017 11:20:47 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 21 Aug 2017 09:53:15 +0200

x86/build: Use cc-option to validate stack alignment parameter

With the following commit:

  8f91869766c0 ("x86/build: Fix stack alignment for CLang")

cc-option is only used to determine the name of the stack alignment option
supported by the compiler, but not to verify that the actual parameter
<option>=N is valid in combination with the other CFLAGS.

This causes problems (as reported by the kbuild robot) with older GCC versions
which only support stack alignment on a boundary of 16 bytes or higher.

Also use (__)cc_option to add the stack alignment option to CFLAGS to
make sure only valid options are added.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Bernhard.Rosenkranzer@linaro.org
Cc: Greg Hackmann <ghackmann@google.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michael Davidson <md@google.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephen Hines <srhines@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: dianders@chromium.org
Fixes: 8f91869766c0 ("x86/build: Fix stack alignment for CLang")
Link: http://lkml.kernel.org/r/20170817182047.176752-1-mka@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 48f3ae7..6276572 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -38,7 +38,7 @@ REALMODE_CFLAGS	:= $(M16_CFLAGS) -g -Os -D__KERNEL__ \
 
 REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -ffreestanding)
 REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -fno-stack-protector)
-REALMODE_CFLAGS += $(cc_stack_align4)
+REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), $(cc_stack_align4))
 export REALMODE_CFLAGS
 
 # BITS is used as extension for files which are available in a 32 bit
@@ -78,7 +78,7 @@ ifeq ($(CONFIG_X86_32),y)
         # Align the stack to the register width instead of using the default
         # alignment of 16 bytes. This reduces stack usage and the number of
         # alignment instructions.
-        KBUILD_CFLAGS += $(cc_stack_align4)
+        KBUILD_CFLAGS += $(call cc-option,$(cc_stack_align4))
 
         # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
         # a lot more stack due to the lack of sharing of stacklots:
@@ -117,7 +117,7 @@ else
         # default alignment which keep the stack *mis*aligned.
         # Furthermore an alignment to the register width reduces stack usage
         # and the number of alignment instructions.
-        KBUILD_CFLAGS += $(cc_stack_align8)
+        KBUILD_CFLAGS += $(call cc-option,$(cc_stack_align8))
 
 	# Use -mskip-rax-setup if supported.
 	KBUILD_CFLAGS += $(call cc-option,-mskip-rax-setup)