Re: [PATCH] gcc: Fix spurious '/' in GLIBC_DYNAMIC_LINKER on microblaze

[Mark Hatle <mark.hatle@amd.com>]

I'm not sure if I'll have time to do Kirkstone, but I will get this backported to scarthgap and will send it up "soon".

--Mark

On 9/6/24 8:40 AM, Steve Sakoman wrote:
> On Thu, Sep 5, 2024 at 11:55 PM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> This needs backporting to kirkstone and scarthgap as well.
> 
> This patch understandably doesn't cherry-pick to the earlier versions
> of gcc in kirkstone and scarthgap.
> 
> If someone would like to prepare branch appropriate versions I'd be
> happy to add them to my test queues.
> 
> Thanks,
> 
> Steve
> 
>>
>> On Tue, Sep 3, 2024 at 10:25 PM Khem Raj <raj.khem@gmail.com> wrote:
>>>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> Cc: Mark Hatle <mark.hatle@amd.com>
>>> ---
>>>   ...fine-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 6 +++---
>>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
>>> index 6ff16e38e19..4ed55015519 100644
>>> --- a/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
>>> +++ b/meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
>>> @@ -1,4 +1,4 @@
>>> -From b597a2bc85ffdcf780731a44de02799ebc3d8f61 Mon Sep 17 00:00:00 2001
>>> +From 4067ae345f0ff1fbf37c0348f2af09257513b817 Mon Sep 17 00:00:00 2001
>>>   From: Khem Raj <raj.khem@gmail.com>
>>>   Date: Fri, 29 Mar 2013 09:24:50 +0400
>>>   Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
>>> @@ -184,7 +184,7 @@ index e5d84e180e3..98cb49c189f 100644
>>>    #undef GNU_USER_TARGET_LINK_SPEC
>>>    #define GNU_USER_TARGET_LINK_SPEC \
>>>   diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h
>>> -index 5ed8ee518be..5553e7cac21 100644
>>> +index 5ed8ee518be..299d1a62c81 100644
>>>   --- a/gcc/config/microblaze/linux.h
>>>   +++ b/gcc/config/microblaze/linux.h
>>>   @@ -28,7 +28,7 @@
>>> @@ -192,7 +192,7 @@ index 5ed8ee518be..5553e7cac21 100644
>>>    #define TLS_NEEDS_GOT 1
>>>
>>>   -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
>>> -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "/ld.so.1"
>>> ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1"
>>>    #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
>>>
>>>    #if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */