merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6b81d80ab523766d4c0d466cae53b7bf8427de3b..1b9ff43a83d6d4884133e472d2dc782fc15ce199 100644 (file)
--- 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 34f88ade96d31d663bc69802e4c8f5bf4072a313..c41d7ccac3e6ec9905ecf24b18709c49d74536c9 100644 (file)
--- 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