From patchwork Wed Apr 3 08:48:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 161689 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp61364jan; Wed, 3 Apr 2019 01:48:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqwmnBcaQjMjdxNGW6orrPIIbPR6aXTtsoFj8dhozvWLPcNmrjDo321yo1VMEv1YhOY2QtWb X-Received: by 2002:a63:c204:: with SMTP id b4mr70950782pgd.335.1554281339473; Wed, 03 Apr 2019 01:48:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554281339; cv=none; d=google.com; s=arc-20160816; b=zucFTsLWxkHMdMrzE8bn3CnjEPplXORzpXrdUWxjpOCh5ouhO7m/Wr9jaOtgsmWrBl 39ULYuHLYC5L8VEWC3uDtIdKADfMVIz4ItjtMd7fvelIDf/uXn1kjT10sY8s2bKFWr0D tpkGEagLAnKkRSwoYPjeuXypaMcXbl36CACPXxyVxlrfAlYd+lebbE0Flo0z7Ndd0io5 jx7oYzVqHFUhIUizJuS0P0cvUJGiYwpF/Xb0Lphv5lwri+65gEd3VAqaTkwao7ELW8ns /EcN+5BB5P9Jzz1lKB40j2+EVg8648QE0N5lHF2rWcqBG8WoyGhbmMn6DQFijnBvT585 IC/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=lB6EpHoutTwpWA7wUE6ivp4ZeV0huU5L0NNkqfszzLo=; b=pQHi3jkf/hl6nn9SRB+hr5cq3f/KDg8n3sm7QILROKHjCJgbOvZqy/oFHdvKPFsKul 6HlJEZAhS389GkaynzoLLyxvpOWPduC+ZXUcDGZgZvtJMUlMzeFoKC7ulmAiQZjy6h5w yBK3PUA1sHwze3PT3yOoiz69NSmvOIF6tWIgJAXTq2bO7vphULfdtp/aGC7I4KaT0ehh ZbWpa3sinEFKtd6Gdqktza2RUpF5nik3x0n2weCGst/WIu9/ebcZ7yXQEuKqazOfCLM7 LbcA/7qOde9bnAI5V7Xu9HNblvo404U6L+30BBE19DuZmMZ33A0Fr3klV226q4fLaXCT Xu8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=j8x0x39I; 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 b6si12693722pgw.70.2019.04.03.01.48.59; Wed, 03 Apr 2019 01:48:59 -0700 (PDT) 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=@nifty.com header.s=dec2015msa header.b=j8x0x39I; 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 S1729194AbfDCIs5 (ORCPT + 31 others); Wed, 3 Apr 2019 04:48:57 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:28829 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728900AbfDCIs5 (ORCPT ); Wed, 3 Apr 2019 04:48:57 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id x338mVFi008617; Wed, 3 Apr 2019 17:48:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x338mVFi008617 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1554281312; bh=lB6EpHoutTwpWA7wUE6ivp4ZeV0huU5L0NNkqfszzLo=; h=From:To:Cc:Subject:Date:From; b=j8x0x39Ihsj879zA8Ysekq2G3b/CjwYKIVmpGbsSc1sghEDq1tPFxf/kXq+4MWtvQ hp8/y8lD5n2nYFX1Xzd+zkwKlNieUJVEwvRcpTXTrV65/kzZYOe5EmPGn3L+Rw6Iqj ICXTnXNAKrKUuGV6CHj3x4Ngq1Bt7gEnDBwKOcviqGDASgYonwpTlZ7sug2q7yau4p l8EDGVXRY6d/cAefWBJ5K9DCxIWjrKM7ayyvypCy8GgyFeMVZZ086hqk7KnRb0bVf4 DYN5V4Ezpl5BUV22ZETsa9T+2zwkaf33m1wIZZWw2QxSfQl4aIO/+WiYejlQnuOXw+ Oa6+LrvXzVDrA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] arm64: vdso: fix and clean-up Makefile Date: Wed, 3 Apr 2019 17:48:22 +0900 Message-Id: <1554281302-21105-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org - $(call if_changed,...) must have FORCE as a prerequisite - vdso.lds is a generated file, so it should be prefixed with $(obj)/ instead of $(src)/. - cmd_vdsosym is a one-liner rule, so the assignment with '=' is simpler. Signed-off-by: Masahiro Yamada --- arch/arm64/kernel/vdso/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index b801ee5..c9ad9aa 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -31,7 +31,7 @@ CPPFLAGS_vdso.lds += -P -C -U$(ARCH) $(obj)/vdso.o : $(obj)/vdso.so # Link rule for the .so file, .lds has to be first -$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) +$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE $(call if_changed,vdsold) # Strip rule for the .so file @@ -42,9 +42,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE # Generate VDSO offsets using helper script gen-vdsosym := $(srctree)/$(src)/gen_vdso_offsets.sh quiet_cmd_vdsosym = VDSOSYM $@ -define cmd_vdsosym - $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ -endef + cmd_vdsosym = $(NM) $< | $(gen-vdsosym) | LC_ALL=C sort > $@ include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE $(call if_changed,vdsosym) @@ -55,7 +53,7 @@ $(obj-vdso): %.o: %.S FORCE # Actual build commands quiet_cmd_vdsold = VDSOL $@ - cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@ + cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $(real-prereqs) -o $@ quiet_cmd_vdsoas = VDSOA $@ cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<