summaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2002-03-12 21:11:11 +0000
committerDJ Delorie <dj@delorie.com>2002-03-12 21:11:11 +0000
commitc9d0ca2c81edbdde772516c8d7f8eb2d55c71d14 (patch)
tree211b27b8871b5c8fc5af104b22a3b6628e8869d2 /libiberty
parentdd74e70ad6c10233ed1ed0424490ce4efbaf3f61 (diff)
downloadgdb-c9d0ca2c81edbdde772516c8d7f8eb2d55c71d14.tar.gz
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/cp-demangle.c11
2 files changed, 15 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6c6780732ef..01c73c94bcd 100644
--- 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 136dc723d2e..28d36413582 100644
--- 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