← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nptl/pthread_cancel.c

  • 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
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* 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:
nptl/pthread_cancel.c
1
 
/* Copyright (C) 2002, 2003, 2004, 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 Ulrich Drepper <drepper@redhat.com>, 2002.
4
4
 
75
75
             a signal handler.  But this is no allowed, pthread_cancel
76
76
             is not guaranteed to be async-safe.  */
77
77
          int val;
78
 
#if __ASSUME_TGKILL
79
 
          val = INTERNAL_SYSCALL (tgkill, err, 3,
80
 
                                  THREAD_GETMEM (THREAD_SELF, pid), pd->tid,
81
 
                                  SIGCANCEL);
82
 
#else
83
 
# ifdef __NR_tgkill
84
 
          val = INTERNAL_SYSCALL (tgkill, err, 3,
85
 
                                  THREAD_GETMEM (THREAD_SELF, pid), pd->tid,
86
 
                                  SIGCANCEL);
87
 
          if (INTERNAL_SYSCALL_ERROR_P (val, err)
88
 
              && INTERNAL_SYSCALL_ERRNO (val, err) == ENOSYS)
89
 
# endif
90
 
            val = INTERNAL_SYSCALL (tkill, err, 2, pd->tid, SIGCANCEL);
91
 
#endif
 
78
          val = INTERNAL_SYSCALL (tgkill, err, 3,
 
79
                                  THREAD_GETMEM (THREAD_SELF, pid), pd->tid,
 
80
                                  SIGCANCEL);
92
81
 
93
82
          if (INTERNAL_SYSCALL_ERROR_P (val, err))
94
83
            result = INTERNAL_SYSCALL_ERRNO (val, err);