From 562ef5e69eb38230810bd25a4335224a31bfe31b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 27 Oct 2020 10:42:10 +0100 Subject: misc: Add internal __getauxval2 function The explicit error return value (without in-band signaling) avoids complicated steps to detect errors based on whether errno has been updated. Reviewed-by: Alistair Francis --- misc/getauxval.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) (limited to 'misc') diff --git a/misc/getauxval.c b/misc/getauxval.c index d7f9f957d0..e96d4dfa20 100644 --- a/misc/getauxval.c +++ b/misc/getauxval.c @@ -18,26 +18,47 @@ #include #include #include +#include - -unsigned long int -__getauxval (unsigned long int type) +bool +__getauxval2 (unsigned long int type, unsigned long int *result) { #ifdef HAVE_AUX_VECTOR ElfW(auxv_t) *p; #endif if (type == AT_HWCAP) - return GLRO(dl_hwcap); + { + *result = GLRO(dl_hwcap); + return true; + } else if (type == AT_HWCAP2) - return GLRO(dl_hwcap2); + { + *result = GLRO(dl_hwcap2); + return true; + } #ifdef HAVE_AUX_VECTOR for (p = GLRO(dl_auxv); p->a_type != AT_NULL; p++) if (p->a_type == type) - return p->a_un.a_val; + { + *result = p->a_un.a_val; + return true; + } #endif + return false; +} +libc_hidden_def (__getauxval2) + +unsigned long int +__getauxval (unsigned long int type) +{ + unsigned long int result; + + if (__getauxval2 (type, &result)) + return result; + __set_errno (ENOENT); return 0; } -- cgit 1.4.1