Update.

2004-04-17  Ulrich Drepper  <drepper@redhat.com>

	* locales/kk_KZ: New file.
	* charmaps/PT154: New file.
	* charmaps/RK1048: New file.

	* locales/af_ZA: Make sure yesexpr and noexpr regex
	* locales/ar_TN: Likewise.
	* locales/ar_YE: Likewise.
	* locales/bn_BD: Likewise.
	* locales/br_FR: Likewise.
	* locales/ca_ES: Likewise.
	* locales/cy_GB: Likewise.
	* locales/gd_GB: Likewise.
	* locales/gv_GB: Likewise.
	* locales/hy_AM: Likewise.
	* locales/id_ID: Likewise.
	* locales/ka_GE: Likewise.
	* locales/kw_GB: Likewise.
	* locales/lg_UG: Likewise.
	* locales/mk_MK: Likewise.
	* locales/oc_FR: Likewise.
	* locales/ru_UA: Likewise.
	* locales/sk_SK: Likewise.
	* locales/sr_YU: Likewise.
	* locales/sr_YU@cyrillic: Likewise.
	* locales/uk_UA: Likewise.
	* locales/ur_PK: Likewise.
	* locales/wa_BE: Likewise.
	* locales/fa_IR: Fix yesexpr and noexpr.

3 files changed, 5 insertions, 108 deletions

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b0eea29d94..4d07dac5ee 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-16  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysv/linux/sh/pthread_cond_wait.S: Remove unneeded frame info.
+	* sysv/linux/sh/pthread_cond_timedwait.S: Likewise.
+
 2004-04-15  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/timer_routines.c: Include errno.h.
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
index 661caa3fb5..ab3bbe035a 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
@@ -264,22 +264,14 @@ __pthread_cond_timedwait:
 
 18:	
 	add	#64, r15
-.Lfree:	
 	lds.l	@r15+, pr
-.Lpop_pr:
 	mov.l	@r15+, r13
-.Lpop_r13:
 	mov.l	@r15+, r12
-.Lpop_r12:
 	mov.l	@r15+, r11
-.Lpop_r11:
 	mov.l	@r15+, r10
-.Lpop_r10:
 	mov.l	@r15+, r9
-.Lpop_r9:
 	rts
 	 mov.l	@r15+, r8
-.Lpop_r8:
 
 .L1k:
 	.word	1000
@@ -296,7 +288,6 @@ __pthread_cond_timedwait:
 	.long	1000000000
 
 1:
-.LSblSTART:
 	/* Initial locking failed.  */
 	mov	r8, r5
 #if cond_lock != 0
@@ -370,7 +361,6 @@ __pthread_cond_timedwait:
 17:
 	bra	18b
 	 mov.l	@(24,r15), r0
-.LSblEND:
 
 	.align	2
 .Lmwait2:
@@ -604,53 +594,6 @@ __condvar_tw_cleanup:
 	.ualong	.Lalloc-.Lpush_pr
 	.byte	0xe
 	.uleb128 92
-	.byte	0x4
-	.ualong	.Lfree-.Lalloc
-	.byte	0xe
-	.uleb128 28
-	.byte	0x4
-	.ualong	.Lpop_pr-.Lfree
-	.byte	0xe
-	.uleb128 24
-	.byte	0xd1
-	.byte	0x4
-	.ualong	.Lpop_r13-.Lpop_pr
-	.byte	0xe
-	.uleb128 20
-	.byte	0xcd
-	.byte	0x4
-	.ualong	.Lpop_r12-.Lpop_r13
-	.byte	0xe
-	.uleb128 16
-	.byte	0xcc
-	.byte	0x4
-	.ualong	.Lpop_r11-.Lpop_r12
-	.byte	0xe
-	.uleb128 12
-	.byte	0xcb
-	.byte	0x4
-	.ualong	.Lpop_r10-.Lpop_r11
-	.byte	0xe
-	.uleb128 8
-	.byte	0xca
-	.byte	0x4
-	.ualong	.Lpop_r9-.Lpop_r10
-	.byte	0xe
-	.uleb128 4
-	.byte	0xc9
-	.byte	0x4
-	.ualong	.Lpop_r8-.Lpop_r9
-	.byte	0xe
-	.uleb128 0
-	.byte	0xc8
-	.byte	0x4
-	.ualong	.LSblSTART-.Lpop_r8
-	.byte	0xe
-	.uleb128 72
-	.byte	0x4
-	.ualong	.LSblEND-.LSblSTART
-	.byte	0xe
-	.uleb128 72
 	.align	2
 .LENDFDE:
 
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
index 01b906eeed..c93a304363 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
@@ -196,20 +196,13 @@ __pthread_cond_wait:
 
 14:
 	add	#48, r15
-.Lfree:	
 	lds.l	@r15+, pr
-.Lpop_pr:
 	mov.l	@r15+, r12
-.Lpop_r12:
 	mov.l	@r15+, r11
-.Lpop_r11:
 	mov.l	@r15+, r10
-.Lpop_r10:
 	mov.l	@r15+, r9
-.Lpop_r9:
 	rts
 	 mov.l	@r15+, r8
-.Lpop_r8:
 
 	.align	2
 .Lmunlock0:
@@ -222,7 +215,6 @@ __pthread_cond_wait:
 	.long	__pthread_mutex_cond_lock-.Lmlocki0b
 
 1:
-.LSblSTART:
 	/* Initial locking failed.  */
 	mov	r8, r5
 #if cond_lock != 0
@@ -296,7 +288,6 @@ __pthread_cond_wait:
 13:
 	bra	14b
 	 mov.l	@(12,r15), r0
-.LSblEND:
 
 	.align	2
 .Lmwait0:
@@ -524,48 +515,6 @@ __condvar_w_cleanup:
 	.ualong	.Lalloc-.Lpush_pr
 	.byte	0xe
 	.uleb128 72
-	.byte	0x4
-	.ualong	.Lfree-.Lalloc
-	.byte	0xe
-	.uleb128 24
-	.byte	0x4
-	.ualong	.Lpop_pr-.Lfree
-	.byte	0xe
-	.uleb128 20
-	.byte	0xd1
-	.byte	0x4
-	.ualong	.Lpop_r12-.Lpop_pr
-	.byte	0xe
-	.uleb128 16
-	.byte	0xcc
-	.byte	0x4
-	.ualong	.Lpop_r11-.Lpop_r12
-	.byte	0xe
-	.uleb128 12
-	.byte	0xcb
-	.byte	0x4
-	.ualong	.Lpop_r10-.Lpop_r11
-	.byte	0xe
-	.uleb128 8
-	.byte	0xca
-	.byte	0x4
-	.ualong	.Lpop_r9-.Lpop_r10
-	.byte	0xe
-	.uleb128 4
-	.byte	0xc9
-	.byte	0x4
-	.ualong	.Lpop_r8-.Lpop_r9
-	.byte	0xe
-	.uleb128 0
-	.byte	0xc8
-	.byte	0x4
-	.ualong	.LSblSTART-.Lpop_r8
-	.byte	0xe
-	.uleb128 72
-	.byte	0x4
-	.ualong	.LSblEND-.LSblSTART
-	.byte	0xe
-	.uleb128 72
 	.align	2
 .LENDFDE: