summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog16
-rw-r--r--localedata/ChangeLog5
-rw-r--r--localedata/locales/fa_IR47
-rw-r--r--sysdeps/powerpc/powerpc32/bsd-_setjmp.S2
-rw-r--r--sysdeps/powerpc/powerpc32/bsd-setjmp.S8
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/__longjmp.S3
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/setjmp.S3
-rw-r--r--sysdeps/powerpc/powerpc64/bsd-_setjmp.S2
-rw-r--r--sysdeps/powerpc/powerpc64/bsd-setjmp.S8
-rw-r--r--sysdeps/powerpc/sigjmp.c2
-rw-r--r--sysdeps/x86_64/hp-timing.h5
11 files changed, 62 insertions, 39 deletions
diff --git a/ChangeLog b/ChangeLog
index 01c6be675e..228b876b32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2004-03-17 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/x86_64/hp-timing.h (HP_TIMING_NOW): Make asm volatile.
+
+2004-03-16 Jakub Jelinek <jakub@redhat.com>
+
+ * 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.
+
2004-03-16 Ulrich Drepper <drepper@redhat.com>
* include/ctype.h: For libc, define isdigit, isdigit_l, and
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index e0cf9bd308..569a13cdf4 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-17 Ulrich Drepper <drepper@redhat.com>
+
+ * localedata/locales/fa_IR: Fix yesexpr and noexpr.
+ Patch by Hamed Malek <hamed@bamdad.org>.
+
2004-02-16 Ulrich Drepper <drepper@redhat.com>
* locales/tr_TR: Correct sorting order of the normal and dotless I
diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR
index e95f9807de..128c5d8cdc 100644
--- a/localedata/locales/fa_IR
+++ b/localedata/locales/fa_IR
@@ -2,17 +2,16 @@ comment_char %
escape_char /
%
% Persian Language Locale for Iran with UTF-8 character set
-% Source: The FarsiWeb Project
-% Address: Computing Center, Sharif University of Technology
-% Azadi Ave, Tehran, Iran
+% Source: Sharif FarsiWeb, Inc.
+% Address: 5, Shahid Ghasemi Habibollah, Azadi Ave, Tehran, Iran
% Contact: Roozbeh Pournader
-% Email: roozbeh@sharif.edu
+% Email: roozbeh@farsiweb.info
% Tel: +98 21 6022372
% Fax: +98 21 6019568
% Language: fa
% Territory: IR
-% Revision: 2.2
-% Date: 2002-07-29
+% Revision: 2.3
+% Date: 2004-03-16
% Users: general
% Repertoiremap:
% Charset: UTF-8
@@ -21,28 +20,28 @@ escape_char /
LC_IDENTIFICATION
title "Persian locale for Iran"
-source "The FarsiWeb Project"
-address "Computing Center, Sharif University of Technology, Azadi Ave, Tehran, Iran"
+source "Sharif FarsiWeb, Inc."
+address "5, Shahid Ghasemi Habibollah, Azadi Ave, Tehran, Iran"
contact "Roozbeh Pournader"
-email "roozbeh@sharif.edu"
+email "roozbeh@farsiweb.info"
tel "+98 21 6022372"
fax "+98 21 6019568"
language "Persian"
territory "Iran"
-revision "2.2"
-date "2002-07-29"
+revision "2.3"
+date "2004-03-16"
%
-category "fa_IR:2002";LC_IDENTIFICATION
-category "fa_IR:2002";LC_CTYPE
-category "fa_IR:2002";LC_COLLATE
-category "fa_IR:2002";LC_TIME
-category "fa_IR:2002";LC_NUMERIC
-category "fa_IR:2002";LC_MONETARY
-category "fa_IR:2002";LC_MESSAGES
-category "fa_IR:2002";LC_PAPER
-category "fa_IR:2002";LC_NAME
-category "fa_IR:2002";LC_ADDRESS
-category "fa_IR:2002";LC_TELEPHONE
+category "fa_IR:2004";LC_IDENTIFICATION
+category "fa_IR:2004";LC_CTYPE
+category "fa_IR:2004";LC_COLLATE
+category "fa_IR:2004";LC_TIME
+category "fa_IR:2004";LC_NUMERIC
+category "fa_IR:2004";LC_MONETARY
+category "fa_IR:2004";LC_MESSAGES
+category "fa_IR:2004";LC_PAPER
+category "fa_IR:2004";LC_NAME
+category "fa_IR:2004";LC_ADDRESS
+category "fa_IR:2004";LC_TELEPHONE
END LC_IDENTIFICATION
@@ -326,8 +325,8 @@ cal_direction 3
END LC_TIME
LC_MESSAGES
-yesexpr "<U005B><U0079><U0059><U0628><U0066><U005D><U002E><U002A>"
-noexpr "<U005B><U006E><U004E><U062E><U0646><U006F><U005D><U002E><U002A>"
+yesexpr "<U005E><U005B><U0079><U0059><U0628><U0066><U005D><U002E><U002A>"
+noexpr "<U005E><U005B><U006E><U004E><U062E><U0646><U006F><U005D><U002E><U002A>"
END LC_MESSAGES
LC_PAPER
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 <bp-sym.h>
#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 <shlib-compat.h>
#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 <shlib-compat.h>
#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 <bp-sym.h>
#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. */