Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] arm64: vdso: Explicitly add build-id option
To:     Will Deacon <will.deacon@arm.com>,
        Masahiro Yamada <yamada.masahiro@socionext.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
References: <20190515194824.5641-1-labbott@redhat.com>
 <CAK7LNASZnRrSsZSrnw41kintGfmpyj3iz-Vjduk7w3k9iSih-w@mail.gmail.com>
 <20190516104619.GA29705@fuggles.cambridge.arm.com>
From:   Laura Abbott <labbott@redhat.com>
Message-ID: <fb9891e6-3bc4-5bef-6575-5c272082085e@redhat.com>
Date:   Thu, 16 May 2019 06:16:26 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.6.1
MIME-Version: 1.0
In-Reply-To: <20190516104619.GA29705@fuggles.cambridge.arm.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 5/16/19 3:46 AM, Will Deacon wrote:
> On Thu, May 16, 2019 at 01:58:56PM +0900, Masahiro Yamada wrote:
>> On Thu, May 16, 2019 at 4:51 AM Laura Abbott <labbott@redhat.com> wrote:
>>>
>>> Commit 691efbedc60d ("arm64: vdso: use $(LD) instead of $(CC) to
>>> link VDSO") switched to using LD explicitly. The --build-id option
>>> needs to be passed explicitly, similar to x86. Add this option.
>>>
>>> Fixes: 691efbedc60d ("arm64: vdso: use $(LD) instead of $(CC) to link VDSO")
>>> Signed-off-by: Laura Abbott <labbott@redhat.com>
>>> ---
>>>   arch/arm64/kernel/vdso/Makefile | 1 +
>>>   1 file changed, 1 insertion(+)
>>>
>>> diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
>>> index 744b9dbaba03..ca209103cd06 100644
>>> --- a/arch/arm64/kernel/vdso/Makefile
>>> +++ b/arch/arm64/kernel/vdso/Makefile
>>> @@ -13,6 +13,7 @@ targets := $(obj-vdso) vdso.so vdso.so.dbg
>>>   obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
>>>
>>>   ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 \
>>> +               $(call ld-option, --build-id) \
>>>                  $(call ld-option, --hash-style=sysv) -n -T
>>>
>>>   # Disable gcov profiling for VDSO code
>>
>>
>> I missed that. Sorry.
>>
>> You can add  --build-id without $(call ld-option,...)
>> because it is supported by our minimal version of toolchain.
>>
>> See commit log of 1e0221374e for example.
> 
> Ok, so I'm ok folding in the diff below on top?
> 
> Will
> 
> --->8
> 
> diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
> index ca209103cd06..fa230ff09aa1 100644
> --- a/arch/arm64/kernel/vdso/Makefile
> +++ b/arch/arm64/kernel/vdso/Makefile
> @@ -12,9 +12,8 @@ obj-vdso := gettimeofday.o note.o sigreturn.o
>   targets := $(obj-vdso) vdso.so vdso.so.dbg
>   obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
>   
> -ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 \
> -		$(call ld-option, --build-id) \
> -		$(call ld-option, --hash-style=sysv) -n -T
> +ldflags-y := -shared -nostdlib -soname=linux-vdso.so.1 --hash-style=sysv \
> +		--build-id -n -T
>   
>   # Disable gcov profiling for VDSO code
>   GCOV_PROFILE := n
> 

Looks good to me.

Thanks,
Laura