Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp222180imu; Wed, 21 Nov 2018 18:36:13 -0800 (PST) X-Google-Smtp-Source: AFSGD/XSkT1nwfx+pzXiAzSHUFKgn97Eq/48uQlhqqyVB0ZEviVKVWJLgug0Gd6FJB1hAbwnkAX5 X-Received: by 2002:a17:902:2cc1:: with SMTP id n59-v6mr9514661plb.26.1542854173871; Wed, 21 Nov 2018 18:36:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542854173; cv=none; d=google.com; s=arc-20160816; b=HHJUHPEYG6ZCEcEc3mkfmu9htE4cPOFlfmRreAaWoXDX/OAA+k/+tSpNTOUqzzkgXT 5htlDnucdHl+JCQWTizf3sk01oSa5DIr5APxhkePthg0pSusotK1gspyw5AQKm8yfUbJ DCO3fWJ1B1YJ37bjrLzBWTfALCvUnuHCO8NQuQUWhUzwTaQAFPOeMPaOR3BSfhtOD8JW nJXFAS/4moPDUIv/IUnhneIu1bodY1B3e9OLqZ8xbPMRl7VymI4i/1z9fQSp9X+D9ynD 7uPSpLvgGVHOgzm4alH49gxk8WRAFUClzt4+qrUyphXCRuAm8DMFzoIRmgYsvdQQHefU jq1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C40lYRtVCHh9r2D3guOv1gBiSMpq4hhuGEX4mNdfYAU=; b=Eb7Wh6i5YXVm3J3rc2lPe2Rv2rs6Xo+rS6ywmdONp6N2zmWPwTa5VTFSq1Hw8ajVV4 l2egrGsTgExRzruKmQPjNo0sOWtPxxwP6Ptb8nvUJCz6DLtHz61ftlxYqsYm1qkqNUvW H2cDXhK5hF4fh+Dtv1c/Vzynvv6TiCYWoCxWReyMI1/XCZLttqvAoFNYakM7ETSKW23T vZzM8fUjUMR9vIZRsRynXzaR8rFsTbT7GV3QCZaJxDicCNzjynm5K36t9jLUMsXQuqMr 68rxyCtmoxnU5KosG1Qw7LZDesatsI6fkeZChGD4stIzC6f6Yh3RU9apcD5xSIUuIbN/ b33g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NkfpSCmr; 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 15si29493908pfv.38.2018.11.21.18.35.57; Wed, 21 Nov 2018 18:36:13 -0800 (PST) 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=@kernel.org header.s=default header.b=NkfpSCmr; 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 S1732298AbeKVFuj (ORCPT + 99 others); Thu, 22 Nov 2018 00:50:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:40936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730924AbeKVFpy (ORCPT ); Thu, 22 Nov 2018 00:45:54 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CE66D2151B; Wed, 21 Nov 2018 19:10:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542827421; bh=QbIqRMfcFd7cE9cd0S0g3JEkF1HRuB8ZNXi//dPwGJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NkfpSCmrRYoWFbe65mZVdmy7F7uqNRhLsyrnSNuaXmyrabCLO4rFg/axAAxka5mRz daVtxjkdQdolPv3xjtMkrcrNjaTUrOphwEJikcUvprkzV7nGug/U1HjWfKa0Pb9Lch PS5YlIdC0nVv2DeF4SZ0/Q74M8kJgDlKG8F3L1y0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthias Kaehlcke , Ingo Molnar , Masahiro Yamada , Nick Desaulniers Subject: [PATCH 4.9 23/59] x86/build: Use __cc-option for boot code compiler options Date: Wed, 21 Nov 2018 20:06:38 +0100 Message-Id: <20181121183509.165565662@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121183508.262873520@linuxfoundation.org> References: <20181121183508.262873520@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthias Kaehlcke commit 032a2c4f65a2f81c93e161a11197ba19bc14a909 upstream. cc-option is used to enable compiler options for the boot code if they are available. The macro uses KBUILD_CFLAGS and KBUILD_CPPFLAGS for the check, however 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 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 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 Acked-by: Ingo Molnar Signed-off-by: Masahiro Yamada Signed-off-by: Nick Desaulniers Signed-off-by: Greg Kroah-Hartman --- arch/x86/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -24,10 +24,11 @@ REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -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, $(CC), $(REALMODE_CFLAGS), -ffreestanding) +REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -fno-stack-protector) +REALMODE_CFLAGS += $(call __cc-option, $(CC), $(REALMODE_CFLAGS), -mpreferred-stack-boundary=2) export REALMODE_CFLAGS # BITS is used as extension for files which are available in a 32 bit