From: LaMont Jones <lamont@debian.org>
Date: Sat, 22 Sep 2007 04:41:41 +0000 (-0600)
Subject: Merge commit 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4bb5a7ff170d59594e085bd60a15ef8f97e0a17;p=util-linux

Merge commit 'origin/master'
---

c4bb5a7ff170d59594e085bd60a15ef8f97e0a17
diff --cc sys-utils/setarch.c
index 37ce4e5a,5379c307..c802bb30
--- a/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")) {