[commits] r11607 - in /fsf/trunk/libc: ChangeLog debug/stack_chk_fail_local.c debug/warning-nop.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Sep 25 00:03:40 2010
New Revision: 11607

Log:
Import glibc-mainline for 2010-09-25

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/debug/stack_chk_fail_local.c
    fsf/trunk/libc/debug/warning-nop.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Sep 25 00:03:40 2010
@@ -1,3 +1,8 @@
+2010-09-24  Petr Baudis <pasky@xxxxxxx>
+
+	* debug/stack_chk_fail_local.c: Add missing licence exception.
+	* debug/warning-nop.c: Likewise.
+
 2010-09-15  Michael B. Brutman  <brutman@xxxxxxxxxx>
 
 	* sysdeps/powerpc/powerpc32/ppca2/memcpy.S: New file.

Modified: fsf/trunk/libc/debug/stack_chk_fail_local.c
==============================================================================
--- fsf/trunk/libc/debug/stack_chk_fail_local.c (original)
+++ fsf/trunk/libc/debug/stack_chk_fail_local.c Sat Sep 25 00:03:40 2010
@@ -5,6 +5,23 @@
    modify it under the terms of the GNU Lesser General Public
    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

Modified: fsf/trunk/libc/debug/warning-nop.c
==============================================================================
--- fsf/trunk/libc/debug/warning-nop.c (original)
+++ fsf/trunk/libc/debug/warning-nop.c Sat Sep 25 00:03:40 2010
@@ -6,6 +6,23 @@
    modify it under the terms of the GNU Lesser General Public
    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