From: Pádraig Brady <P@draigBrady.com>
Date: Mon, 25 Jan 2016 01:57:12 +0000 (-0800)
Subject: build: avoid dynamic linking issue on Solaris sparc
X-Git-Tag: v8.26~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6412d569dc104fe7c0dea8adf71c011df1afeaeb;p=thirdparty%2Fcoreutils.git

build: avoid dynamic linking issue on Solaris sparc

Solaris Studio 12 on sparc (not x86) will not remove
unused functions, thus leaving a reference to an
undefined program_name symbol from emit_try_help().

* src/system.h (emit_try_help): Change from an inline function
to a macro, so that the inline function is not actually
defined in libstdbuf.c.
Fixes http://bugs.gnu.org/22430
---

diff --git a/src/system.h b/src/system.h
index 9898bc79c4..986a6c7869 100644
--- a/src/system.h
+++ b/src/system.h
@@ -650,11 +650,17 @@ emit_ancillary_info (char const *program)
           node, node == program ? " invocation" : "");
 }
 
-static inline void
-emit_try_help (void)
-{
-  fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name);
-}
+/* Use a macro rather than an inline function, as this references
+   the global program_name, which causes dynamic linking issues
+   in libstdbuf.so on some systems where unused functions
+   are not removed by the linker.  */
+#define emit_try_help() \
+  do \
+    { \
+      fprintf (stderr, _("Try '%s --help' for more information.\n"), \
+               program_name); \
+    } \
+  while (0)
 
 #include "inttostr.h"