From patchwork Wed Jun 11 19:25:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 4338151 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1AC2CBEEAA for ; Wed, 11 Jun 2014 19:25:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3E7E2202DD for ; Wed, 11 Jun 2014 19:25:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69E2F202BE for ; Wed, 11 Jun 2014 19:25:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752652AbaFKTZf (ORCPT ); Wed, 11 Jun 2014 15:25:35 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:48344 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752584AbaFKTZc (ORCPT ); Wed, 11 Jun 2014 15:25:32 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so132747pbb.19 for ; Wed, 11 Jun 2014 12:25:32 -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; bh=3SQxyOCkOEd7ZqBxGm7GVdRdWte9s/+lnDgnWxAd/KE=; b=YrCMExGsNPnsToMuyB73HWZ35NAWS1Y1fdB4dteCuiHNIfBJTLGa7p/vVxVZ3WfcER 0Fr4RoV5Sywm5Doqj26YoSKsFx4MHJuTur52LLW2aCAUKblIE+WtjcrBL91TVCUn0yt0 rdH8UXQBsj/jcqYrN3Wu56o5faxv7I8FvaQRHV6eWBo2zrihaKR0dmM9h14Isi+yKA3t NOHG2jFYcrQW+yEoU/Kk6+Tb/VCZokh6zLUsMo3G/cnNWRGF4r6I9JzXiWr2OHzsrXO+ U3xcss9rM7WneCCTEURc4COwRwjuAbxTmOuIRzt7EwrsV6pZLnYf44T1I+BIRwEoWAg4 gAJw== X-Gm-Message-State: ALoCoQkT3+/joQ7jRK4bh92f36HzTPtwrDtVboelg0QBjsCIGpopKLt8OQ+9nn+VqrEnpe7Xyiip X-Received: by 10.68.201.10 with SMTP id jw10mr7480616pbc.25.1402514732325; Wed, 11 Jun 2014 12:25:32 -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 id10sm76404116pbc.35.2014.06.11.12.25.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jun 2014 12:25:31 -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 v2] x86,vdso: Fix vdso_install Date: Wed, 11 Jun 2014 12:25:29 -0700 Message-Id: <5d5e221e59be20a3a7ceb99452e74e233383e7b4.1402514715.git.luto@amacapital.net> X-Mailer: git-send-email 1.9.3 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 The filenames are different now. Inspired by a patch from Sam Ravnborg. Reported-by: Josh Boyer Signed-off-by: Andy Lutomirski Acked-by: Sam Ravnborg --- arch/x86/vdso/Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile index 9769df0..e3683d6 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,20 @@ 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. # -quiet_cmd_vdso_install = INSTALL $@ - cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@ -$(vdso-install-y): %.so: $(obj)/%.so.dbg FORCE +quiet_cmd_vdso_install = INSTALL $(@:install_%=%) + cmd_vdso_install = cp $< $(MODLIB)/vdso/$(@:install_%=%) + +vdso_img_insttargets := $(vdso_img_sodbg:%=install_%) + +$(MODLIB)/vdso: FORCE @mkdir -p $(MODLIB)/vdso + +$(vdso_img_insttargets): install_%: $(obj)/% $(MODLIB)/vdso FORCE $(call cmd,vdso_install) -PHONY += vdso_install $(vdso-install-y) -vdso_install: $(vdso-install-y) +PHONY += vdso_install $(vdso_img_insttargets) +vdso_install: $(vdso_img_insttargets) FORCE clean-files := vdso32-syscall* vdso32-sysenter* vdso32-int80*