package/prelink-cross: fix handling of TLS offsets for s390 arch
PATCH 1/1 package/prelink-cross: fix handling of TLS offsets for s390 arch
/tmp/instance-1/output-1/host/sbin/prelink-rtld: error while loading shared libraries: /lib64/libc.so.6: cannot handle TLS data
ERROR: can't resolve libraries to shared libraries: glib-2.0, gobject-2.0
ninja: build stopped: subcommand failed.
make: *** [package/pkg-generic.mk:270:/tmp/instance-1/output-1/build/gobject-introspection-1.68.0/.stamp_built] Error 1
make: Leaving directory '/tmp/instance-1/buildroot'
Fixes:
- http://autobuild.buildroot.org/?reason=gobject-introspection-1.68.0&arch=s390x
--- ...c-Fix-TLS-offsets-computation-for-s3.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch
package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 4064f77d2f550762cbf220fec7c26a8ce4219ea4 Mon Sep 17 00:00:00 2001 +From: Alexander Egorenkov <[email protected]> +Date: Sun, 8 Aug 2021 11:19:52 +0200 +Subject: [PATCH] src/rtld/dl-tls.c: Fix TLS offsets computation for s390 arch + +rtld_determine_tlsoffsets() didn't handle s390 arch properly by falling +back to the default case. If TLS_TCB_AT_TP is 1, then set offset to -1. + +From glibc's sysdeps/s390/nptl/tls.h: +------------------------------------- +/* The TCB can have any size and the memory following the address the + thread pointer points to is unspecified. Allocate the TCB there. */ +define TLS_TCB_AT_TP 1 +define TLS_DTV_AT_TP 0 + +This lead to the following error: +--------------------------------- +prelink-rtld: error while loading shared libraries: /lib64/libc.so.6: cannot handle TLS data + +Signed-off-by: Alexander Egorenkov <[email protected]> +--- + src/rtld/dl-tls.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/rtld/dl-tls.c b/src/rtld/dl-tls.c +index 280cee45f950..29422dcfd25e 100644 +--- a/src/rtld/dl-tls.c ++++ b/src/rtld/dl-tls.c +@@ -143,6 +143,11 @@ rtld_determine_tlsoffsets (int e_machine, struct r_scope_elem *search_list) + tls_tcb_size = 0; + break; + ++ case EM_S390: ++ tls_tcb_at_tp = 1; ++ tls_tcb_size = -1; ++ break; ++ + default: + /* Hope there's no TLS! */ + for (i = 0; i < search_list->r_nlist; i++) +-- +2.31.1 +
Signature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Quoted 8 lines · On Sun, 8 Aug 2021 11:48:44 +0200 Alexander Egorenkov…
/tmp/instance-1/output-1/host/sbin/prelink-rtld: error while loading shared libraries:/lib64/libc.so.6: cannot handle TLS data
ERROR: can't resolve libraries to shared libraries: glib-2.0, gobject-2.0
ninja: build stopped: subcommand failed.
make: *** [package/pkg-generic.mk:270:/tmp/instance-1/output-1/build/gobject-introspection-1.68.0/.stamp_built] Error 1
make: Leaving directory '/tmp/instance-1/buildroot'
Thanks a lot for having looked at this problem and submitted a patch. I have applied, after adjusting a bit the commit log, see below.
Quoted 3 lines
Fixes:
- http://autobuild.buildroot.org/?reason=gobject-introspection-1.68.0&arch=s390x
This is not a correct way to reference an autobuilder failure. Indeed, this point to a list of failures, which today are what you are fixing, but tomorrow? Maybe there will be another s390 failure in gobject-introspection, which is different. This would cause anybody look at your commit log and following the link to be very confused. So we always point to one (or several) specific build failures.
Quoted 5 lines
Signed-off-by Alexander Egorenkov <[email protected]>--- ...c-Fix-TLS-offsets-computation-for-s3.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch
Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Alexander" == Alexander Egorenkov <[email protected]> writes:
/tmp/instance-1/output-1/host/sbin/prelink-rtld: error while loading shared libraries:/lib64/libc.so.6: cannot handle TLS data
ERROR: can't resolve libraries to shared libraries: glib-2.0, gobject-2.0
ninja: build stopped: subcommand failed.
make: *** [package/pkg-generic.mk:270:/tmp/instance-1/output-1/build/gobject-introspection-1.68.0/.stamp_built] Error 1
make: Leaving directory '/tmp/instance-1/buildroot'
Quoted 4 lines
Fixes:
- http://autobuild.buildroot.org/?reason=gobject-introspection-1.68.0&arch=s390xSigned-off-by Alexander Egorenkov <[email protected]>
Committed to 2021.02.x and 2021.05.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot