diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-07-31 15:30:38 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-07-31 15:30:38 +0000 |
| commit | dd3105b347f432016fcdc1abd472c3717f557c9e (patch) | |
| tree | cbaaecdaa1d3ad240177c9040f7f46c1387716ce /libc/nptl/sysdeps | |
| parent | 20f73aac36c2b2c240dcc379d5117488fe44960c (diff) | |
| download | eglibc2-dd3105b347f432016fcdc1abd472c3717f557c9e.tar.gz | |
Merge changes between r19464 and r19920 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@19921 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl/sysdeps')
| -rw-r--r-- | libc/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S | 3 | ||||
| -rw-r--r-- | libc/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 5 | ||||
| -rw-r--r-- | libc/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/libc/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S b/libc/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S index 7abc325b7..03e4b8ea5 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S +++ b/libc/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc. +/* Copyright (C) 1999-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Schwab <schwab@gnu.org>. @@ -60,7 +60,6 @@ ENTRY (__vfork) cmpl $-4095, %eax jae SYSCALL_ERROR_LABEL /* Branch forward if it failed. */ -.Lpseudo_end: ret PSEUDO_END (__vfork) diff --git a/libc/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/libc/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index 1856d61d5..7ad822692 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/libc/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -48,8 +48,7 @@ POPCARGS_##args; \ POPSTATE_##args \ cmpl $-4095, %eax; \ - jae SYSCALL_ERROR_LABEL; \ - L(pseudo_end): + jae SYSCALL_ERROR_LABEL # define SAVE_OLDTYPE_0 movl %eax, %ecx; # define SAVE_OLDTYPE_1 SAVE_OLDTYPE_0 diff --git a/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h index 304905061..d1725bb75 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h +++ b/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -56,8 +56,7 @@ movq %rdx, %rax; \ addq $8,%rsp; cfi_adjust_cfa_offset (-8); \ cmpq $-4095, %rax; \ - jae SYSCALL_ERROR_LABEL; \ - L(pseudo_end): + jae SYSCALL_ERROR_LABEL # ifdef IS_IN_libpthread |