From patchwork Thu Jul 12 08:01:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 141798 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1212552ljj; Thu, 12 Jul 2018 01:03:50 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc3aabiMYC76PWQ5HnQBeJsuji7C1lVMuoL3Qr+/M4+Gzu3A39dZAfYuvMJ90O3YOfCGhtY X-Received: by 2002:a63:8f03:: with SMTP id n3-v6mr1178154pgd.166.1531382630274; Thu, 12 Jul 2018 01:03:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531382630; cv=none; d=google.com; s=arc-20160816; b=NX8Zs2ecqclX79KS9umyMQxsKTrnG2GFohHS+rC9YheYtz0Mm1Ki3PT2oeoA5stHmv VwvmhIZUvoD7fy/nYh1SvNVaJwvJnpOwIBEyaovPv1Hh657tLOBhFptmJ5ToBTnA6zMm aFSYPUR0dEGcuvfh/i+pi4OIO2MxP7DJo5CximOb6l/tdM0kR6l5LfMETDt6Tlxiq2Dy +qgm1wEgoj9XfkPbFLdXzPjz1xq153sTWx7BoKINvyOxUIwp/6if5c9jZd5/F8ulckqC YunnMmgHvKxQ9vAem1bvSx73W5QviyVj2tAK213XYAHUvCYz/Ja5jZcFCcGv56oy4kXo PhRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=OW/iguCGS3P8sUTd5gG6WZtTqvjg0ShWICCDmC9kjMA=; b=jbQ9dSYhStDHLCEe8GPk10Hiet6BeGMSmq7QBtm0szDDLVscipMreboupOsjPIeROl mvcdyozS2ErCJK+biLq3n83nmu3+beY424OSywcke050tVxvUsY7xrhRSzNKjXg3gKjA jW/YJnfK/S6QPajT9TWB3zniytDVvBxanbzTsV7q8LKjPsT/tn+b2FeE42xHTU9lRnD2 B6hXmUF1NifOAC3wejH/zbqSWOygH5CgsbrxSHqKMGzWrlVJxS+qmvxqE9JdwA/yEZK6 5UzIRsPTrbMHPMQR0/CIGfIRps9bOg0eTwHxZtvB0N2ElGMmJtuKy9rAGYELbgz6FNYv Oagg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=UJY34Hho; 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 d16-v6si22465060pfe.267.2018.07.12.01.03.49; Thu, 12 Jul 2018 01:03:50 -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=UJY34Hho; 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 S1732447AbeGLIMN (ORCPT + 28 others); Thu, 12 Jul 2018 04:12:13 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:56398 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726650AbeGLILp (ORCPT ); Thu, 12 Jul 2018 04:11:45 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id w6C81cQk012716; Thu, 12 Jul 2018 17:01:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com w6C81cQk012716 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1531382506; bh=OW/iguCGS3P8sUTd5gG6WZtTqvjg0ShWICCDmC9kjMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UJY34Hho3d+vt8X7T/YvXP0dG3s7hQR+gvlyuFdVhFZRVTGnt/5nAoDTkIXbqcPPw XmKaOsWItfgLnSw0fF06MjFvq2RDXNNqvcQ8KcwsGjki6Wm4VxvjElrtdvz2R0ntrJ EfFW3faGY8uIPabGLCQYJt6gYkFda2D2vAoZey1KIOoRg7+eAjrRhmnZKk6RNiLeoW IFdafgpoFVt4pJOFAox1nKmjqAbzRve4NbRLpAVp1HXZsVWNTGXdoYAEkKV3VWXld1 nibTIrZwZQ2tyJPQuRpLChTjSO2NwaxMRvqme4tpphdwpVrIj0sorp7ua9b47ucqp2 hS35leQOsOsfg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Richard Weinberger , x86@kernel.org, linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, Russell King , openrisc@lists.librecores.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, Jeff Dike , "Kirill A . Shutemov" , Masahiro Yamada Subject: [PATCH 5/6] kbuild: change ld_flags to contain LDFLAGS_$(@F) Date: Thu, 12 Jul 2018 17:01:35 +0900 Message-Id: <1531382496-3719-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531382496-3719-1-git-send-email-yamada.masahiro@socionext.com> References: <1531382496-3719-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Put $(LDFLAGS_$(@F)) into ld_flags so that $(LDFLAGS_pcap.o) and $(LDFLAGS_vde.o) in arch/um/drivers/Makefile are absorbed. Signed-off-by: Masahiro Yamada --- arch/um/drivers/Makefile | 4 ++-- scripts/Makefile.lib | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile index 16b3ceb..69331983 100644 --- a/arch/um/drivers/Makefile +++ b/arch/um/drivers/Makefile @@ -25,10 +25,10 @@ LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a) targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o $(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o - $(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o) + $(LD) -r -dp -o $@ $^ $(ld_flags) $(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o - $(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_vde.o) + $(LD) -r -dp -o $@ $^ $(ld_flags) #XXX: The call below does not work because the flags are added before the # object name, so nothing from the library gets linked. diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 1915574..f56bb4b 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -162,7 +162,7 @@ a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ $(__cpp_flags) -ld_flags = $(LDFLAGS) $(ldflags-y) +ld_flags = $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) DTC_INCLUDE := $(srctree)/scripts/dtc/include-prefixes @@ -225,7 +225,7 @@ $(obj)/%: $(src)/%_shipped # --------------------------------------------------------------------------- quiet_cmd_ld = LD $@ -cmd_ld = $(LD) $(ld_flags) $(LDFLAGS_$(@F)) $(filter-out FORCE,$^) -o $@ +cmd_ld = $(LD) $(ld_flags) $(filter-out FORCE,$^) -o $@ # Objcopy # ---------------------------------------------------------------------------