Update copyright notices with scripts/update-copyrights

[thirdparty/glibc.git] / nptl / sysdeps / unix / sysv / linux / x86_64 / cancellation.S

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
index d7c7e80cef22fd8b60ad46abd6574d80bb48f137..89fda5efeba174d58620b1795e3aa9943b608144 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2009.
 
@@ -22,7 +22,7 @@
 #include "lowlevellock.h"
 
 #ifdef IS_IN_libpthread
-# ifdef SHARED
+# if defined SHARED && !defined NO_HIDDEN
 #  define __pthread_unwind __GI___pthread_unwind
 # endif
 #else
@@ -72,10 +72,10 @@ ENTRY(__pthread_enable_asynccancel)
 
 3:     subq    $8, %rsp
        cfi_adjust_cfa_offset(8)
-       movq    $TCB_PTHREAD_CANCELED, %fs:RESULT
+       LP_OP(mov) $TCB_PTHREAD_CANCELED, %fs:RESULT
        lock
        orl     $TCB_EXITING_BITMASK, %fs:CANCELHANDLING
-       movq    %fs:CLEANUP_JMP_BUF, %rdi
+       mov     %fs:CLEANUP_JMP_BUF, %RDI_LP
 #ifdef SHARED
        call    __pthread_unwind@PLT
 #else
@@ -106,7 +106,7 @@ ENTRY(__pthread_disable_asynccancel)
        /* Performance doesn't matter in this loop.  We will
           delay until the thread is canceled.  And we will unlikely
           enter the loop twice.  */
-4:     movq    %fs:0, %rdi
+4:     mov     %fs:0, %RDI_LP
        movl    $__NR_futex, %eax
        xorq    %r10, %r10
        addq    $CANCELHANDLING, %rdi