From patchwork Tue Jun 13 00:55:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 9782905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 10A3560325 for ; Tue, 13 Jun 2017 00:56:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03D70284BF for ; Tue, 13 Jun 2017 00:56:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC74F28538; Tue, 13 Jun 2017 00:56:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93F5E284BF for ; Tue, 13 Jun 2017 00:56:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753237AbdFMA4F (ORCPT ); Mon, 12 Jun 2017 20:56:05 -0400 Received: from mail-pg0-f52.google.com ([74.125.83.52]:33106 "EHLO mail-pg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752734AbdFMA4D (ORCPT ); Mon, 12 Jun 2017 20:56:03 -0400 Received: by mail-pg0-f52.google.com with SMTP id f185so52292081pgc.0 for ; Mon, 12 Jun 2017 17:56:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8jkdO6Dw8FsGEjo5wWSYeE+cqglx1ncize/w3mO6dmg=; b=dNWbnvjlUPfh/s1BRq4T9kqqetg3VXsQmhHfGAgxZRO8e5t33cOnZo5//2LWaUcb5d A7t2jErcxMACA3MqnVKcwTLrVARhVN/8OXMSAoA6uTLh+oLoK8zcyL/ItrIkzVaL4D6V wn2fUjJI8sVq3K+/miaD4sOPMePUAejLg6Vnnfu2PFfY0+DO8h09hhcTOGRs+S4ZpeC/ Z+6yj3nd6hXIjhJIOErcNcewvB+GxT8iWsrOvxxV2Otn/ntTCgX0tI3Ds+ov+dKZbO/y xlJEaM0v8HNeOF93B5LKDj8nM7UEjS/kyEBmkN0wdI/3jM02ZRnkGVJp+plwj0oNbJc1 vBAw== X-Gm-Message-State: AKS2vOwA4dKSL/UKL2dEWNxGyB3QPivvCyieFgmASjRoT7sumMHfZ3Rb saR63rKWlMI7b3dm X-Received: by 10.98.56.6 with SMTP id f6mr11388441pfa.199.1497315362445; Mon, 12 Jun 2017 17:56:02 -0700 (PDT) Received: from mka.mtv.corp.google.com ([172.22.64.162]) by smtp.gmail.com with ESMTPSA id g13sm20658432pgu.54.2017.06.12.17.56.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Jun 2017 17:56:01 -0700 (PDT) From: Matthias Kaehlcke To: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , "H . J . Lu" , David Woodhouse , Masahiro Yamada , Michal Marek Cc: x86@kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Davidson , Greg Hackmann , Nick Desaulniers , Stephen Hines , Kees Cook , Arnd Bergmann , Bernhard.Rosenkranzer@linaro.org, Peter Foley , Behan Webster , Douglas Anderson , Matthias Kaehlcke Subject: [PATCH 2/3] x86/build: Use cc-option-no-kbuild for boot code compiler options Date: Mon, 12 Jun 2017 17:55:30 -0700 Message-Id: <20170613005531.77656-3-mka@chromium.org> X-Mailer: git-send-email 2.13.1.508.gb3defc5cc-goog In-Reply-To: <20170613005531.77656-1-mka@chromium.org> References: <20170613005531.77656-1-mka@chromium.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP cc-option uses KBUILD_CFLAGS and KBUILD_CPPFLAGS when checking if a compiler option is available. These flags aren't used to build the boot code, in consequence cc-option can yield wrong results. For example -mpreferred-stack-boundary=2 is never set with a 64 bit compiler, since the setting is only valid for 16 and 32 bit binaries. This is also the case for 32 bit kernel builds, because the option -m32 is added to KBUILD_CFLAGS after the assignment of REALMODE_CFLAGS. Use cc-option-no-kbuild instead of cc-option for the boot mode options. The macro receives the compiler options as parameter instead of using KBUILD_C*FLAGS. For the boot code we pass REALMODE_CFLAGS. Also use separate statements for the cc-option-no-kbuild checks instead of performing them in the initial assignment of REALMODE_CFLAGS since the variable is an input of the macro. Signed-off-by: Matthias Kaehlcke --- arch/x86/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index bf240b920473..86b725d69423 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -24,10 +24,11 @@ REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -D__KERNEL__ \ -DDISABLE_BRANCH_PROFILING \ -Wall -Wstrict-prototypes -march=i386 -mregparm=3 \ -fno-strict-aliasing -fomit-frame-pointer -fno-pic \ - -mno-mmx -mno-sse \ - $(call cc-option, -ffreestanding) \ - $(call cc-option, -fno-stack-protector) \ - $(call cc-option, -mpreferred-stack-boundary=2) + -mno-mmx -mno-sse + +REALMODE_CFLAGS += $(call cc-option-no-kbuild, $(REALMODE_CFLAGS), -ffreestanding) +REALMODE_CFLAGS += $(call cc-option-no-kbuild, $(REALMODE_CFLAGS), -fno-stack-protector) +REALMODE_CFLAGS += $(call cc-option-no-kbuild, $(REALMODE_CFLAGS), -mpreferred-stack-boundary=2) export REALMODE_CFLAGS # BITS is used as extension for files which are available in a 32 bit