merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8f8e9b2246b852229b9c34646a887a110aa3a12c..6a93998e2442bcf8f8160c612951c8714e3c7217 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-28  Ian Lance Taylor  <iant@google.com>
+
+       * setproctitle.c (setproctitle): Use "GNU/Linux" in comment.
+
 2011-10-26  Iain Sandoe  <iains@gcc.gnu.org>
 
        PR target/48108

diff --git a/libiberty/setproctitle.c b/libiberty/setproctitle.c
index 3b3f377b67b7e3d3a14bb371b8b96fbbae9030a8..6a2fe8ce3a5b6fffa5bd0bd68c73b12f92a6b681 100644 (file)
--- a/libiberty/setproctitle.c
+++ b/libiberty/setproctitle.c
@@ -41,8 +41,8 @@ void
 setproctitle (const char *name ATTRIBUTE_UNUSED, ...)
 {
 #ifdef PR_SET_NAME
-  /* On Linux this sets the top visible "comm", but not necessarily
-     the name visible in ps. */
+  /* On GNU/Linux this sets the top visible "comm", but not
+     necessarily the name visible in ps. */
   prctl (PR_SET_NAME, name);
 #endif
 }