Imported Upstream version 8.24upstream/8.24upstream

1 files changed, 6 insertions, 5 deletions

diff --git a/src/coreutils-arch.c b/src/coreutils-arch.c
index 899cc937..fa35f261 100644
--- a/src/coreutils-arch.c
+++ b/src/coreutils-arch.c
@@ -1,5 +1,5 @@
 /* arch -- wrapper to uname with the right uname_mode.
-   Copyright (C) 2014 Free Software Foundation, Inc.
+   Copyright (C) 2014-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,11 +22,12 @@
 #include "uname.h"
 /* Ensure that the main for uname is declared even if the tool is not being
    built in this single-binary. */
-int _single_binary_main_uname (int argc, char** argv) ATTRIBUTE_NORETURN;
-int _single_binary_main_arch (int argc, char** argv) ATTRIBUTE_NORETURN;
+int single_binary_main_uname (int argc, char **argv);
+int single_binary_main_arch (int argc, char **argv);
 
-int _single_binary_main_arch (int argc, char** argv)
+int
+single_binary_main_arch (int argc, char **argv)
 {
   uname_mode = UNAME_ARCH;
-  _single_binary_main_uname (argc, argv);
+  return single_binary_main_uname (argc, argv);
 }