From 0a0abc373c07a7744adac48891a393e0882fdb6f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 04:19:40 +0200 Subject: Merging upstream version 252.25. Signed-off-by: Daniel Baumann --- src/shared/base-filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/shared/base-filesystem.c') diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c index 47a766e..950ed1e 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -107,12 +107,12 @@ static const BaseFilesystem table[] = { # else # error "Unknown RISC-V ABI" # endif -#elif defined(__s390__) - /* s390-linux-gnu */ #elif defined(__s390x__) { "lib64", 0, "usr/lib/"LIB_ARCH_TUPLE"\0" "usr/lib64\0", "ld-lsb-s390x.so.3" }, # define KNOW_LIB64_DIRS 1 +#elif defined(__s390__) + /* s390-linux-gnu */ #elif defined(__sparc__) #endif /* gcc doesn't allow pragma to be used within constructs, hence log about this separately below */ -- cgit v1.2.3