From a01fefebabd4eee713d515a836b548828353f30b Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 4 Mar 2003 03:02:50 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 4 ++++ libiberty/cplus-dem.c | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 5e507afffd..b3e904f975 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2003-03-03 Mark Mitchell + + * cplus-dem.c: Add license exception to copyright notice. + 2003-02-27 Kaveh R. Ghazi * physmem.c: Formatting changes from upstream. diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index 0b5a3e0b29..af35bc1311 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