diff options
| author | Roland McGrath <roland@gnu.org> | 2004-08-16 06:46:31 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-08-16 06:46:31 +0000 |
| commit | 813d9c0dd88261e538c56be2acf54f3dff2f369b (patch) | |
| tree | 4a937154fca2ac3eb8741274afdde63adcb98ede /sysdeps/ia64 | |
| parent | 92c6ccd1b2ce7955ba086894a0e080c991b113c3 (diff) | |
| download | glibc-813d9c0dd88261e538c56be2acf54f3dff2f369b.tar glibc-813d9c0dd88261e538c56be2acf54f3dff2f369b.tar.gz glibc-813d9c0dd88261e538c56be2acf54f3dff2f369b.tar.bz2 glibc-813d9c0dd88261e538c56be2acf54f3dff2f369b.zip | |
* 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.
Diffstat (limited to 'sysdeps/ia64')
| -rw-r--r-- | sysdeps/ia64/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/ia64/hp-timing.c | 17 |
2 files changed, 1 insertions, 18 deletions
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 |