~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc.
 
1
/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
2
2
   This file is part of the GNU C Library.
3
3
   Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
4
4
 
56
56
    movq %rdx, %rax;                                                          \
57
57
    addq $8,%rsp; cfi_adjust_cfa_offset (-8);                                 \
58
58
    cmpq $-4095, %rax;                                                        \
59
 
    jae SYSCALL_ERROR_LABEL;                                                  \
60
 
  L(pseudo_end):
 
59
    jae SYSCALL_ERROR_LABEL
61
60
 
62
61
 
63
62
# ifdef IS_IN_libpthread