Fix i686-nacl and x86_64-nacl pr21884 failures

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Fix i686-nacl and x86_64-nacl pr21884 failures

Alan Modra-3
OUTPUT_FORMAT in the script results in "./ld-new: target elf32-i386
not found" and similarly for the x86_64 test.

        * testsuite/ld-i386/pr21884.t: Remove unneeded format, arch and entry.
        * testsuite/ld-x86-64/pr21884.t: Likewise.

diff --git a/ld/testsuite/ld-i386/pr21884.t b/ld/testsuite/ld-i386/pr21884.t
index 9ec7dc8..fcb7bce 100644
--- a/ld/testsuite/ld-i386/pr21884.t
+++ b/ld/testsuite/ld-i386/pr21884.t
@@ -1,7 +1,3 @@
-OUTPUT_FORMAT("elf32-i386");
-OUTPUT_ARCH(i386);
-
-ENTRY(_start);
 SECTIONS {
         . = 0x10000;
         _start = . ;
diff --git a/ld/testsuite/ld-x86-64/pr21884.t b/ld/testsuite/ld-x86-64/pr21884.t
index f57cb3a..fcb7bce 100644
--- a/ld/testsuite/ld-x86-64/pr21884.t
+++ b/ld/testsuite/ld-x86-64/pr21884.t
@@ -1,7 +1,3 @@
-OUTPUT_FORMAT("elf64-x86-64");
-OUTPUT_ARCH(i386:x86-64);
-
-ENTRY(_start);
 SECTIONS {
         . = 0x10000;
         _start = . ;

--
Alan Modra
Australia Development Lab, IBM
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Fix i686-nacl and x86_64-nacl pr21884 failures

H.J. Lu-30
On Sat, Aug 12, 2017 at 8:06 PM, Alan Modra <[hidden email]> wrote:

> OUTPUT_FORMAT in the script results in "./ld-new: target elf32-i386
> not found" and similarly for the x86_64 test.
>
>         * testsuite/ld-i386/pr21884.t: Remove unneeded format, arch and entry.
>         * testsuite/ld-x86-64/pr21884.t: Likewise.
>
> diff --git a/ld/testsuite/ld-i386/pr21884.t b/ld/testsuite/ld-i386/pr21884.t
> index 9ec7dc8..fcb7bce 100644
> --- a/ld/testsuite/ld-i386/pr21884.t
> +++ b/ld/testsuite/ld-i386/pr21884.t
> @@ -1,7 +1,3 @@
> -OUTPUT_FORMAT("elf32-i386");
> -OUTPUT_ARCH(i386);
> -

These are what triggered the bug.  Please re-run the test without
Nick's commit:

commit b7a18930e3925c4092bd975e95bc3603aa1418d9
Author: Nick Clifton <[hidden email]>
Date:   Mon Aug 7 10:09:51 2017 +0100

    Do not choose a non-ELF format input file to hold the linker created GOT sec
tions.

            PR 21884
            * elf32-i386.c (elf_i386_link_setup_gnu_properties): If the dynobj
            has not been set then use the bfd returned by
            _bfd_elf_link_setup_gnu_properties.  If that is null then search
            through all the input bfds selecting the first normal, ELF format
            one.
            * elf64-x86-64.c (elf_x86_64_link_setup_gnu_properties): Likewise.

Thanks.

> -ENTRY(_start);
>  SECTIONS {
>          . = 0x10000;
>          _start = . ;
> diff --git a/ld/testsuite/ld-x86-64/pr21884.t b/ld/testsuite/ld-x86-64/pr21884.t
> index f57cb3a..fcb7bce 100644
> --- a/ld/testsuite/ld-x86-64/pr21884.t
> +++ b/ld/testsuite/ld-x86-64/pr21884.t
> @@ -1,7 +1,3 @@
> -OUTPUT_FORMAT("elf64-x86-64");
> -OUTPUT_ARCH(i386:x86-64);
> -
> -ENTRY(_start);
>  SECTIONS {
>          . = 0x10000;
>          _start = . ;
>
> --
> Alan Modra
> Australia Development Lab, IBM



--
H.J.
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Fix i686-nacl and x86_64-nacl pr21884 failures

Alan Modra-3
On Sat, Aug 12, 2017 at 08:25:42PM -0700, H.J. Lu wrote:

> On Sat, Aug 12, 2017 at 8:06 PM, Alan Modra <[hidden email]> wrote:
> > OUTPUT_FORMAT in the script results in "./ld-new: target elf32-i386
> > not found" and similarly for the x86_64 test.
> >
> >         * testsuite/ld-i386/pr21884.t: Remove unneeded format, arch and entry.
> >         * testsuite/ld-x86-64/pr21884.t: Likewise.
> >
> > diff --git a/ld/testsuite/ld-i386/pr21884.t b/ld/testsuite/ld-i386/pr21884.t
> > index 9ec7dc8..fcb7bce 100644
> > --- a/ld/testsuite/ld-i386/pr21884.t
> > +++ b/ld/testsuite/ld-i386/pr21884.t
> > @@ -1,7 +1,3 @@
> > -OUTPUT_FORMAT("elf32-i386");
> > -OUTPUT_ARCH(i386);
> > -
>
> These are what triggered the bug.  Please re-run the test without
> Nick's commit:

I ran the test against the 2.29 release and saw it fail with a
segfault before I made the commit.

--
Alan Modra
Australia Development Lab, IBM
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Fix i686-nacl and x86_64-nacl pr21884 failures

H.J. Lu-30
On Sun, Aug 13, 2017 at 2:37 AM, Alan Modra <[hidden email]> wrote:

> On Sat, Aug 12, 2017 at 08:25:42PM -0700, H.J. Lu wrote:
>> On Sat, Aug 12, 2017 at 8:06 PM, Alan Modra <[hidden email]> wrote:
>> > OUTPUT_FORMAT in the script results in "./ld-new: target elf32-i386
>> > not found" and similarly for the x86_64 test.
>> >
>> >         * testsuite/ld-i386/pr21884.t: Remove unneeded format, arch and entry.
>> >         * testsuite/ld-x86-64/pr21884.t: Likewise.
>> >
>> > diff --git a/ld/testsuite/ld-i386/pr21884.t b/ld/testsuite/ld-i386/pr21884.t
>> > index 9ec7dc8..fcb7bce 100644
>> > --- a/ld/testsuite/ld-i386/pr21884.t
>> > +++ b/ld/testsuite/ld-i386/pr21884.t
>> > @@ -1,7 +1,3 @@
>> > -OUTPUT_FORMAT("elf32-i386");
>> > -OUTPUT_ARCH(i386);
>> > -
>>
>> These are what triggered the bug.  Please re-run the test without
>> Nick's commit:
>
> I ran the test against the 2.29 release and saw it fail with a
> segfault before I made the commit.
>

That isn't sufficient.  I backed out Nick's commit on master branch
and these 2 tests ares still passing now.


--
H.J.
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Fix i686-nacl and x86_64-nacl pr21884 failures

H.J. Lu-30
On Sun, Aug 13, 2017 at 4:39 AM, H.J. Lu <[hidden email]> wrote:

> On Sun, Aug 13, 2017 at 2:37 AM, Alan Modra <[hidden email]> wrote:
>> On Sat, Aug 12, 2017 at 08:25:42PM -0700, H.J. Lu wrote:
>>> On Sat, Aug 12, 2017 at 8:06 PM, Alan Modra <[hidden email]> wrote:
>>> > OUTPUT_FORMAT in the script results in "./ld-new: target elf32-i386
>>> > not found" and similarly for the x86_64 test.
>>> >
>>> >         * testsuite/ld-i386/pr21884.t: Remove unneeded format, arch and entry.
>>> >         * testsuite/ld-x86-64/pr21884.t: Likewise.
>>> >
>>> > diff --git a/ld/testsuite/ld-i386/pr21884.t b/ld/testsuite/ld-i386/pr21884.t
>>> > index 9ec7dc8..fcb7bce 100644
>>> > --- a/ld/testsuite/ld-i386/pr21884.t
>>> > +++ b/ld/testsuite/ld-i386/pr21884.t
>>> > @@ -1,7 +1,3 @@
>>> > -OUTPUT_FORMAT("elf32-i386");
>>> > -OUTPUT_ARCH(i386);
>>> > -
>>>
>>> These are what triggered the bug.  Please re-run the test without
>>> Nick's commit:
>>
>> I ran the test against the 2.29 release and saw it fail with a
>> segfault before I made the commit.
>>
>
> That isn't sufficient.  I backed out Nick's commit on master branch
> and these 2 tests ares still passing now.
>
>
This is what I checked in and will backport it to 2.29 branch.

--
H.J.

0001-ld-Restore-linker-scripts-in-PR-ld-21884-tests.patch (8K) Download Attachment
Loading...