From patchwork Tue Jun 6 06:46:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1790814 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=EwyBc+yO; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qb1Jf2xMQz20Ty for ; Tue, 6 Jun 2023 16:48:18 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Qb1Jf1tKFz3f5p for ; Tue, 6 Jun 2023 16:48:18 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=EwyBc+yO; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::232; helo=mail-oi1-x232.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=EwyBc+yO; dkim-atps=neutral Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Qb1HN31Jbz3bhY for ; Tue, 6 Jun 2023 16:47:10 +1000 (AEST) Received: by mail-oi1-x232.google.com with SMTP id 5614622812f47-38dec65ab50so4959099b6e.2 for ; Mon, 05 Jun 2023 23:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686034028; x=1688626028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k+2hnibm51Z4eFyIfbE8qClOlpPWVMFeBYurMpTccNA=; b=EwyBc+yOi7YcUxqOQo8JQrqI4v8ZyizmnbJVxtGnEYG+waQ3pz1BetXixpOzWwiSzV 86SPWV1UktTu45LqZDrsHhhEOCd/b8gM7Atwm/MsAKanLlZhMdy1tLU42WkCJAKscbQR MY1/pB77fWp0na172bt5rbmZzterjy+C/4Kgp3pOi1YhfoNM4weJ/RMoCMJhycOGyviy TeU5JDTrsW6iDn4cvIOkkfeZqOamExkC3Ko459hreg854gnNkFmN2P3S/s8jLf9IaMvb jv9RWkkEuY7G/6cGD317bHAHordI+SsXJJ7tzchwWN/HTRQiODlHQIbT+GUusHdq8c+p +log== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686034028; x=1688626028; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k+2hnibm51Z4eFyIfbE8qClOlpPWVMFeBYurMpTccNA=; b=US0FhN9KrJqizsY837d03GeJt3LtSVGa5Iok4XtxGGLc5zvPQiZUoBFKxrDXzGZbvR b91Nuvt9LwRR+M17GddnLbXJ+v6UypFWrcNr4ufDv53q29PRJ/fwcaH69XfYG60+ZHmx nRWuQgCzGaDY2P+cgMMhedAWVvYjZr8irw/aFRb7khcMz86s2ga5OinvccNkZ/ocqFCV jxwiwxCY6elIFJN7T4R9o74KdS4iAoeswj53S7NBCXJGoqmwg/W3ke9xJxc9MeO+JqKU 9NclKZhKmXj4ObGy4XwhCJlsvKBJ1NaEZnt0MF7vkz5vEQptYqvbkwhmrdQoVhNu+3pa oDvA== X-Gm-Message-State: AC+VfDxINxs34JYKcuRP1Lr6dFVfkCohXHEDtZ/mCdqLV152B5YG0iQO IPcLLLyLxRqQoKUYODj3QQwjyE7JZpc= X-Google-Smtp-Source: ACHHUZ4SLzW1rHU4+fCkkBL2aPJ2Q3IP9TTci0SQHDiTvm4lyioEIM3vGxcZDq/IFm/Ql0DAE4TELQ== X-Received: by 2002:aca:2419:0:b0:39a:c202:b2e with SMTP id n25-20020aca2419000000b0039ac2020b2emr1189620oic.28.1686034027908; Mon, 05 Jun 2023 23:47:07 -0700 (PDT) Received: from wheely.local0.net ([1.146.61.5]) by smtp.gmail.com with ESMTPSA id c14-20020aa78e0e000000b0063d24fcc2besm6130449pfr.125.2023.06.05.23.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 23:47:07 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 1/4] powerpc/boot: Separate target flags from BOOTCFLAGS Date: Tue, 6 Jun 2023 16:46:54 +1000 Message-Id: <20230606064657.183969-2-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606064657.183969-1-npiggin@gmail.com> References: <20230606064657.183969-1-npiggin@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add BOOTTARGETFLAGS variable with target / ABI options common to CFLAGS and AFLAGS. Signed-off-by: Nicholas Piggin --- arch/powerpc/boot/Makefile | 41 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 771b79423bbc..ae80f7f1774e 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -39,33 +39,44 @@ BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ $(LINUXINCLUDE) ifdef CONFIG_PPC64_BOOT_WRAPPER -BOOTCFLAGS += -m64 +BOOTTARGETFLAGS += -m64 +BOOTTARGETFLAGS += -mabi=elfv2 ifdef CONFIG_PPC64_ELF_ABI_V2 -BOOTCFLAGS += $(call cc-option,-mabi=elfv2) +BOOTTARGETFLAGS += $(call cc-option,-mabi=elfv2) endif else -BOOTCFLAGS += -m32 +BOOTTARGETFLAGS := -m32 endif ifdef CONFIG_TARGET_CPU_BOOL -BOOTCFLAGS += -mcpu=$(CONFIG_TARGET_CPU) +BOOTTARGETFLAGS += -mcpu=$(CONFIG_TARGET_CPU) else ifdef CONFIG_PPC64_BOOT_WRAPPER ifdef CONFIG_CPU_LITTLE_ENDIAN -BOOTCFLAGS += -mcpu=powerpc64le +BOOTTARGETFLAGS += -mcpu=powerpc64le else -BOOTCFLAGS += -mcpu=powerpc64 +BOOTTARGETFLAGS += -mcpu=powerpc64 endif endif +$(obj)/4xx.o: BOOTTARGETFLAGS += -mcpu=405 +$(obj)/ebony.o: BOOTTARGETFLAGS += -mcpu=440 +$(obj)/cuboot-hotfoot.o: BOOTTARGETFLAGS += -mcpu=405 +$(obj)/cuboot-taishan.o: BOOTTARGETFLAGS += -mcpu=440 +$(obj)/cuboot-katmai.o: BOOTTARGETFLAGS += -mcpu=440 +$(obj)/cuboot-acadia.o: BOOTTARGETFLAGS += -mcpu=405 +$(obj)/treeboot-iss4xx.o: BOOTTARGETFLAGS += -mcpu=405 +$(obj)/treeboot-currituck.o: BOOTTARGETFLAGS += -mcpu=405 +$(obj)/treeboot-akebono.o: BOOTTARGETFLAGS += -mcpu=405 + BOOTCFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) ifdef CONFIG_CPU_BIG_ENDIAN -BOOTCFLAGS += -mbig-endian +BOOTTARGETFLAGS += -mbig-endian else -BOOTCFLAGS += -mlittle-endian +BOOTTARGETFLAGS += -mlittle-endian endif -BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -nostdinc +BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTTARGETFLAGS) $(BOOTCFLAGS) -nostdinc BOOTARFLAGS := -crD @@ -73,6 +84,8 @@ BOOTCFLAGS += $(call cc-option,-mno-prefixed) \ $(call cc-option,-mno-pcrel) \ $(call cc-option,-mno-mma) +BOOTCFLAGS += $(BOOTTARGETFLAGS) + ifdef CONFIG_CC_IS_CLANG BOOTCFLAGS += $(CLANG_FLAGS) BOOTAFLAGS += $(CLANG_FLAGS) @@ -91,16 +104,6 @@ BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj) DTC_FLAGS ?= -p 1024 -$(obj)/4xx.o: BOOTCFLAGS += -mcpu=405 -$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440 -$(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405 -$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440 -$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440 -$(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 -$(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405 -$(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405 -$(obj)/treeboot-akebono.o: BOOTCFLAGS += -mcpu=405 - # The pre-boot decompressors pull in a lot of kernel headers and other source # files. This creates a bit of a dependency headache since we need to copy # these files into the build dir, fix up any includes and ensure that dependent From patchwork Tue Jun 6 06:46:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1790815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=RfI2ZLko; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qb1KZ0dWNz20Ty for ; Tue, 6 Jun 2023 16:49:05 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Qb1KY3P9mz3dy5 for ; Tue, 6 Jun 2023 16:49:05 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=RfI2ZLko; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::42c; helo=mail-pf1-x42c.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=RfI2ZLko; dkim-atps=neutral Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Qb1HP4BqMz3bhY for ; Tue, 6 Jun 2023 16:47:13 +1000 (AEST) Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-650c89c7e4fso5856238b3a.0 for ; Mon, 05 Jun 2023 23:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686034031; x=1688626031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qWWzXLx8dotAm4CkNVsWIsWxVrxEbMQDMV4PYsF5IU4=; b=RfI2ZLkonlgVxwQr30f/GbLGQZ6Oo/A4FEMJR0NtT4Rd80LxUSvE1OkNh5VjrGc+2u mmmO0T6HXyRvMQHxRpnvM9l+8KhNUfKj3eHCZ7VtSlBzOlhJ6H1YXB5C/FK9jU7rqPh+ LisgcEed4sH7ecrcHrekt1B3HeoFSrizx608Ucka9Es4B+n/rViX6Cpa35Q10VE/Kl1h Yq7mgiXhAt4bg6SQGA376GZ73xWHOJj1VI0ptvzF45XPc1GkPHnjsY5raa6BLCxQk9Dm U4wz7KF/50JutTvhMdo9EDbop1PLI4ufncJHmtXCMjDynHYdou4vgS8ruxoY+BAzziX/ BcuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686034031; x=1688626031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qWWzXLx8dotAm4CkNVsWIsWxVrxEbMQDMV4PYsF5IU4=; b=ZLO1v3pecG1h01iyoTZ6oTnEkqA1wF7MFmMlHI1OPBgqhAtf0k+tZBXAXu2WL1uNMM bmwQZKAJSEUMj+ZT64VoryuNmhmZ1c++uwnAWQLlUmwd2QlqTPuA0S98mKb7cQ33T5pb qEA+GSJVQFR/RHxHRv4VjlRM458VjGig+NgLzsyLpfca15IVyiH8XjVqHEpxjKeEzOL+ xSgyqWI5XL2i/r9tJuamQylcUio7ia+IyRriXpkd7gBEHgStVNaYU1mWglpjWFp/FtJK hi/0/zpcuhtMPv7JMIpUwi7kf5IOzD7Lj8a4Doe7Cvx45xSNce/6xeCX2zMdKy94srHn sGgw== X-Gm-Message-State: AC+VfDzim9BLqYnC6ljzW3lz4GncLK33JFpLHg+bXnmCGVZpE2rzmcZD Yr2XNAHdrH/E0UXd/fd/H7viBahcFPI= X-Google-Smtp-Source: ACHHUZ7KJxC5OH+9mTmJAxOK5UwIYxf/gcfsjMRrpi2c8Va+lfetjoBMzM/eR+u8TZBiSVRO0+Re+g== X-Received: by 2002:a05:6a00:1254:b0:64f:35c8:8584 with SMTP id u20-20020a056a00125400b0064f35c88584mr1433523pfi.18.1686034030997; Mon, 05 Jun 2023 23:47:10 -0700 (PDT) Received: from wheely.local0.net ([1.146.61.5]) by smtp.gmail.com with ESMTPSA id c14-20020aa78e0e000000b0063d24fcc2besm6130449pfr.125.2023.06.05.23.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 23:47:10 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 2/4] powerpc/boot: Separate CPP flags from BOOTCFLAGS Date: Tue, 6 Jun 2023 16:46:55 +1000 Message-Id: <20230606064657.183969-3-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606064657.183969-1-npiggin@gmail.com> References: <20230606064657.183969-1-npiggin@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add BOOTCPPFLAGS variable for the CPP options required by C and AS. Signed-off-by: Nicholas Piggin --- arch/powerpc/boot/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index ae80f7f1774e..9445ec442512 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -32,11 +32,13 @@ else BOOTAR := $(AR) endif +BOOTCPPFLAGS := -nostdinc $(LINUXINCLUDE) +BOOTCPPFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) + BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \ $(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \ - -pipe -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ - $(LINUXINCLUDE) + -pipe -fomit-frame-pointer -fno-builtin -fPIC ifdef CONFIG_PPC64_BOOT_WRAPPER BOOTTARGETFLAGS += -m64 @@ -68,15 +70,13 @@ $(obj)/treeboot-iss4xx.o: BOOTTARGETFLAGS += -mcpu=405 $(obj)/treeboot-currituck.o: BOOTTARGETFLAGS += -mcpu=405 $(obj)/treeboot-akebono.o: BOOTTARGETFLAGS += -mcpu=405 -BOOTCFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) - ifdef CONFIG_CPU_BIG_ENDIAN BOOTTARGETFLAGS += -mbig-endian else BOOTTARGETFLAGS += -mlittle-endian endif -BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTTARGETFLAGS) $(BOOTCFLAGS) -nostdinc +BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTTARGETFLAGS) $(BOOTCFLAGS) BOOTARFLAGS := -crD @@ -227,10 +227,10 @@ clean-files := $(zlib-) $(zlibheader-) $(zliblinuxheader-) \ empty.c zImage.coff.lds zImage.ps3.lds zImage.lds quiet_cmd_bootcc = BOOTCC $@ - cmd_bootcc = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< + cmd_bootcc = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTCPPFLAGS) $(BOOTCFLAGS) -c -o $@ $< quiet_cmd_bootas = BOOTAS $@ - cmd_bootas = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $< + cmd_bootas = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTCPPFLAGS) $(BOOTAFLAGS) -c -o $@ $< quiet_cmd_bootar = BOOTAR $@ cmd_bootar = $(BOOTAR) $(BOOTARFLAGS) $@.$$$$ $(real-prereqs); mv $@.$$$$ $@ From patchwork Tue Jun 6 06:46:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1790816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=JgkFs7/p; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qb1LS0mWtz20Ty for ; Tue, 6 Jun 2023 16:49:52 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Qb1LS00C8z3fQJ for ; Tue, 6 Jun 2023 16:49:52 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=JgkFs7/p; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::42a; helo=mail-pf1-x42a.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=JgkFs7/p; dkim-atps=neutral Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Qb1HS3Szvz3bhY for ; Tue, 6 Jun 2023 16:47:16 +1000 (AEST) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-65055aa4ed7so3581902b3a.3 for ; Mon, 05 Jun 2023 23:47:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686034034; x=1688626034; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dfulnTsEZdrLf2MiD74jKp1Umsk7hljuVadzaTgxllU=; b=JgkFs7/pdEzy8CGFu9C9s2hcVH/mZHK87GNeDE7Ls4buF7H0l2957kigG4g5AOXDM/ G5nkdYkwfGO2Ma6N8+AmFCdFGSx8stOV1XJr+hDqowforlk7UYEhBzwie9+d3RgOJR3s U0f1Gn0b54Mo1+YWyQDzW5PopxmoE7aTuUl8hXcYjdw1VdcRMUA7tyq0AKffTZ0St7XF U+TfSEGEtnwWHC0rqUAX/KKjoUlQE8N6ax047AxmYrEPkIXUI/DOCsgS3MoDTzOKJJR6 d2mLJSMT6sjQ6gVIfScDPHJTo7XvtGjJeaARc377cUYKThCT9cfx1PFXp6bODW3VwEcK ufLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686034034; x=1688626034; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dfulnTsEZdrLf2MiD74jKp1Umsk7hljuVadzaTgxllU=; b=Z1LrX6h8s2uWjZVXB7FsDSWoqFN+lsWa3SYQVXSMxv3FrgWwhdjBCtNDt4lo9a6xBr 0dWUaoRZrD3RQvL6gVHv5dRLVnvc4MYFJfTVQtpJCbhY1c7kN6n47S8AnA2SpD7/B8cX c/z4EgC5HhbU7I6pkQm6UqfwFltOnpntzT4MPLoyS9UZSGGYpkawEbf2cDeViW5CG8Jn EtZG0EFucn8p3o/n37fyumuiteOg9FkenbPwSsR1vkpMsI+2Wsqw3PrSpCd9UjjDxFmv 5cPFOLukiK9yhPt75jn/TorVgnNsIs4T8uA7oXubW0XsFkJlPWVs3h6XTgozvTTIacC3 Knag== X-Gm-Message-State: AC+VfDyNT7UJCTt30PDuE9E9Zy4lKikUD/l/zVgpBrxg0t8a/LlHMy/c eyurzR+QTgaY4dapae9WYF9LDcb7u2g= X-Google-Smtp-Source: ACHHUZ4aJLcA/0CpKIED2j5mSxixdKoQFQzL8PZGnq5k7V8RvjcikYMe+Ci1cr0yxerB0sxjleNKUA== X-Received: by 2002:a05:6a00:2ea7:b0:65a:6870:3ae6 with SMTP id fd39-20020a056a002ea700b0065a68703ae6mr702689pfb.22.1686034033804; Mon, 05 Jun 2023 23:47:13 -0700 (PDT) Received: from wheely.local0.net ([1.146.61.5]) by smtp.gmail.com with ESMTPSA id c14-20020aa78e0e000000b0063d24fcc2besm6130449pfr.125.2023.06.05.23.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 23:47:13 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 3/4] powerpc/boot: Separate BOOTCFLAGS from BOOTASFLAGS Date: Tue, 6 Jun 2023 16:46:56 +1000 Message-Id: <20230606064657.183969-4-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606064657.183969-1-npiggin@gmail.com> References: <20230606064657.183969-1-npiggin@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Torvalds , Nicholas Piggin Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" BOOTCFLAGS no longer contains anything that BOOTASFLAGS needs (except -pipe). Separate them to avoid fragility with cross-contamination of flags which has caused several build problems. Suggested-by: Linus Torvalds Link: https://lore.kernel.org/lkml/CAHk-=whyWUdJDeOBN1hRWYSkQkvzYiQ5RbSW5rJjExgnbSNX9Q@mail.gmail.com/ Signed-off-by: Nicholas Piggin --- arch/powerpc/boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 9445ec442512..9cdc0858b256 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -76,7 +76,7 @@ else BOOTTARGETFLAGS += -mlittle-endian endif -BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTTARGETFLAGS) $(BOOTCFLAGS) +BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTTARGETFLAGS) -pipe BOOTARFLAGS := -crD From patchwork Tue Jun 6 06:46:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1790817 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=SmzNQWg2; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qb1MN31lwz20WK for ; Tue, 6 Jun 2023 16:50:40 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4Qb1MM5yLmz3fgp for ; Tue, 6 Jun 2023 16:50:39 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=SmzNQWg2; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::32a; helo=mail-ot1-x32a.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=SmzNQWg2; dkim-atps=neutral Received: from mail-ot1-x32a.google.com (mail-ot1-x32a.google.com [IPv6:2607:f8b0:4864:20::32a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Qb1HW2Hvhz3bsS for ; Tue, 6 Jun 2023 16:47:19 +1000 (AEST) Received: by mail-ot1-x32a.google.com with SMTP id 46e09a7af769-6af7d6f6f41so4349050a34.1 for ; Mon, 05 Jun 2023 23:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686034036; x=1688626036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o+2QhvTpB7T08q2PIdZMSMFsMOx/jieaAuDrK72vUF0=; b=SmzNQWg2vvvNoRex8IE2rUnA+wQON9A+DuU8PFXpGo2CkjKusHHbkInlZrIxF7APYp oCdQa+x9irVYnM+KxLNeRSG+5NeowM5OrY/JeshO3RDyizKACdVni6B09LRlX9/vjIIN /MN3AoyegvK8AbWrtjNAm9+vi7S8DnH+ekACIYfWFW/OBLIHcNXWO3z43yw7DLKnokcj m06uPxB+xosvDMakz8J1+devE5AkBNU0ApdiPoVIbdJKcQc2VAnhzg2qJkxHYGTyzIXN HnSPST+4E5vl9vVfdbcglYsFzBb40APHgthvOSKltrp6LazHYXBZMolNPdo5g698L+r7 WxBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686034036; x=1688626036; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o+2QhvTpB7T08q2PIdZMSMFsMOx/jieaAuDrK72vUF0=; b=Wal4SPfD8oO0r93oFWNPIUh7uEdmK6wdGyqj+AzMQq6BazcXFtKVsk8PWH2bq0rnwr axTBlaVUmPPw+OngpphOVBk9aBbsGwufxvhci2N6ZDmtuHiLXhMySrLc1+w0nRC/9dfG Q12pYArJjZjVW2GCUHnGmQtzRhCBBvyr1Wup9aZRDRThfo0ewAICHYUXLfwf7t0yMlZV 9P9sd3stXMVKQHPkhZHUZvohHV5GiDgg9AEmHHhV/7Zmd21Dx98xyh/aH4GE5G8Fq2nm UuIDCR+zzjgBt/foJOc68szuOXAsOf6AOdM0DXh/da44oYzfwoFcSapuwUd8ccjLrH/i Omfw== X-Gm-Message-State: AC+VfDzSJTvQ1e0UA8HJyC+IMvN0WP+cUf4UCEs1YXALad8RPApLtMqf CVveKswWlRcIDhvPIHFntu3jG68xvYc= X-Google-Smtp-Source: ACHHUZ5Ts7nS6Qq2vRXi1sa3BFxmUVePz5uIFfAgoj5w+loQ8xr92NI6nQ13cETBHDr5v8rxzQyfjw== X-Received: by 2002:a05:6830:3a8c:b0:6b2:9425:3d06 with SMTP id dj12-20020a0568303a8c00b006b294253d06mr1201501otb.34.1686034036461; Mon, 05 Jun 2023 23:47:16 -0700 (PDT) Received: from wheely.local0.net ([1.146.61.5]) by smtp.gmail.com with ESMTPSA id c14-20020aa78e0e000000b0063d24fcc2besm6130449pfr.125.2023.06.05.23.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 23:47:15 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 4/4] powerpc/boot: Clean up Makefile after cflags and asflags separation Date: Tue, 6 Jun 2023 16:46:57 +1000 Message-Id: <20230606064657.183969-5-npiggin@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230606064657.183969-1-npiggin@gmail.com> References: <20230606064657.183969-1-npiggin@gmail.com> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Tidy pass over boot Makefile. Move variables together where possible. Signed-off-by: Nicholas Piggin --- arch/powerpc/boot/Makefile | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 9cdc0858b256..6f9ef031bfc7 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -32,14 +32,6 @@ else BOOTAR := $(AR) endif -BOOTCPPFLAGS := -nostdinc $(LINUXINCLUDE) -BOOTCPPFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) - -BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \ - $(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \ - -pipe -fomit-frame-pointer -fno-builtin -fPIC - ifdef CONFIG_PPC64_BOOT_WRAPPER BOOTTARGETFLAGS += -m64 BOOTTARGETFLAGS += -mabi=elfv2 @@ -76,15 +68,22 @@ else BOOTTARGETFLAGS += -mlittle-endian endif -BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTTARGETFLAGS) -pipe - -BOOTARFLAGS := -crD +BOOTCPPFLAGS := -nostdinc $(LINUXINCLUDE) +BOOTCPPFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) -BOOTCFLAGS += $(call cc-option,-mno-prefixed) \ +BOOTCFLAGS := -pipe $(BOOTTARGETFLAGS) \ + -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ + -fno-strict-aliasing -O2 \ + -msoft-float -mno-altivec -mno-vsx \ + $(call cc-option,-mno-prefixed) \ $(call cc-option,-mno-pcrel) \ - $(call cc-option,-mno-mma) + $(call cc-option,-mno-mma) \ + $(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \ + -fomit-frame-pointer -fno-builtin -fPIC -BOOTCFLAGS += $(BOOTTARGETFLAGS) +BOOTAFLAGS := -pipe $(BOOTTARGETFLAGS) -D__ASSEMBLY__ + +BOOTARFLAGS := -crD ifdef CONFIG_CC_IS_CLANG BOOTCFLAGS += $(CLANG_FLAGS)