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. --- sysdeps/sparc/sparc32/sparcv9/Makefile | 2 +- sysdeps/sparc/sparc32/sparcv9/hp-timing.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) (limited to 'sysdeps/sparc/sparc32') 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 -- cgit 1.4.1