(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

[thirdparty/glibc.git] / nptl / sysdeps / unix / sysv / linux / sh / lowlevellock.S

diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index ac3169889fcc125a5ec499ca7a180fc9e580f8f1..bcb15615e5de3ef2d96a14c1cc4ec68a9c98910d 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 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
@@ -32,11 +32,8 @@
        .type   __lll_mutex_lock_wait,@function
        .hidden __lll_mutex_lock_wait
        .align  5
-       cfi_startproc
 __lll_mutex_lock_wait:
        mov.l   r8, @-r15
-       cfi_adjust_cfa_offset(4)
-       cfi_rel_offset (r8, 0)
        mov     r4, r6
        mov     r5, r8
        mov     #0, r7          /* No timeout.  */
@@ -54,15 +51,14 @@ __lll_mutex_lock_wait:
        SYSCALL_INST_PAD
 
 2:
-       mov     #2, r6
-       XCHG (r6, @r8, r2)
+       mov     #2, r4
+       XCHG (r4, @r8, r2)
        tst     r2, r2
        bf      1b
 
        mov.l   @r15+, r8
        ret
         mov    r2, r0
-       cfi_endproc
        .size   __lll_mutex_lock_wait,.-__lll_mutex_lock_wait
 
 
@@ -71,7 +67,6 @@ __lll_mutex_lock_wait:
        .type   __lll_mutex_timedlock_wait,@function
        .hidden __lll_mutex_timedlock_wait
        .align  5
-       cfi_startproc
 __lll_mutex_timedlock_wait:
        /* Check for a valid timeout value.  */
        mov.l   @(4,r6), r1
@@ -80,21 +75,14 @@ __lll_mutex_timedlock_wait:
        bt      3f
 
        mov.l   r10, @-r15
-       cfi_adjust_cfa_offset(4)
-       cfi_rel_offset (r10, 0)
        mov.l   r9, @-r15
-       cfi_adjust_cfa_offset(4)
-       cfi_rel_offset (r9, 0)
        mov.l   r8, @-r15
-       cfi_adjust_cfa_offset(4)
-       cfi_rel_offset (r8, 0)
        mov     r4, r10
        mov     r6, r9
        mov     r5, r8
 
        /* Stack frame for the timespec and timeval structs.  */
        add     #-8, r15
-       cfi_adjust_cfa_offset(8)
 
 1:
        /* Get current time.  */
@@ -174,7 +162,6 @@ __lll_mutex_timedlock_wait:
 5:
        bra     6b
         mov    #ETIMEDOUT, r0
-       cfi_endproc
 
 .L1k:
        .word   1000
@@ -191,7 +178,6 @@ __lll_mutex_timedlock_wait:
        .type   lll_unlock_wake_cb,@function
        .hidden lll_unlock_wake_cb
        .align  5
-       cfi_startproc
 lll_unlock_wake_cb:
        DEC     (@r4, r2)
        tst     r2, r2
@@ -209,7 +195,6 @@ lll_unlock_wake_cb:
 1:     
        rts
         nop
-       cfi_endproc
        .size   lll_unlock_wake_cb,.-lll_unlock_wake_cb
 #endif
 
@@ -218,7 +203,6 @@ lll_unlock_wake_cb:
        .type   __lll_mutex_unlock_wake,@function
        .hidden __lll_mutex_unlock_wake
        .align  5
-       cfi_startproc
 __lll_mutex_unlock_wake:
        mov     #FUTEX_WAKE, r5
        mov     #1, r6          /* Wake one thread.  */
@@ -230,7 +214,6 @@ __lll_mutex_unlock_wake:
        SYSCALL_INST_PAD
        rts
         nop
-       cfi_endproc
        .size   __lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake
 
 
@@ -239,20 +222,14 @@ __lll_mutex_unlock_wake:
        .type   __lll_timedwait_tid,@function
        .hidden __lll_timedwait_tid
        .align  5
-       cfi_startproc
 __lll_timedwait_tid:
        mov.l   r9, @-r15
-       cfi_adjust_cfa_offset(4)
-       cfi_rel_offset (r9, 0)
        mov.l   r8, @-r15
-       cfi_adjust_cfa_offset(4)
-       cfi_rel_offset (r8, 0)
        mov     r4, r8
        mov     r5, r9
 
        /* Stack frame for the timespec and timeval structs.  */
        add     #-8, r15
-       cfi_adjust_cfa_offset(8)
 
 2:
        /* Get current time.  */
@@ -315,7 +292,6 @@ __lll_timedwait_tid:
 6:
        bra     3b
         mov    #ETIMEDOUT, r0
-       cfi_endproc
 
 .L1k2:
        .word   1000