Add CFI directives to x86-64 pthread_rwlock_{rd,wr)lock.

(cherry picked from commit 1bc2b97ee42dd653890657a4c910bd144247ea11)

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2caceeb1d31a6f7ccdff2d83b205d220998256c1..cdd8bd3a46609dbe4630a857738ae9bd6930cdb7 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-10  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S: Add CFI
+       directives.
+       * sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S: Likewise.
+
 2009-07-27  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #10418]

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
index 80fedd4ab11a741ecf189fa026eb5a015641c9ed..35eb09cd0cdfcc92cc1a9a6b76cd5d2d8e9df3c0 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -30,6 +30,7 @@
        .type   __pthread_rwlock_rdlock,@function
        .align  16
 __pthread_rwlock_rdlock:
+       cfi_startproc
        xorq    %r10, %r10
 
        /* Get the lock.  */
@@ -167,6 +168,7 @@ __pthread_rwlock_rdlock:
        subq    $MUTEX, %rdi
 #endif
        jmp     13b
+       cfi_endproc
        .size   __pthread_rwlock_rdlock,.-__pthread_rwlock_rdlock
 
        .globl  pthread_rwlock_rdlock

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
index 209c0e9a9492f2fac0c7bf7ea36ede4a2e8cfeb6..be6b8d8e2016582d7fba334b4d4b89f1e5080d04 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -30,6 +30,7 @@
        .type   __pthread_rwlock_wrlock,@function
        .align  16
 __pthread_rwlock_wrlock:
+       cfi_startproc
        xorq    %r10, %r10
 
        /* Get the lock.  */
@@ -155,6 +156,7 @@ __pthread_rwlock_wrlock:
        subq    $MUTEX, %rdi
 #endif
        jmp     13b
+       cfi_endproc
        .size   __pthread_rwlock_wrlock,.-__pthread_rwlock_wrlock
 
        .globl  pthread_rwlock_wrlock