From patchwork Thu Jun 12 15:28:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 4342571 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 3F5509F3B4 for ; Thu, 12 Jun 2014 15:28:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7396B2035D for ; Thu, 12 Jun 2014 15:28:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 60CC1202F0 for ; Thu, 12 Jun 2014 15:28:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756088AbaFLP2m (ORCPT ); Thu, 12 Jun 2014 11:28:42 -0400 Received: from mail-pb0-f53.google.com ([209.85.160.53]:41310 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753017AbaFLP2R (ORCPT ); Thu, 12 Jun 2014 11:28:17 -0400 Received: by mail-pb0-f53.google.com with SMTP id uo5so856836pbc.12 for ; Thu, 12 Jun 2014 08:28:16 -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=ddu2G5u9JbFRc8+rX1oe08XVbsdCMg9zOAD5WpZAUW8=; b=fF87f9qGXqaRqa2ebDou3qM2plJVm0E04N/vLtOjHGQtmgJl4h4KbPQpaKCaBi4lV0 /axpFR8zBgx8M12u5HoZWeM3hCmy0mIgHxlyT8Y9cRgHCO6TaJfRkqdSxN7LhZiUY9kX mGHBmS/qYtpNq2QaydNBVNDNB4B8AKdHOQLUEH77TOduJgYHobVEjvnVKMeuN7hNGusp QVRbiN0L2jD+yPge9at13Aoe6NvHfe31KgJL7cBMRFnQhGPgtEaSH7GMTk+XHkq6dR63 4+vQDGOlzGVbxwt7YVGSQbvrc1uPSnFH3z15fA71t8VlNyhzpE6bYK9ru0KX+vTDlsCB O7gQ== X-Gm-Message-State: ALoCoQnO8iV1LF+TUlIDGoM7M4WGpk2Wwb6x7h8O3Cz00GMCHMeWvhTUKFperUqQQL1/GqQvoU0h X-Received: by 10.66.242.171 with SMTP id wr11mr21567507pac.111.1402586896547; Thu, 12 Jun 2014 08:28:16 -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 ir10sm80996154pbc.59.2014.06.12.08.28.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jun 2014 08:28:15 -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 v3] x86,vdso: Fix vdso_install Date: Thu, 12 Jun 2014 08:28:10 -0700 Message-Id: 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=unavailable 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. Acked-by: Sam Ravnborg Reported-by: Josh Boyer Signed-off-by: Andy Lutomirski Tested-by: Josh Boyer --- I kept Sam's ack from v2, since v3 has only a trivial change. Changes from v1: Remove core kbuild change Changes from v2: Name the result .so files again, not .so.dbg 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..845b45e 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:%.dbg=install_%) + +$(MODLIB)/vdso: FORCE @mkdir -p $(MODLIB)/vdso + +$(vdso_img_insttargets): install_%: $(obj)/%.dbg $(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*