Delivered-To: jwboyer@gmail.com Received: by 10.76.6.212 with SMTP id d20csp286438oaa; Wed, 11 Jun 2014 12:25:34 -0700 (PDT) X-Received: by 10.66.66.135 with SMTP id f7mr16103670pat.22.1402514734508; Wed, 11 Jun 2014 12:25:34 -0700 (PDT) Return-Path: Received: from bastion.fedoraproject.org (bastion02.fedoraproject.org. [209.132.181.3]) by mx.google.com with ESMTP id px17si7599032pab.171.2014.06.11.12.25.34 for ; Wed, 11 Jun 2014 12:25:34 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) client-ip=209.132.181.3; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning luto@amacapital.net does not designate 209.132.181.3 as permitted sender) smtp.mail=luto@amacapital.net Received: by bastion02.phx2.fedoraproject.org (Postfix) id E8FA440A1B; Wed, 11 Jun 2014 19:25:33 +0000 (UTC) Delivered-To: jwboyer@fedoraproject.org Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.16]) by bastion02.phx2.fedoraproject.org (Postfix) with ESMTP id C7A2B409CE for ; Wed, 11 Jun 2014 19:25:33 +0000 (UTC) Received: from mail-pb0-f41.google.com (mail-pb0-f41.google.com [209.85.160.41]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5BJPWY6031412 for ; Wed, 11 Jun 2014 15:25:32 -0400 Received: by mail-pb0-f41.google.com with SMTP id ma3so134149pbc.14 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=aDS8HAiLCK/Rp4I/5iUikYimi8LKsU7iI7K+lCuBGaFVgUY6pa4zykb8A2q/aJWuZY UDJbBhP0gnZ+xlKkVrRVa9iCwYAJHHf/Ipdidjs0lwFVTlSZuyxXR61vFdRhgN2HFtl9 AHx95u6UKn2KLoVxtRU6ZiYMMpVacmmQlHh6iZcMsVq2C52qTBchO6r0rGMmeP0f69QZ h86teTPCUlRQXQCUH9pvTEtmamygxGmf9VBYom8qD3KYuAlQkOGRTo7fwiRjgTHCXk92 veKA7umfd4rqs9iIIi2qnh4NTonxfWG7lfJVW+j2Ep+gHfCm1hyuM5CVS8fybRvf2gv0 gKNA== X-Gm-Message-State: ALoCoQnKVS9+ljO89CTRxFu6zQ1VI6ucPd7i9b7bFnfJZAyZDVXkacL2IJbXQ11P4CBXW2DOSlaH 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: X-RedHat-Spam-Score: -2.7 (BAYES_00,DCC_REPUT_13_19,RCVD_IN_DNSWL_LOW,SPF_PASS,URIBL_BLOCKED) X-Scanned-By: MIMEDefang 2.68 on 10.5.110.16 The filenames are different now. Inspired by a patch from Sam Ravnborg. Reported-by: Josh Boyer Signed-off-by: Andy Lutomirski --- 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* -- 1.9.3