[PATCH] libstdc++: Fix up 19_diagnostics/stacktrace/hash.cc on 13 branch

[PATCH] libstdc++: Fix up 19_diagnostics/stacktrace/hash.cc on 13 branch

[Jakub Jelinek]

Hi!

The r13-8207-g17acf9fbeb10d7adad commit changed some tests to use
-lstdc++exp instead of -lstdc++_libbacktrace, but it didn't change
the 19_diagnostics/stacktrace/hash.cc test, presumably because
when it was added on the trunk, it already had -lstdc++exp and
it was changed to -lstdc++_libbacktrace only in the
r13-8067-g16635b89f36c07b9e0 cherry-pick.

The test fails with
/usr/bin/ld: cannot find -lstdc++_libbacktrace
collect2: error: ld returned 1 exit status
compiler exited with status 1
FAIL: 19_diagnostics/stacktrace/hash.cc (test for excess errors)
without this (while the library is still built, it isn't added in
-L options).

Ok for 13 branch?

I think the r13-8067 cherry-pick hasn't been applied to 12 branch,
so we don't need it there.

2024-05-27  Jakub Jelinek  <jakub@redhat.com>

	* testsuite/19_diagnostics/stacktrace/hash.cc: Adjust
	dg-options to use -lstdc++exp.

--- libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc.jj	2023-11-22 11:03:28.812657550 +0100
+++ libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc	2024-05-27 10:18:44.900058884 +0200
@@ -1,4 +1,4 @@
-// { dg-options "-std=gnu++23 -lstdc++_libbacktrace" }
+// { dg-options "-std=gnu++23 -lstdc++exp" }
 // { dg-do run { target c++23 } }
 // { dg-require-effective-target stacktrace }
 


	Jakub

Re: [PATCH] libstdc++: Fix up 19_diagnostics/stacktrace/hash.cc on 13 branch

[Jonathan Wakely]

On Mon, 27 May 2024 at 09:26, Jakub Jelinek <jakub@redhat.com> wrote:
>
> Hi!
>
> The r13-8207-g17acf9fbeb10d7adad commit changed some tests to use
> -lstdc++exp instead of -lstdc++_libbacktrace, but it didn't change
> the 19_diagnostics/stacktrace/hash.cc test, presumably because
> when it was added on the trunk, it already had -lstdc++exp and
> it was changed to -lstdc++_libbacktrace only in the
> r13-8067-g16635b89f36c07b9e0 cherry-pick.
>
> The test fails with
> /usr/bin/ld: cannot find -lstdc++_libbacktrace
> collect2: error: ld returned 1 exit status
> compiler exited with status 1
> FAIL: 19_diagnostics/stacktrace/hash.cc (test for excess errors)
> without this (while the library is still built, it isn't added in
> -L options).

Ah yes, because r13-8207-g17acf9fbeb10d7 changed the -L flags used for testing.

I wonder why I didn't see this failure though. It must have found the
lib in an already-installed path.

> Ok for 13 branch?

OK, thanks.


>
> I think the r13-8067 cherry-pick hasn't been applied to 12 branch,
> so we don't need it there.
>
> 2024-05-27  Jakub Jelinek  <jakub@redhat.com>
>
>         * testsuite/19_diagnostics/stacktrace/hash.cc: Adjust
>         dg-options to use -lstdc++exp.
>
> --- libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc.jj 2023-11-22 11:03:28.812657550 +0100
> +++ libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc    2024-05-27 10:18:44.900058884 +0200
> @@ -1,4 +1,4 @@
> -// { dg-options "-std=gnu++23 -lstdc++_libbacktrace" }
> +// { dg-options "-std=gnu++23 -lstdc++exp" }
>  // { dg-do run { target c++23 } }
>  // { dg-require-effective-target stacktrace }
>
>
>
>         Jakub
>