aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2002-03-27 19:17:34 +0000
committerDJ Delorie <dj@redhat.com>2002-03-27 19:17:34 +0000
commit38e57a35dc255a3292ee395f8a061560e50fe3a5 (patch)
tree93487b64a866c3532132064db5f9f95aea7245d9
parent3458b54ce7e3ff3cd091ce85c4fd54349ac68f01 (diff)
downloadgdb-38e57a35dc255a3292ee395f8a061560e50fe3a5.zip
gdb-38e57a35dc255a3292ee395f8a061560e50fe3a5.tar.gz
gdb-38e57a35dc255a3292ee395f8a061560e50fe3a5.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/dyn-string.c11
2 files changed, 14 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6b81d80..1b9ff43 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-27 Mark Mitchell <mark@codesourcery.com>
+
+ * dyn-string.c: Add libgcc exception to copyright notice.
+
2002-03-26 H.J. Lu (hjl@gnu.org)
* config.table: Support --with-build-subdir.
diff --git a/libiberty/dyn-string.c b/libiberty/dyn-string.c
index 34f88ad..c41d7cc 100644
--- a/libiberty/dyn-string.c
+++ b/libiberty/dyn-string.c
@@ -1,5 +1,5 @@
/* An abstract string datatype.
- Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
Contributed by Mark Mitchell (mark@markmitchell.com).
This file is part of GNU CC.
@@ -9,6 +9,15 @@ it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, 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.)
+
GNU CC 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