From 9ed11cc260a28a64de0c1fa5d94d7cd6273781a5 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 7 Sep 2014 00:16:18 +0100 Subject: [PATCH] setarch: use personality() system call when it is available Signed-off-by: Sami Kerola --- sys-utils/setarch.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c index 468e492602..ed2a6a64cb 100644 --- a/sys-utils/setarch.c +++ b/sys-utils/setarch.c @@ -24,8 +24,7 @@ * sparc32 util by Jakub Jelinek (1998, 1999) */ -#include -#include +#include #include #include #include @@ -37,7 +36,10 @@ #include "c.h" #include "closestream.h" -#define set_pers(pers) ((long)syscall(SYS_personality, pers)) +#ifndef HAVE_PERSONALITY +# include +# define personality(pers) ((long)syscall(SYS_personality, pers)) +#endif /* Options without equivalent short options */ enum { @@ -229,7 +231,7 @@ static int set_arch(const char *pers, unsigned long options, int list) if (transitions[i].perval < 0) errx(EXIT_FAILURE, _("%s: Unrecognized architecture"), pers); pers_value = transitions[i].perval | options; - if (set_pers(pers_value) == -EINVAL) + if (personality(pers_value) == -EINVAL) return 1; uname(&un); if (transitions[i].result_arch && strcmp(un.machine, transitions[i].result_arch)) { -- 2.47.3