From patchwork Wed Jun 11 16:20:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 4337191 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0C1AB9F357 for ; Wed, 11 Jun 2014 16:20:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3CA57202DD for ; Wed, 11 Jun 2014 16:20:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 551DD202C8 for ; Wed, 11 Jun 2014 16:20:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932371AbaFKQUY (ORCPT ); Wed, 11 Jun 2014 12:20:24 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:36869 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932471AbaFKQUW (ORCPT ); Wed, 11 Jun 2014 12:20:22 -0400 Received: by mail-pa0-f51.google.com with SMTP id ey11so2079079pad.10 for ; Wed, 11 Jun 2014 09:20:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=fvSn8VazUxkz9ExMYKy6+VgDXUnYm2e2axImee41iYo=; b=YjSXQAnoWf3fBp88nodyKDCTS2evlWEZFhRcV+xuZgc3Fdjo30Hjkly4m5KbHhv0AF 6gX5uvhDHg2vvL+IzX7bgLxpnB94suNqYemsk5eS4CWZLbKq3StX66h524AoEocsiTvz arKO/mqf8VKZir9xc70fEYiYABfi0YkKEL4AzVlPjK7NP4/UfRs5Y1c4kN4gO5Oaj5Ni HY5kp+8ou8bEpI+YH8eYFyCW5JDVJ8mf+rnYs+mHdNd6zZS9fnC6ku04kMe/Cxe6hJMz nS3xrt68958xazrZVinuK4RwybEJv7jloE90eNWub+xAw48418DFq+2r2V9/D/1BdqU5 5vXA== X-Gm-Message-State: ALoCoQnL86e1I1AOkRl/u2I6sPwJMhQQJhYM0fHro+u/Xmy8M4SGB3CZFq12fAlXDOg91GN+LGHg X-Received: by 10.69.31.97 with SMTP id kl1mr6531199pbd.162.1402503622428; Wed, 11 Jun 2014 09:20:22 -0700 (PDT) Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73]) by mx.google.com with ESMTPSA id ga1sm75742069pbb.82.2014.06.11.09.20.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jun 2014 09:20:21 -0700 (PDT) From: Andy Lutomirski To: "H. Peter Anvin" , Josh Boyer Cc: Michal Marek , linux-kbuild@vger.kernel.org, "Linux-Kernel@Vger. Kernel. Org" , Andy Lutomirski Subject: [PATCH 2/2] x86,vdso: Fix vdso_install Date: Wed, 11 Jun 2014 09:20:07 -0700 Message-Id: X-Mailer: git-send-email 1.9.3 In-Reply-To: References: <5398749B.4090209@zytor.com> In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rather than monkeying with barely-comprehensible static pattern rules, just use an explicit loop. Signed-off-by: Andy Lutomirski --- arch/x86/vdso/Makefile | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile index 9769df0..b1c70cc 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile @@ -9,11 +9,6 @@ VDSOX32-$(CONFIG_X86_X32_ABI) := y VDSO32-$(CONFIG_X86_32) := y VDSO32-$(CONFIG_COMPAT) := y -vdso-install-$(VDSO64-y) += vdso.so -vdso-install-$(VDSOX32-y) += vdsox32.so -vdso-install-$(VDSO32-y) += $(vdso32-images) - - # files to link into the vdso vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o @@ -176,15 +171,14 @@ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \ GCOV_PROFILE := n # -# Install the unstripped copy of vdso*.so listed in $(vdso-install-y). +# Install the unstripped copies of vdso*.so listed in $(vdso-install-y). # -quiet_cmd_vdso_install = INSTALL $@ - cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@ -$(vdso-install-y): %.so: $(obj)/%.so.dbg FORCE - @mkdir -p $(MODLIB)/vdso - $(call cmd,vdso_install) +quiet_cmd_vdso_install = INSTALL $(sofile) + cmd_vdso_install = cp $(obj)/$(sofile).dbg $(MODLIB)/vdso/$(sofile) -PHONY += vdso_install $(vdso-install-y) -vdso_install: $(vdso-install-y) +PHONY += vdso_install +vdso_install: $(vdso_img_sodbg:%=$(obj)/%) FORCE + @mkdir -p $(MODLIB)/vdso + @$(foreach sofile,$(vdso_img_sodbg:%.dbg=%),$(call recipe-cmd,vdso_install);) clean-files := vdso32-syscall* vdso32-sysenter* vdso32-int80*