From patchwork Mon May 14 03:52:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 10396697 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 2F09B6038F for ; Mon, 14 May 2018 03:52:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02DED29094 for ; Mon, 14 May 2018 03:52:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA5BC29097; Mon, 14 May 2018 03:52:52 +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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 78A1B29094 for ; Mon, 14 May 2018 03:52:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751295AbeENDww (ORCPT ); Sun, 13 May 2018 23:52:52 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:32807 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751093AbeENDwv (ORCPT ); Sun, 13 May 2018 23:52:51 -0400 Received: by mail-pg0-f65.google.com with SMTP id v7-v6so2087552pgs.0 for ; Sun, 13 May 2018 20:52:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YSwvxCxV9zP5V8oBGnYbbEnrr2b/Qjc4ApvIbDwdDSs=; b=YYH3eJcFvheuHn+bdTZVcezi1hfjtJGlztBp5v89rLlVTUPHsc7juXoMEs91QXvMYZ 9BjlfeNZLvP6xLQEktSFfkmLxj5czzer55fuhGOkMBI8Q9b8wlFNpCU+Z7PvOONeOXWp 4IDtLmaYB/aMk0pwPfpWWD2MrRp8q1zWsUBWOFsI+LTqmvo3zKJ+P8YHoesPtVfbHOJu b5oNsb+rI4gJOm11l6nBgP9aEwrusqK0Qk8ghnAUhOCxdbIt+pqIFmMp0j8p6IgL7hVC zhvZepG3oB8PyTaTrHrcb/PiLbshZy7UrHC6lwyK1R3bilbnhoywY1rD6tWYNxh9CVFU rRtw== 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=YSwvxCxV9zP5V8oBGnYbbEnrr2b/Qjc4ApvIbDwdDSs=; b=M5CzVYvzP3e53mZlgxkonyKfwUba+L/XzsPzRGViLk9SH4YcekghtBOGN2KIeewERI LK6/FwK5y00Z8PqtjIzHtq/clgDc8hbjq592gKfH/4qapseasozf2u0ETlDydDBT28n2 9P2F37GWWVdOzs/ZU/eWzjk/hTVWE8V1/ESBbLa1gB3qFlnjYcD4kra2LdbKP1Ikc9gB d+i68y5DaQwipGgiy5HlICPD2O97+kAne2Up65LqpKLeqrEYELZ0dCwiWY//DHW2m0Qa 7zbCwFJN8daF3NQsuXGX0LvNx/JaAYSvnhLmD45thQRTYMnpwRLwt5+esskqzbxPDJen hHHA== X-Gm-Message-State: ALKqPwchMvr+AtLdxRzTlMANBuiXC20bSbtcHB2psxFNM7du5PVm5s5Q wzPSdFTbItMz6T1qKQ2PtnNWWA== X-Google-Smtp-Source: AB8JxZpMH6ifqTDapeE/JipjSgYUxdFK+XhsNfKDvl+BgUyw5EnVuGSEGcH2uV5ubPCa48ywU5ubsg== X-Received: by 2002:a62:ab10:: with SMTP id p16-v6mr8571848pff.211.1526269970703; Sun, 13 May 2018 20:52:50 -0700 (PDT) Received: from roar.au.ibm.com (59-102-70-78.tpgi.com.au. [59.102.70.78]) by smtp.gmail.com with ESMTPSA id d71-v6sm15668943pfd.48.2018.05.13.20.52.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 May 2018 20:52:49 -0700 (PDT) From: Nicholas Piggin To: linux-kbuild@vger.kernel.org Cc: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org, Masahiro Yamada , Segher Boessenkool Subject: [PATCH v3 2/4] powerpc/kbuild: remove CROSS32 defines from top level powerpc Makefile Date: Mon, 14 May 2018 13:52:26 +1000 Message-Id: <20180514035228.21316-3-npiggin@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514035228.21316-1-npiggin@gmail.com> References: <20180514035228.21316-1-npiggin@gmail.com> 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 Switch VDSO32 build over to use CROSS32_COMPILE directly, and have it pass in -m32 after the standard c_flags. This allows endianness overrides to be removed and the endian and bitness flags moved into standard flags variables. Signed-off-by: Nicholas Piggin --- arch/powerpc/Makefile | 10 ---------- arch/powerpc/boot/Makefile | 16 +++++++++++----- arch/powerpc/kernel/vdso32/Makefile | 15 +++++++++++---- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 15ca4bafad82..167b26a0780c 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -17,14 +17,8 @@ HAS_BIARCH := $(call cc-option-yn, -m32) # Set default 32 bits cross compilers for vdso and boot wrapper CROSS32_COMPILE ?= -CROSS32CC := $(CROSS32_COMPILE)gcc -CROSS32AR := $(CROSS32_COMPILE)ar - ifeq ($(HAS_BIARCH),y) ifeq ($(CROSS32_COMPILE),) -CROSS32CC := $(CC) -m32 -KBUILD_ARFLAGS += --target=elf32-powerpc - ifdef CONFIG_PPC32 # These options will be overridden by any -mcpu option that the CPU # or platform code sets later on the command line, but they are needed @@ -33,13 +27,9 @@ ifdef CONFIG_PPC32 KBUILD_CFLAGS += -mcpu=powerpc KBUILD_AFLAGS += -mcpu=powerpc endif - endif endif - -export CROSS32CC CROSS32AR - ifeq ($(CROSS_COMPILE),) KBUILD_DEFCONFIG := $(shell uname -m)_defconfig else diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 26d5d2a5b8e9..49767e06202c 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -23,19 +23,23 @@ all: $(obj)/zImage compress-$(CONFIG_KERNEL_GZIP) := CONFIG_KERNEL_GZIP compress-$(CONFIG_KERNEL_XZ) := CONFIG_KERNEL_XZ +ifdef CROSS32_COMPILE + BOOTCC := $(CROSS32_COMPILE)gcc + BOOTAR := $(CROSS32_COMPILE)ar +else + BOOTCC := $(CC) + BOOTAR := $(AR) +endif + BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -Os -msoft-float -pipe \ -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ -D$(compress-y) -BOOTCC := $(CC) ifdef CONFIG_PPC64_BOOT_WRAPPER BOOTCFLAGS += -m64 else BOOTCFLAGS += -m32 -ifdef CROSS32_COMPILE - BOOTCC := $(CROSS32_COMPILE)gcc -endif endif BOOTCFLAGS += -isystem $(shell $(BOOTCC) -print-file-name=include) @@ -49,6 +53,8 @@ endif BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc +BOOTARFLAGS := -cr$(KBUILD_ARFLAGS) + ifdef CONFIG_DEBUG_INFO BOOTCFLAGS += -g endif @@ -202,7 +208,7 @@ quiet_cmd_bootas = BOOTAS $@ cmd_bootas = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $< quiet_cmd_bootar = BOOTAR $@ - cmd_bootar = $(CROSS32AR) -cr$(KBUILD_ARFLAGS) $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@ + cmd_bootar = $(BOOTAR) $(BOOTARFLAGS) $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@ $(obj-libfdt): $(obj)/%.o: $(srctree)/scripts/dtc/libfdt/%.c FORCE $(call if_changed_dep,bootcc) diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile index b8c434d1d459..50112d4473bb 100644 --- a/arch/powerpc/kernel/vdso32/Makefile +++ b/arch/powerpc/kernel/vdso32/Makefile @@ -8,8 +8,15 @@ obj-vdso32 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o \ # Build rules -ifeq ($(CONFIG_PPC32),y) -CROSS32CC := $(CC) +ifdef CROSS32_COMPILE + VDSOCC := $(CROSS32_COMPILE)gcc +else + VDSOCC := $(CC) +endif + +CC32FLAGS := +ifdef CONFIG_PPC64 +CC32FLAGS += -m32 endif targets := $(obj-vdso32) vdso32.so vdso32.so.dbg @@ -45,9 +52,9 @@ $(obj-vdso32): %.o: %.S FORCE # actual build commands quiet_cmd_vdso32ld = VDSO32L $@ - cmd_vdso32ld = $(CROSS32CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^) + cmd_vdso32ld = $(VDSOCC) $(c_flags) $(CC32FLAGS) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^) quiet_cmd_vdso32as = VDSO32A $@ - cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $< + cmd_vdso32as = $(VDSOCC) $(a_flags) $(CC32FLAGS) -c -o $@ $< # install commands for the unstripped file quiet_cmd_vdso_install = INSTALL $@