From cabd81c0f715bad0b015572895a6ebfcc5d420ce Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 17 Mar 2004 17:30:06 +0000 Subject: Update. 2004-03-17 Jakub Jelinek * sysdeps/x86_64/hp-timing.h (HP_TIMING_NOW): Make asm volatile. 2004-03-16 Jakub Jelinek * sysdeps/powerpc/powerpc32/fpu/__longjmp.S: Spelling. (JB_SIZE): Undefine before including __longjmp-common.S again. * sysdeps/powerpc/powerpc32/fpu/setjmp.S: Spelling. (JB_SIZE): Undefine before including setjmp-common.S again. * sysdeps/powerpc/powerpc64/bsd-_setjmp.S: Spelling. * sysdeps/powerpc/powerpc64/bsd-setjmp.S: Spelling. * sysdeps/powerpc/powerpc32/bsd-_setjmp.S: Spelling. * sysdeps/powerpc/powerpc32/bsd-setjmp.S: Spelling. * sysdeps/powerpc/sigjmp.c: Spelling. --- sysdeps/powerpc/powerpc32/bsd-_setjmp.S | 2 +- sysdeps/powerpc/powerpc32/bsd-setjmp.S | 8 ++++---- sysdeps/powerpc/powerpc32/fpu/__longjmp.S | 3 ++- sysdeps/powerpc/powerpc32/fpu/setjmp.S | 3 ++- sysdeps/powerpc/powerpc64/bsd-_setjmp.S | 2 +- sysdeps/powerpc/powerpc64/bsd-setjmp.S | 8 ++++---- sysdeps/powerpc/sigjmp.c | 2 +- sysdeps/x86_64/hp-timing.h | 5 +++-- 8 files changed, 18 insertions(+), 15 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S index 458f52c4cb..50deda8c90 100644 --- a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S +++ b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S @@ -23,7 +23,7 @@ #include #if defined NOT_IN_libc -/* Build a none versioned object for rtld-*. */ +/* Build a non-versioned object for rtld-*. */ ENTRY (BP_SYM (_setjmp)) li r4,0 /* Set second argument to 0. */ b JUMPTARGET(BP_SYM (__sigsetjmp)) diff --git a/sysdeps/powerpc/powerpc32/bsd-setjmp.S b/sysdeps/powerpc/powerpc32/bsd-setjmp.S index af2fdc25bc..f40785624a 100644 --- a/sysdeps/powerpc/powerpc32/bsd-setjmp.S +++ b/sysdeps/powerpc/powerpc32/bsd-setjmp.S @@ -24,10 +24,10 @@ #if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) -/* We need 2 copies of identicatal code for the setjmp's as gas complains - erronously about having multiple versions of setjmp this eliminates the - need for the strong alias of __setjmp to setjmp which - does not support versioning i.e. another gas unimplemented feature. */ +/* We need 2 copies of identical code for the setjmp's as gas complains + erroneously about having multiple versions of setjmp. This eliminates the + need for the strong alias of __setjmp to setjmp which + does not support versioning, i.e. another gas unimplemented feature. */ symbol_version (__novmx__setjmp,__setjmp,GLIBC_2.0) symbol_version (__novmxsetjmp,setjmp,GLIBC_2.0) diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S index c43483561a..161bf213c1 100644 --- a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S +++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S @@ -22,7 +22,7 @@ #include #if defined NOT_IN_libc -/* Build a none versioned object for rtld-*. */ +/* Build a non-versioned object for rtld-*. */ # include "__longjmp-common.S" #else /* !NOT_IN_libc */ @@ -33,6 +33,7 @@ default_symbol_version (__vmx__longjmp,__longjmp,GLIBC_2.3.4); # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) # define __NO_VMX__ +# undef JB_SIZE symbol_version (__novmx__longjmp,__longjmp,GLIBC_2.0); # undef __longjmp # define __longjmp __novmx__longjmp diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp.S b/sysdeps/powerpc/powerpc32/fpu/setjmp.S index 6012bf2166..139611a9b2 100644 --- a/sysdeps/powerpc/powerpc32/fpu/setjmp.S +++ b/sysdeps/powerpc/powerpc32/fpu/setjmp.S @@ -22,7 +22,7 @@ #include #if defined NOT_IN_libc -/* Build a none versioned object for rtld-*. */ +/* Build a non-versioned object for rtld-*. */ # include "setjmp-common.S" #else /* !NOT_IN_libc */ @@ -36,6 +36,7 @@ default_symbol_version (__vmx__sigsetjmp,__sigsetjmp,GLIBC_2.3.4) # define __NO_VMX__ # undef __sigsetjmp # undef __sigjmp_save +# undef JB_SIZE symbol_version (__novmx__sigsetjmp,__sigsetjmp,GLIBC_2.0) # define __sigsetjmp __novmx__sigsetjmp # define __sigjmp_save __novmx__sigjmp_save diff --git a/sysdeps/powerpc/powerpc64/bsd-_setjmp.S b/sysdeps/powerpc/powerpc64/bsd-_setjmp.S index 1b15fedd64..e4428ecff7 100644 --- a/sysdeps/powerpc/powerpc64/bsd-_setjmp.S +++ b/sysdeps/powerpc/powerpc64/bsd-_setjmp.S @@ -23,7 +23,7 @@ #include #if defined NOT_IN_libc -/* Build a none versioned object for rtld-*. */ +/* Build a non-versioned object for rtld-*. */ ENTRY (BP_SYM (_setjmp)) li r4,0 /* Set second argument to 0. */ b JUMPTARGET(BP_SYM (__sigsetjmp)) diff --git a/sysdeps/powerpc/powerpc64/bsd-setjmp.S b/sysdeps/powerpc/powerpc64/bsd-setjmp.S index e83fe53a92..2eb191a46b 100644 --- a/sysdeps/powerpc/powerpc64/bsd-setjmp.S +++ b/sysdeps/powerpc/powerpc64/bsd-setjmp.S @@ -23,10 +23,10 @@ #if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) -/* We need 2 copies of identicatal code for the setjmp's as gas complains - erronously about having multiple versions of setjmp this eliminates the - need for the strong alias of __setjmp to setjmp which - does not support versioning i.e. another gas unimplemented feature. */ +/* We need 2 copies of identical code for the setjmp's as gas complains + erroneously about having multiple versions of setjmp. This eliminates the + need for the strong alias of __setjmp to setjmp which + does not support versioning, i.e. another gas unimplemented feature. */ symbol_version (__novmx__setjmp,__setjmp,GLIBC_2.3) symbol_version (__novmxsetjmp,setjmp,GLIBC_2.3) diff --git a/sysdeps/powerpc/sigjmp.c b/sysdeps/powerpc/sigjmp.c index de8a6cea8f..28cbf6b065 100644 --- a/sysdeps/powerpc/sigjmp.c +++ b/sysdeps/powerpc/sigjmp.c @@ -38,7 +38,7 @@ __vmx__sigjmp_save (sigjmp_buf env, int savemask) } #if defined NOT_IN_libc -/* Build a none versioned object for rtld-*. */ +/* Build a non-versioned object for rtld-*. */ strong_alias (__vmx__sigjmp_save,__sigjmp_save) #else /* Build a versioned object for libc. */ diff --git a/sysdeps/x86_64/hp-timing.h b/sysdeps/x86_64/hp-timing.h index 5738039fa4..e015ff79db 100644 --- a/sysdeps/x86_64/hp-timing.h +++ b/sysdeps/x86_64/hp-timing.h @@ -1,5 +1,5 @@ /* High precision, low overhead timing functions. x86-64 version. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,7 +25,8 @@ /* The "=A" constraint used in 32-bit mode does not work in 64-bit mode. */ # undef HP_TIMING_NOW # define HP_TIMING_NOW(Var) \ - ({ unsigned int _hi, _lo; asm ("rdtsc" : "=a" (_lo), "=d" (_hi)); \ + ({ unsigned int _hi, _lo; \ + asm volatile ("rdtsc" : "=a" (_lo), "=d" (_hi)); \ (Var) = ((unsigned long long int) _hi << 32) | _lo; }) /* The funny business for 32-bit mode is not required here. */ -- cgit 1.4.1