From patchwork Sun Jun 25 03:24:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9807935 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6D71360329 for ; Sun, 25 Jun 2017 03:24:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D2E928735 for ; Sun, 25 Jun 2017 03:24:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 517C02873B; Sun, 25 Jun 2017 03:24:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C785928735 for ; Sun, 25 Jun 2017 03:24:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751094AbdFYDYl (ORCPT ); Sat, 24 Jun 2017 23:24:41 -0400 Received: from conssluserg-06.nifty.com ([210.131.2.91]:39721 "EHLO conssluserg-06.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751017AbdFYDYl (ORCPT ); Sat, 24 Jun 2017 23:24:41 -0400 Received: from mail-yb0-f175.google.com (mail-yb0-f175.google.com [209.85.213.175]) (authenticated) by conssluserg-06.nifty.com with ESMTP id v5P3OHkx008329; Sun, 25 Jun 2017 12:24:18 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-06.nifty.com v5P3OHkx008329 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1498361058; bh=uZR0VSpvWbON3DzQZD0TCU0U++9su2pjEUkPOsfPbG8=; h=In-Reply-To:References:From:Date:Subject:To:Cc:From; b=VYq7Afj3uoucuQbbxhQsOtIYoI3pyAzKYvf//ac9ntr/a4yXS5dROJx3TOH/jBgAv X9LMu2Uq19YIsGpnA4asrE/GTMQedzckj7g20fG60epJUSZ1cj0QQcpWQzx2kseUV8 vimt/XObX2Yy7oQuGhIANoTbm6x4f8whBgSUqsusFwjTB7XAc+v04D/vp3P3MoP4BQ 8P/GqGVelp6ymroJorxrr3ZXGe8YnAhpf/0OJxzxRBIZFQkYJuA7XXY0C79wkZxeeO bDEToSeNaArHiGKm+P9Tw4LnOQ4GWdca1gxRLBjBGoEuDK2s6tQ100yAdO96j4WCVj cbouYaEQNJKbw== X-Nifty-SrcIP: [209.85.213.175] Received: by mail-yb0-f175.google.com with SMTP id e201so21613980ybb.1; Sat, 24 Jun 2017 20:24:17 -0700 (PDT) X-Gm-Message-State: AKS2vOy0/pZ67ZRFyJATYiGrWAbZV4slinSvLy6ZCjR0nE68DIkICCAq QxKIrTwE4PkF+4eVI8u5gIU7SwGRrg== X-Received: by 10.37.190.67 with SMTP id d3mr11579956ybm.252.1498361056675; Sat, 24 Jun 2017 20:24:16 -0700 (PDT) MIME-Version: 1.0 Received: by 10.37.49.9 with HTTP; Sat, 24 Jun 2017 20:24:16 -0700 (PDT) In-Reply-To: References: <20170622123929.15054-1-npiggin@gmail.com> <20170622123929.15054-2-npiggin@gmail.com> <20170623135031.793e36cb@roar.ozlabs.ibm.com> From: Masahiro Yamada Date: Sun, 25 Jun 2017 12:24:16 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 1/3] sh: thin archives fix linking To: Nicholas Piggin Cc: Linux Kbuild mailing list , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 2017-06-23 19:02 GMT+09:00 Masahiro Yamada : > 2017-06-23 12:50 GMT+09:00 Nicholas Piggin : >> On Fri, 23 Jun 2017 12:25:10 +0900 >> Masahiro Yamada wrote: >> >>> 2017-06-22 21:39 GMT+09:00 Nicholas Piggin : >>> > The VDSO symbols can't be linked into built-in.o when building with >>> > thin archives, so change this to linking a new object file that is >>> > included into the built-in.o. >>> > >>> > Cc: Yoshinori Sato >>> > Cc: Rich Felker >>> > Cc: linux-sh@vger.kernel.org >>> > Signed-off-by: Nicholas Piggin >>> > --- >>> > arch/sh/kernel/vsyscall/Makefile | 16 +++++++++------- >>> > 1 file changed, 9 insertions(+), 7 deletions(-) >>> > >>> > diff --git a/arch/sh/kernel/vsyscall/Makefile b/arch/sh/kernel/vsyscall/Makefile >>> > index 8f0ea5fc835c..efc7a6837ef6 100644 >>> > --- a/arch/sh/kernel/vsyscall/Makefile >>> > +++ b/arch/sh/kernel/vsyscall/Makefile >>> > @@ -1,4 +1,4 @@ >>> > -obj-y += vsyscall.o vsyscall-syscall.o >>> > +obj-y += vsyscall.o vsyscall-syscall.o vsyscall-syms.o >>> > >>> > $(obj)/vsyscall-syscall.o: \ >>> > $(foreach F,trapa,$(obj)/vsyscall-$F.so) >>> > @@ -26,11 +26,13 @@ $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE >>> > # We also create a special relocatable object that should mirror the symbol >>> > # table and layout of the linked DSO. With ld -R we can then refer to >>> > # these symbols in the kernel code rather than hand-coded addresses. >>> > -extra-y += vsyscall-syms.o >>> > -$(obj)/built-in.o: $(obj)/vsyscall-syms.o >>> > -$(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o >>> > - >>> > -SYSCFLAGS_vsyscall-syms.o = -r >>> > -$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \ >>> > +SYSCFLAGS_vsyscall-dummy.o = -r >>> > +$(obj)/vsyscall-dummy.o: $(src)/vsyscall.lds \ >>> > $(obj)/vsyscall-trapa.o $(obj)/vsyscall-note.o FORCE >>> > $(call if_changed,syscall) >>> > + >>> > +quiet_cmd_syscall_syms = SYSCALL $@ >>> > + cmd_syscall_syms = $(LD) -r -R $(obj)/vsyscall-dummy.o -o $@ >>> > + >>> > +$(obj)/vsyscall-syms.o: $(obj)/vsyscall-dummy.o >>> > + $(call if_changed,syscall_syms) >>> > -- >>> > 2.11.0 >>> >>> I applied this, but >>> I just noticed vsyscall-dummy is rebuilt every time. >>> >>> >>> SYSCALL arch/sh/kernel/vsyscall/vsyscall-dummy.o >>> SYSCALL arch/sh/kernel/vsyscall/vsyscall-syms.o >>> AR arch/sh/kernel/vsyscall/built-in.o >>> AR arch/sh/kernel/built-in.o >>> >>> >>> >>> We can avoid the unneeded rebuild by adding "vsyscall-dummy.o" to "targets". >>> >>> targets += vsyscall-note.o vsyscall.lds vsyscall-dummy.o >> >> Thanks, good catch. The tile patch may have the same issue? >> -- > > I think so. > > > One more fix. > > > +$(obj)/vsyscall-syms.o: $(obj)/vsyscall-dummy.o > + $(call if_changed,syscall_syms) > > > $(call if_changed,...) must have FORCE in the dependency field. > Otherwise, if_changed may not be evaluated. > > I can fix up it locally. :-) > I updated thin-ar branch. Just in case, the following is my local fix-up: - Fix incremental build - Do not repeat "$(obj)/vsyscall-dummy.o" in the build command diff --git a/arch/sh/kernel/vsyscall/Makefile b/arch/sh/kernel/vsyscall/Makefile index efc7a68..99685e5 100644 --- a/arch/sh/kernel/vsyscall/Makefile +++ b/arch/sh/kernel/vsyscall/Makefile @@ -5,7 +5,7 @@ $(obj)/vsyscall-syscall.o: \ # Teach kbuild about targets targets += $(foreach F,trapa,vsyscall-$F.o vsyscall-$F.so) -targets += vsyscall-note.o vsyscall.lds +targets += vsyscall-note.o vsyscall.lds vsyscall-dummy.o # The DSO images are built using a special linker script quiet_cmd_syscall = SYSCALL $@ @@ -32,7 +32,7 @@ $(obj)/vsyscall-dummy.o: $(src)/vsyscall.lds \ $(call if_changed,syscall) quiet_cmd_syscall_syms = SYSCALL $@ - cmd_syscall_syms = $(LD) -r -R $(obj)/vsyscall-dummy.o -o $@ + cmd_syscall_syms = $(LD) -r -o $@ -R $< -$(obj)/vsyscall-syms.o: $(obj)/vsyscall-dummy.o +$(obj)/vsyscall-syms.o: $(obj)/vsyscall-dummy.o FORCE $(call if_changed,syscall_syms)