aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2003-03-04 03:02:50 +0000
committerDJ Delorie <dj@redhat.com>2003-03-04 03:02:50 +0000
commita01fefebabd4eee713d515a836b548828353f30b (patch)
tree06e84973e46b539d8781dec6708b23e2fa99a891 /libiberty
parent342d3a7bd9425872b43b5c169462f896df456e8d (diff)
downloadgdb-a01fefebabd4eee713d515a836b548828353f30b.zip
gdb-a01fefebabd4eee713d515a836b548828353f30b.tar.gz
gdb-a01fefebabd4eee713d515a836b548828353f30b.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/cplus-dem.c9
2 files changed, 13 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5e507af..b3e904f 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-03 Mark Mitchell <mark@codesourcery.com>
+
+ * cplus-dem.c: Add license exception to copyright notice.
+
2003-02-27 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* physmem.c: Formatting changes from upstream.
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 0b5a3e0..af35bc1 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -11,6 +11,15 @@ modify it under the terms of the GNU Library General Public
License as published by 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 Library 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 Library 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.)
+
Libiberty 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 GNU