From: DJ Delorie <dj@redhat.com>
Date: Sat, 29 Oct 2011 01:06:33 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: sid-snapshot-20111101~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb2722c12c243bf6d1956691f3cc535c4ed3e342;p=external%2Fbinutils.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8f8e9b2..6a93998 100644
--- 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 3b3f377..6a2fe8c 100644
--- 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
 }