about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2010-09-25 03:06:00 +0200
committerPetr Baudis <pasky@suse.cz>2010-09-25 03:09:53 +0200
commit315970f6ca97a589c9220ed5481dbe000137373d (patch)
tree4d8a359416430666cded971b5a2fe28bb138bd83
parent44f91d3884e241e4402eb3e8b9b6dfa2acc9f80c (diff)
downloadglibc-315970f6ca97a589c9220ed5481dbe000137373d.tar.gz
glibc-315970f6ca97a589c9220ed5481dbe000137373d.tar.xz
glibc-315970f6ca97a589c9220ed5481dbe000137373d.zip
Add two forgotten licence exceptions
The two files in debug/ are included in libc_nonshared.a and the
functions may be included in linked executables. Use the same text
as in other files going to libc_nonshared.a.
-rw-r--r--ChangeLog5
-rw-r--r--debug/stack_chk_fail_local.c17
-rw-r--r--debug/warning-nop.c17
3 files changed, 39 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 99e56192ee..d7f0819454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-24  Petr Baudis <pasky@suse.cz>
+
+	* debug/stack_chk_fail_local.c: Add missing licence exception.
+	* debug/warning-nop.c: Likewise.
+
 2010-09-15  Michael B. Brutman  <brutman@us.ibm.com>
 
 	* sysdeps/powerpc/powerpc32/ppca2/memcpy.S: New file.
diff --git a/debug/stack_chk_fail_local.c b/debug/stack_chk_fail_local.c
index de0de8f397..113088d55e 100644
--- a/debug/stack_chk_fail_local.c
+++ b/debug/stack_chk_fail_local.c
@@ -6,6 +6,23 @@
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
+   In addition to the permissions in the GNU Lesser General Public
+   License, the Free Software Foundation gives you unlimited
+   permission to link the compiled version of this file with other
+   programs, and to distribute those programs without any restriction
+   coming from the use of this file. (The GNU Lesser General Public
+   License restrictions do apply in other respects; for example, they
+   cover modification of the file, and distribution when not linked
+   into another program.)
+
+   Note that people who make modified versions of this file are not
+   obligated to grant this special exception for their modified
+   versions; it is their choice whether to do so. The GNU Lesser
+   General Public License gives permission to release a modified
+   version without this exception; this exception also makes it
+   possible to release a modified version which carries forward this
+   exception.
+
    The GNU C Library 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
diff --git a/debug/warning-nop.c b/debug/warning-nop.c
index 8f2f66e16a..74df8e7c58 100644
--- a/debug/warning-nop.c
+++ b/debug/warning-nop.c
@@ -7,6 +7,23 @@
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.
 
+   In addition to the permissions in the GNU Lesser General Public
+   License, the Free Software Foundation gives you unlimited
+   permission to link the compiled version of this file with other
+   programs, and to distribute those programs without any restriction
+   coming from the use of this file. (The GNU Lesser General Public
+   License restrictions do apply in other respects; for example, they
+   cover modification of the file, and distribution when not linked
+   into another program.)
+
+   Note that people who make modified versions of this file are not
+   obligated to grant this special exception for their modified
+   versions; it is their choice whether to do so. The GNU Lesser
+   General Public License gives permission to release a modified
+   version without this exception; this exception also makes it
+   possible to release a modified version which carries forward this
+   exception.
+
    The GNU C Library 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