diff mbox series

gcc: Fix spurious '/' in GLIBC_DYNAMIC_LINKER on microblaze

Message ID 20240904052544.2082232-1-raj.khem@gmail.com
State Accepted, archived
Commit f0eac82b9a1e4549b7d918df768c369ed7ab5183
Headers show
Series gcc: Fix spurious '/' in GLIBC_DYNAMIC_LINKER on microblaze | expand

Commit Message

Khem Raj Sept. 4, 2024, 5:25 a.m. UTC 
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(-)

Comments

patchtest@automation.yoctoproject.org Sept. 4, 2024, 5:34 a.m. UTC | #1 
Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/gcc-Fix-spurious-in-GLIBC_DYNAMIC_LINKER-on-microblaze.patch

FAIL: test commit message presence: Please include a commit message on your patch explaining the change (test_mbox.TestMbox.test_commit_message_presence)

PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
SKIP: test target mailing list: Series merged, no reason to check other mailing lists (test_mbox.TestMbox.test_target_mailing_list)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!
Khem Raj Sept. 6, 2024, 6:55 a.m. UTC | #2 
This needs backporting to kirkstone and scarthgap as well.

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 */
Steve Sakoman Sept. 6, 2024, 1:40 p.m. UTC | #3 
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 */
Mark Hatle Sept. 6, 2024, 4:50 p.m. UTC | #4 
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 */
diff mbox series

Patch

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 */