From fe037986c84a2939f06e848649bebac4c57bcc06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 18 Nov 2021 19:10:18 +0100 Subject: [PATCH] shared/base-filesystem: add define for s390x This is based on the information in #14311 and https://refspecs.linuxfoundation.org/LSB_3.2.0/LSB-Core-S390X/LSB-Core-S390X.pdf and https://wiki.debian.org/Multiarch/Tuples. Fixes #14311. --- src/shared/base-filesystem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c index d2254d7848..e399b3a8dd 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -93,7 +93,11 @@ static const BaseFilesystem table[] = { # error "Unknown RISC-V ABI" # endif #elif defined(__s390__) + /* s390-linux-gnu */ #elif defined(__s390x__) + { "lib64", 0, "usr/lib/s390x-linux-gnu\0" + "usr/lib64", "ld-lsb-s390x.so.3" }, +# define KNOW_LIB64_DIRS 1 #elif defined(__sparc__) #endif /* gcc doesn't allow pragma to be used within constructs, hence log about this separately below */