Merge changes between r23217 and r23296 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@23297 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 14 insertions, 14 deletions

diff --git a/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S b/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
index 6859de57d..c56b8b1be 100644
--- a/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
+++ b/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
@@ -86,7 +86,7 @@ __pthread_cond_wait:
 	.long	_GLOBAL_OFFSET_TABLE_
 #endif
 
-2:	
+2:
 	/* Store the reference to the mutex.  If there is already a
 	   different value in there this is a bad user bug.  */
 	mov.l	@(dep_mutex,r8),r0
@@ -94,7 +94,7 @@ __pthread_cond_wait:
 	bt	15f
 	mov.l	r9, @(dep_mutex,r8)
 
-15:	
+15:
 	/* Unlock the mutex.  */
 	mov.l	.Lmunlock0, r1
 	mov	#0, r5
@@ -167,7 +167,7 @@ __pthread_cond_wait:
 	mov	#FUTEX_WAIT, r0
 	or	r0, r5
 #endif
-99:	
+99:
 	mov.l	@(8,r15), r6
 	mov	r8, r4
 	add	#cond_futex, r4
@@ -179,7 +179,7 @@ __pthread_cond_wait:
 	mov.l	.Ldisable0, r1
 	bsrf	r1
 	 mov.l	@r15, r4
-.Ldisable0b:	
+.Ldisable0b:
 .LcleanupEND:
 
 	/* Lock.  */
@@ -260,7 +260,7 @@ __pthread_cond_wait:
 	mov	#FUTEX_WAKE, r0
 	or	r0, r5
 #endif
-99:	
+99:
 	mov	#1, r6
 	mov	#0, r7
 	mov	#SYS_futex, r3
@@ -333,7 +333,7 @@ __pthread_cond_wait:
 	bf/s	99f
 	 mov	#LLL_PRIVATE, r6
 	mov	#LLL_SHARED, r6
-99:	
+99:
 	extu.b	r6, r6
 	mov.l	.Lwait0, r1
 	bsrf	r1
@@ -352,7 +352,7 @@ __pthread_cond_wait:
 	bf/s	99f
 	 mov	#LLL_PRIVATE, r5
 	mov	#LLL_SHARED, r5
-99:	
+99:
 	mov.l	.Lwake0, r1
 	bsrf	r1
 	 extu.b	r5, r5
@@ -371,7 +371,7 @@ __pthread_cond_wait:
 	bf/s	99f
 	 mov	#LLL_PRIVATE, r6
 	mov	#LLL_SHARED, r6
-99:	
+99:
 	extu.b	r6, r6
 	mov.l	.Lwait1, r1
 	bsrf	r1
@@ -391,7 +391,7 @@ __pthread_cond_wait:
 	bf/s	99f
 	 mov	#LLL_PRIVATE, r5
 	mov	#LLL_SHARED, r5
-99:	
+99:
 	mov.l	.Lwake1, r1
 	bsrf	r1
 	 extu.b	r5, r5
@@ -419,7 +419,7 @@ __pthread_cond_wait:
 	bf/s	99f
 	 mov	#LLL_PRIVATE, r5
 	mov	#LLL_SHARED, r5
-99:	
+99:
 	mov.l	.Lwake2, r1
 	bsrf	r1
 	 extu.b	r5, r5
@@ -469,7 +469,7 @@ __condvar_w_cleanup:
 	bf/s	99f
 	 mov	#LLL_PRIVATE, r6
 	mov	#LLL_SHARED, r6
-99:	
+99:
 	extu.b	r6, r6
 	mov.l	.Lwait3, r1
 	bsrf	r1
@@ -557,7 +557,7 @@ __condvar_w_cleanup:
 	mov	#FUTEX_WAKE, r0
 	or	r0, r5
 #endif
-99:	
+99:
 	mov	#1, r6
 	mov	#0, r7
 	mov	#SYS_futex, r3
@@ -584,7 +584,7 @@ __condvar_w_cleanup:
 	bf/s	99f
 	 mov	#LLL_PRIVATE, r5
 	mov	#LLL_SHARED, r5
-99:	
+99:
 	mov.l	.Lwake3, r1
 	bsrf	r1
 	 extu.b	r5, r5
@@ -611,7 +611,7 @@ __condvar_w_cleanup:
 	mov	#FUTEX_WAKE, r0
 	or	r0, r5
 #endif
-99:	
+99:
 	mov	#-1, r6
 	shlr	r6		/* r6 = 0x7fffffff */
 	mov	#0, r7