From 813d9c0dd88261e538c56be2acf54f3dff2f369b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 16 Aug 2004 06:46:31 +0000 Subject: * sysdeps/i386/i686/Makefile (elide-routines.os): Append hp-timing to this, not ... (static-only-routines): ... this. * sysdeps/ia64/Makefile: Likewise. * sysdeps/sparc/sparc32/sparcv9/Makefile: Likewise. * sysdeps/sparc/sparc64/Makefile: Likewise. * sysdeps/x86_64/Makefile: Likewise. * sysdeps/i386/i686/hp-timing.c: Revert copyright terms change. * sysdeps/ia64/hp-timing.c: Likewise. * sysdeps/sparc/sparc32/sparcv9/hp-timing.c: Likewise. * sysdeps/sparc/sparc64/hp-timing.c: Likewise. --- ChangeLog | 12 ++++++++++++ linuxthreads/pthread_atfork.c | 17 +++++++++++++++++ nptl/pthread_atfork.c | 17 +++++++++++++++++ sysdeps/i386/i686/Makefile | 2 +- sysdeps/i386/i686/hp-timing.c | 17 ----------------- sysdeps/ia64/Makefile | 2 +- sysdeps/ia64/hp-timing.c | 17 ----------------- sysdeps/sparc/sparc32/sparcv9/Makefile | 2 +- sysdeps/sparc/sparc32/sparcv9/hp-timing.c | 17 ----------------- sysdeps/sparc/sparc64/Makefile | 2 +- sysdeps/sparc/sparc64/hp-timing.c | 17 ----------------- sysdeps/x86_64/Makefile | 2 +- 12 files changed, 51 insertions(+), 73 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96617cda66..9821c24873 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ 2004-08-15 Roland McGrath + * sysdeps/i386/i686/Makefile (elide-routines.os): Append hp-timing to + this, not ... + (static-only-routines): ... this. + * sysdeps/ia64/Makefile: Likewise. + * sysdeps/sparc/sparc32/sparcv9/Makefile: Likewise. + * sysdeps/sparc/sparc64/Makefile: Likewise. + * sysdeps/x86_64/Makefile: Likewise. + * sysdeps/i386/i686/hp-timing.c: Revert copyright terms change. + * sysdeps/ia64/hp-timing.c: Likewise. + * sysdeps/sparc/sparc32/sparcv9/hp-timing.c: Likewise. + * sysdeps/sparc/sparc64/hp-timing.c: Likewise. + * csu/elf-init.c: Update copyright terms including special exception for these trivial files, which are statically linked into executables that use dynamic linking for the significant library code. diff --git a/linuxthreads/pthread_atfork.c b/linuxthreads/pthread_atfork.c index dabb26a726..2464acb6b2 100644 --- a/linuxthreads/pthread_atfork.c +++ b/linuxthreads/pthread_atfork.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 diff --git a/nptl/pthread_atfork.c b/nptl/pthread_atfork.c index 00a52fd4cd..6437d64906 100644 --- a/nptl/pthread_atfork.c +++ b/nptl/pthread_atfork.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 diff --git a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile index bfc0fc93f3..c7378ab21e 100644 --- a/sysdeps/i386/i686/Makefile +++ b/sysdeps/i386/i686/Makefile @@ -1,6 +1,6 @@ ifeq ($(subdir),csu) sysdep_routines += hp-timing -static-only-routines += hp-timing +elide-routines.os += hp-timing endif # So that we can test __m128's alignment diff --git a/sysdeps/i386/i686/hp-timing.c b/sysdeps/i386/i686/hp-timing.c index b77a1a6016..c8c88650cb 100644 --- a/sysdeps/i386/i686/hp-timing.c +++ b/sysdeps/i386/i686/hp-timing.c @@ -8,23 +8,6 @@ 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/sysdeps/ia64/Makefile b/sysdeps/ia64/Makefile index b221ef05ed..2ea937ac9e 100644 --- a/sysdeps/ia64/Makefile +++ b/sysdeps/ia64/Makefile @@ -8,7 +8,7 @@ endif ifeq ($(subdir), csu) CPPFLAGS-start.S = -D__ASSEMBLY__ sysdep_routines += hp-timing -static-only-routines += hp-timing +elide-routines.os += hp-timing ifeq (yes,$(build-shared)) # Compatibility diff --git a/sysdeps/ia64/hp-timing.c b/sysdeps/ia64/hp-timing.c index a1db8c6c20..ae8680f9a7 100644 --- a/sysdeps/ia64/hp-timing.c +++ b/sysdeps/ia64/hp-timing.c @@ -8,23 +8,6 @@ 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/sysdeps/sparc/sparc32/sparcv9/Makefile b/sysdeps/sparc/sparc32/sparcv9/Makefile index 8067bda51e..58f5759b3f 100644 --- a/sysdeps/sparc/sparc32/sparcv9/Makefile +++ b/sysdeps/sparc/sparc32/sparcv9/Makefile @@ -2,7 +2,7 @@ sysdep-CFLAGS += -mcpu=ultrasparc -Wa,-Av9a ifeq ($(subdir),csu) sysdep_routines += hp-timing -static-only-routines += hp-timing +elide-routines.os += hp-timing endif ASFLAGS-.o += -Wa,-Av9a diff --git a/sysdeps/sparc/sparc32/sparcv9/hp-timing.c b/sysdeps/sparc/sparc32/sparcv9/hp-timing.c index edec0385a8..49fb94d7ae 100644 --- a/sysdeps/sparc/sparc32/sparcv9/hp-timing.c +++ b/sysdeps/sparc/sparc32/sparcv9/hp-timing.c @@ -8,23 +8,6 @@ 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/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile index 3ab013fb2f..6335984c7d 100644 --- a/sysdeps/sparc/sparc64/Makefile +++ b/sysdeps/sparc/sparc64/Makefile @@ -3,5 +3,5 @@ long-double-fcts = yes ifeq ($(subdir),csu) sysdep_routines += hp-timing -static-only-routines += hp-timing +elide-routines.os += hp-timing endif diff --git a/sysdeps/sparc/sparc64/hp-timing.c b/sysdeps/sparc/sparc64/hp-timing.c index ba52221202..8f9f86b895 100644 --- a/sysdeps/sparc/sparc64/hp-timing.c +++ b/sysdeps/sparc/sparc64/hp-timing.c @@ -8,23 +8,6 @@ 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/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index 3b8328ad2a..65b7aa94ce 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -3,7 +3,7 @@ long-double-fcts = yes ifeq ($(subdir),csu) sysdep_routines += hp-timing -static-only-routines += hp-timing +elide-routines.os += hp-timing endif ifeq ($(subdir),gmon) -- cgit v1.2.3