From: Fabrice Fontaine Date: Wed, 15 May 2024 16:22:11 +0000 (+0200) Subject: sys-utils/setarch.c: fix build with uclibc-ng < 1.0.39 X-Git-Tag: v2.42-start~330^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=beef18da4de87ca5aaadf2beb14187f35cc4f50f;p=thirdparty%2Futil-linux.git sys-utils/setarch.c: fix build with uclibc-ng < 1.0.39 Fix the following build failure with uclibc-ng < 1.0.39 (i.e., without https://github.com/wbx-github/uclibc-ng/commit/85ac4f04d94e98389a8315e720630d0f95bfdfd6) raised since version 2.39 and https://github.com/util-linux/util-linux/commit/03a254f010b08da1175f50a8ae7882e59228f1b4: sys-utils/setarch.c:106:7: error: 'PER_LINUX32_3GB' undeclared here (not in a function); did you mean 'PER_LINUX32'? 106 | X(PER_LINUX32_3GB) \ | ^~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/fb1feb47f2660882fa53f66bacc63e191fd52175 Signed-off-by: Fabrice Fontaine --- diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c index 227bc6b5d..4bcb5e69e 100644 --- a/sys-utils/setarch.c +++ b/sys-utils/setarch.c @@ -89,6 +89,11 @@ # define PER_LINUX_FDPIC (PER_LINUX | FDPIC_FUNCPTRS) #endif +/* fallback for old uclibc-headers < 1.0.39 */ +#ifndef PER_LINUX32_3GB +# define PER_LINUX32_3GB (PER_LINUX32 | ADDR_LIMIT_3GB) +#endif + #define ALL_PERSONALITIES \ X(PER_LINUX) \ X(PER_LINUX_32BIT) \