merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index f26593fc08176816fdc5ad9a95a6c8e7337bcae8..031b7f154e9f4cc068df34369d92672184905933 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-12  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+        * cp-demangle.c: Clarify what package(s) this is part of.
+
 2003-07-05  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * pex-win32.c (pexecute): Mark parameters this_pname and

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 5dcce5560ee135525808f962ae7bec5d1f2d11d9..bd4882239fb31069a5c291c63e5a9eed94a2751d 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -2,9 +2,9 @@
    Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
    Written by Alex Samuel <samuel@codesourcery.com>. 
 
-   This file is part of GNU CC.
+   This file is part of the libiberty library, which is part of GCC.
 
-   This program is free software; you can redistribute it and/or modify
+   This file is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.