merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5e507afffd32f08d81b25118240e9129fedf8a90..b3e904f975e4eae7a9436afb9d956bd9f9292f97 100644 (file)
--- 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 0b5a3e0b29e0c35a749346c90876131cffd5e8b9..af35bc1311987b09bc6937c2876d437b662e4f47 100644 (file)
--- 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