Merge commit 'origin/master'

diff --cc sys-utils/setarch.c
index 37ce4e5a5f99ef427cb2700e12a4799cc02a3192,5379c307323f75c3fd69d72bf13b0fd693c5023b..c802bb30fc49dd5c772efcc8e5097fd35dbe7ef4
--- 1/sys-utils/setarch.c
--- 2/sys-utils/setarch.c
+++ b/sys-utils/setarch.c
@@@ -194,12 -219,9 +219,13 @@@ int main(int argc, char *argv[]
      if (argc < 1)
        show_usage(_("Not enough arguments"));
      p = argv[0];
+     argv[0] = argv[-1];      /* for getopt_long() to get the program name */
      if (!strcmp(p, "-h") || !strcmp(p, "--help"))
        show_help();
 +  #if defined(__sparc64__) || defined(__sparc__)
 +  } else if (!strcmp(p,"sparc64")) {
 +      options |= ADDR_LIMIT_32BIT;
 +  #endif
    }
    #if defined(__sparc64__) || defined(__sparc__)
     if (!strcmp(p, "sparc32bash")) {