setarch: use kernel address size if possible

If setarch is running as 32bit userspace on a 64bit kernel we should use
the kernel personality.

diff --git a/meson.build b/meson.build
index 38e59bd9ae288ec7bcbf42caa9c315d17063dc78..ae91338b437edeb1cefda24a341289580ae83761 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1439,6 +1439,7 @@ exe = executable(
   'setarch',
   setarch_sources,
   include_directories : includes,
+  link_with : [lib_common],
   install_dir : usrbin_exec_dir,
   install : true)
 exes += exe

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 22047d9bd47cba92a573b49404c6fc9ded30a8a5..a0bf6cb7b037d1224e239d52d325e5b08701c808 100644 (file)
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -231,6 +231,7 @@ usrbin_exec_PROGRAMS += setarch
 MANPAGES += sys-utils/setarch.8
 dist_noinst_DATA += sys-utils/setarch.8.adoc
 setarch_SOURCES = sys-utils/setarch.c
+setarch_LDADD = $(LDADD) libcommon.la
 
 SETARCH_LINKS = uname26 linux32 linux64
 

diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c
index b86be1e29da1d3d8c4d1302fd68f53690acd01e5..d6789d05e86f555853d4b4d5fc842ac58377d6a7 100644 (file)
--- a/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@ -35,6 +35,7 @@
 #include "nls.h"
 #include "c.h"
 #include "closestream.h"
+#include "sysfs.h"
 
 #ifndef HAVE_PERSONALITY
 # include <syscall.h>
@@ -232,7 +233,9 @@ static struct arch_domain *init_arch_domains(void)
                if (!strcmp(un.machine, transitions[i].target_arch))
                        break;
        if (transitions[i].perval < 0) {
-               unsigned long wrdsz = CHAR_BIT * sizeof(void *);
+               int wrdsz = sysfs_get_address_bits(NULL);
+               if (wrdsz < 0)
+                       wrdsz = CHAR_BIT * sizeof(void *);
                if (wrdsz == 32 || wrdsz == 64) {
                        /* fill up the place holder */
                        transitions[i].perval = wrdsz == 32 ? PER_LINUX32 : PER_LINUX;