merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6c6780732ef4a1f730ccbb9959cb94b465d2206a..01c73c94bcd702722b022b6c40a109005e4447b0 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-12  Mark Mitchell  <mark@codesourcery.com>
+
+       * cp-demangle.c: Add libgcc exception to cp-demangle.c copyright
+       notice.
+
 2002-03-11  Douglas B Rupp  <rupp@gnat.com>
 
        * xatexit.c [VMS]: Include stdlib.h and unixlib.h.

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 136dc723d2ed15f7075e513c84d8ff4aa1a09c8c..28d36413582629cfb58dcd9c38c1aa0358b3c42c 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -1,5 +1,5 @@
 /* Demangler for IA64 / g++ V3 ABI.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
    Written by Alex Samuel <samuel@codesourcery.com>. 
 
    This file is part of GNU CC.
@@ -9,6 +9,15 @@
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
+   In addition to the permissions in the GNU General Public License, the
+   Free Software Foundation gives you unlimited permission to link the
+   compiled version of this file into combinations with other programs,
+   and to distribute those combinations without any restriction coming
+   from the use of this file.  (The General Public License restrictions
+   do apply in other respects; for example, they cover modification of
+   the file, and distribution when not linked into a combined
+   executable.)
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the