This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-76-g842a39c
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Jul 2012 19:59:41 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-76-g842a39c
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 842a39cd1ad9391af7a63a19c87f66a730e027a9 (commit)
from 0c7936d5e938625b6fb88b421a5105f280660a8d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=842a39cd1ad9391af7a63a19c87f66a730e027a9
commit 842a39cd1ad9391af7a63a19c87f66a730e027a9
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Mon Jul 16 16:12:47 2012 +0200
Remove unused pseudo_end label
diff --git a/ChangeLog b/ChangeLog
index d4fce6d..aa7ce43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2012-07-25 Andreas Schwab <schwab@linux-m68k.org>
+
+ * sysdeps/unix/sysv/linux/i386/accept4.S: Remove pseudo_end label.
+ * sysdeps/unix/sysv/linux/i386/call_sync_file_range.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/epoll_pwait.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/getcontext.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/mmap.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/mmap64.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/semtimedop.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/setcontext.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/socket.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/swapcontext.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/syscall.S: Likewise.
+ * sysdeps/unix/sysv/linux/i386/sysdep.h (PSEUDO): Likewise.
+ * sysdeps/unix/sysv/linux/i386/vfork.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/getcontext.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/setcontext.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/syscall.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/sysdep.h (PSEUDO): Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/swapcontext.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/vfork.S: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S: Likewise.
+
2012-07-25 Florian Weimer <fweimer@redhat.com>
* Versions.def: Add GLIBC_2.17.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 71f8e95..2f38bcc 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-25 Andreas Schwab <schwab@linux-m68k.org>
+
+ * sysdeps/unix/sysv/linux/i386/pt-vfork.S: Remove pseudo_end
+ label.
+ * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (PSEUDO): Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h (PSEUDO):
+ Likewise.
+
2012-07-25 Siddhesh Poyarekar <siddhesh@redhat.com>
* tst-pthread-getattr.c: Revert last change.
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S
index 7abc325..03e4b8e 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S
+++ b/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/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index 1856d61..7ad8226 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/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/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
index 3049050..d1725bb 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
+++ b/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
diff --git a/sysdeps/unix/sysv/linux/i386/accept4.S b/sysdeps/unix/sysv/linux/i386/accept4.S
index 7282155..7fa5493 100644
--- a/sysdeps/unix/sysv/linux/i386/accept4.S
+++ b/sysdeps/unix/sysv/linux/i386/accept4.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1998,2002,2003,2005, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -67,7 +67,6 @@ ENTRY (__libc_accept4)
jae errlabel
/* Successful; return the syscall's value. */
-L(pseudo_end):
ret
diff --git a/sysdeps/unix/sysv/linux/i386/call_sync_file_range.S b/sysdeps/unix/sysv/linux/i386/call_sync_file_range.S
index 077467c..b413bc7 100644
--- a/sysdeps/unix/sysv/linux/i386/call_sync_file_range.S
+++ b/sysdeps/unix/sysv/linux/i386/call_sync_file_range.S
@@ -1,5 +1,5 @@
/* Selective file content synch'ing.
- Copyright (C) 2006, 2007, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2006-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -66,6 +66,5 @@ ENTRY (__call_sync_file_range)
movl $-ENOSYS, %eax
jmp SYSCALL_ERROR_LABEL
#endif
-L(pseudo_end):
ret
PSEUDO_END (__call_sync_file_range)
diff --git a/sysdeps/unix/sysv/linux/i386/clone.S b/sysdeps/unix/sysv/linux/i386/clone.S
index 0603218..1aa2a1f 100644
--- a/sysdeps/unix/sysv/linux/i386/clone.S
+++ b/sysdeps/unix/sysv/linux/i386/clone.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000,02,03,04,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@tamu.edu)
@@ -115,7 +115,6 @@ ENTRY (BP_SYM (__clone))
jl SYSCALL_ERROR_LABEL
jz L(thread_start)
-L(pseudo_end):
ret
L(thread_start):
diff --git a/sysdeps/unix/sysv/linux/i386/epoll_pwait.S b/sysdeps/unix/sysv/linux/i386/epoll_pwait.S
index 1845914..aee115c 100644
--- a/sysdeps/unix/sysv/linux/i386/epoll_pwait.S
+++ b/sysdeps/unix/sysv/linux/i386/epoll_pwait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2007-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -74,6 +74,5 @@ ENTRY (epoll_pwait)
movl $-ENOSYS, %eax
jmp SYSCALL_ERROR_LABEL
#endif
-L(pseudo_end):
ret
PSEUDO_END (epoll_pwait)
diff --git a/sysdeps/unix/sysv/linux/i386/getcontext.S b/sysdeps/unix/sysv/linux/i386/getcontext.S
index 27dd476..4ba2f65 100644
--- a/sysdeps/unix/sysv/linux/i386/getcontext.S
+++ b/sysdeps/unix/sysv/linux/i386/getcontext.S
@@ -1,5 +1,5 @@
/* Save current context.
- Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
@@ -77,7 +77,6 @@ ENTRY(__getcontext)
/* All done, return 0 for success. */
xorl %eax, %eax
-L(pseudo_end):
ret
PSEUDO_END(__getcontext)
diff --git a/sysdeps/unix/sysv/linux/i386/mmap.S b/sysdeps/unix/sysv/linux/i386/mmap.S
index 7fc2f11..c8bf3e1 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap.S
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995,96,97,98,99,2000,2002,2005,2006
- Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -98,7 +97,6 @@ L(skip):
ja SYSCALL_ERROR_LABEL
/* Successful; return the syscall's value. */
-L(pseudo_end):
ret
PSEUDO_END (__mmap)
diff --git a/sysdeps/unix/sysv/linux/i386/mmap64.S b/sysdeps/unix/sysv/linux/i386/mmap64.S
index 72e216a..7599b85 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap64.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap64.S
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995,96,97,98,99,2000,2002,2005,2006
- Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -100,7 +99,6 @@ L(do_syscall):
ja SYSCALL_ERROR_LABEL
/* Successful; return the syscall's value. */
-L(pseudo_end):
ret
cfi_adjust_cfa_offset (16)
@@ -151,9 +149,6 @@ L(einval):
ja SYSCALL_ERROR_LABEL
/* Successful; return the syscall's value. */
-#ifndef __NR_mmap2
-L(pseudo_end):
-#endif
ret
cfi_register (ebx, edx)
diff --git a/sysdeps/unix/sysv/linux/i386/semtimedop.S b/sysdeps/unix/sysv/linux/i386/semtimedop.S
index 2e01bc8..785be2e 100644
--- a/sysdeps/unix/sysv/linux/i386/semtimedop.S
+++ b/sysdeps/unix/sysv/linux/i386/semtimedop.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -65,7 +65,6 @@ ENTRY (BP_SYM (semtimedop))
ja SYSCALL_ERROR_LABEL
/* Successful; return the syscall's value. */
-L(pseudo_end):
ret
#ifdef PIC
diff --git a/sysdeps/unix/sysv/linux/i386/setcontext.S b/sysdeps/unix/sysv/linux/i386/setcontext.S
index d5e10f6..a030d62 100644
--- a/sysdeps/unix/sysv/linux/i386/setcontext.S
+++ b/sysdeps/unix/sysv/linux/i386/setcontext.S
@@ -1,5 +1,5 @@
/* Install given context.
- Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
@@ -89,7 +89,6 @@ ENTRY(__setcontext)
/* The following 'ret' will pop the address of the code and jump
to it. */
-L(pseudo_end):
ret
PSEUDO_END(__setcontext)
diff --git a/sysdeps/unix/sysv/linux/i386/socket.S b/sysdeps/unix/sysv/linux/i386/socket.S
index c295407..c01ce7a 100644
--- a/sysdeps/unix/sysv/linux/i386/socket.S
+++ b/sysdeps/unix/sysv/linux/i386/socket.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1998,2002,2003,2005,2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -68,7 +68,6 @@ ENTRY (__socket)
jae SYSCALL_ERROR_LABEL
/* Successful; return the syscall's value. */
-L(pseudo_end):
ret
diff --git a/sysdeps/unix/sysv/linux/i386/swapcontext.S b/sysdeps/unix/sysv/linux/i386/swapcontext.S
index 3676b3f..7a6dfa1 100644
--- a/sysdeps/unix/sysv/linux/i386/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/i386/swapcontext.S
@@ -1,5 +1,5 @@
/* Save current context and install the given one.
- Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
@@ -103,8 +103,6 @@ ENTRY(__swapcontext)
/* The following 'ret' will pop the address of the code and jump
to it. */
-
-L(pseudo_end):
ret
PSEUDO_END(__swapcontext)
diff --git a/sysdeps/unix/sysv/linux/i386/syscall.S b/sysdeps/unix/sysv/linux/i386/syscall.S
index e3865d0..c37e7cb 100644
--- a/sysdeps/unix/sysv/linux/i386/syscall.S
+++ b/sysdeps/unix/sysv/linux/i386/syscall.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1998, 2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -30,7 +30,6 @@ ENTRY (syscall)
POPARGS_6 /* Restore register contents. */
cmpl $-4095, %eax /* Check %eax for error. */
jae SYSCALL_ERROR_LABEL /* Jump to error handler if error. */
-L(pseudo_end):
ret /* Return to caller. */
PSEUDO_END (syscall)
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 17b816d..18b41e3 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -1,5 +1,4 @@
-/* Copyright (C) 1992,1993,1995-2000,2002-2006,2007,2011-2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1992-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper, <drepper@gnu.org>, August 1995.
@@ -70,8 +69,7 @@
ENTRY (name) \
DO_CALL (syscall_name, args); \
cmpl $-4095, %eax; \
- jae SYSCALL_ERROR_LABEL; \
- L(pseudo_end):
+ jae SYSCALL_ERROR_LABEL
#undef PSEUDO_END
#define PSEUDO_END(name) \
diff --git a/sysdeps/unix/sysv/linux/i386/vfork.S b/sysdeps/unix/sysv/linux/i386/vfork.S
index 23e7fc7..a8a7e45 100644
--- a/sysdeps/unix/sysv/linux/i386/vfork.S
+++ b/sysdeps/unix/sysv/linux/i386/vfork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2002, 2004, 2005, 2008 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>.
@@ -57,7 +57,6 @@ ENTRY (__vfork)
/* Branch forward if it failed. */
# ifdef __ASSUME_VFORK_SYSCALL
jae SYSCALL_ERROR_LABEL
-.Lpseudo_end:
# else
jae .Lerror
# endif
@@ -79,7 +78,6 @@ ENTRY (__vfork)
int $0x80
cmpl $-4095, %eax
jae SYSCALL_ERROR_LABEL
-.Lpseudo_end:
ret
#endif
PSEUDO_END (__vfork)
diff --git a/sysdeps/unix/sysv/linux/x86_64/clone.S b/sysdeps/unix/sysv/linux/x86_64/clone.S
index 6bcb542..53f9fbd 100644
--- a/sysdeps/unix/sysv/linux/x86_64/clone.S
+++ b/sysdeps/unix/sysv/linux/x86_64/clone.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -84,7 +84,6 @@ ENTRY (BP_SYM (__clone))
jl SYSCALL_ERROR_LABEL
jz L(thread_start)
-L(pseudo_end):
ret
L(thread_start):
diff --git a/sysdeps/unix/sysv/linux/x86_64/getcontext.S b/sysdeps/unix/sysv/linux/x86_64/getcontext.S
index 11f5df9..5f2b64c 100644
--- a/sysdeps/unix/sysv/linux/x86_64/getcontext.S
+++ b/sysdeps/unix/sysv/linux/x86_64/getcontext.S
@@ -1,5 +1,5 @@
/* Save current context.
- Copyright (C) 2002, 2005, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 2002.
@@ -81,7 +81,6 @@ ENTRY(__getcontext)
/* All done, return 0 for success. */
xorl %eax, %eax
-L(pseudo_end):
ret
PSEUDO_END(__getcontext)
diff --git a/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S b/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
index 896deb0..3b319d7 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
+++ b/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
@@ -70,6 +70,5 @@ ENTRY (sched_getcpu)
jae SYSCALL_ERROR_LABEL
movl %edx, %eax
-L(pseudo_end):
ret
PSEUDO_END(sched_getcpu)
diff --git a/sysdeps/unix/sysv/linux/x86_64/setcontext.S b/sysdeps/unix/sysv/linux/x86_64/setcontext.S
index 19032f0..adcb243 100644
--- a/sysdeps/unix/sysv/linux/x86_64/setcontext.S
+++ b/sysdeps/unix/sysv/linux/x86_64/setcontext.S
@@ -1,5 +1,5 @@
/* Install given context.
- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 2002.
@@ -96,8 +96,6 @@ ENTRY(__setcontext)
/* Clear rax to indicate success. */
xorl %eax, %eax
-
-L(pseudo_end):
ret
PSEUDO_END(__setcontext)
diff --git a/sysdeps/unix/sysv/linux/x86_64/swapcontext.S b/sysdeps/unix/sysv/linux/x86_64/swapcontext.S
index ebab2b9..0d04a01 100644
--- a/sysdeps/unix/sysv/linux/x86_64/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/x86_64/swapcontext.S
@@ -1,5 +1,5 @@
/* Save current context and install the given one.
- Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 2002.
@@ -114,8 +114,6 @@ ENTRY(__swapcontext)
/* Clear rax to indicate success. */
xorl %eax, %eax
-
-L(pseudo_end):
ret
PSEUDO_END(__swapcontext)
diff --git a/sysdeps/unix/sysv/linux/x86_64/syscall.S b/sysdeps/unix/sysv/linux/x86_64/syscall.S
index 03eea98..87dfd8c 100644
--- a/sysdeps/unix/sysv/linux/x86_64/syscall.S
+++ b/sysdeps/unix/sysv/linux/x86_64/syscall.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -37,7 +37,6 @@ ENTRY (syscall)
syscall /* Do the system call. */
cmpq $-4095, %rax /* Check %rax for error. */
jae SYSCALL_ERROR_LABEL /* Jump to error handler if error. */
-L(pseudo_end):
ret /* Return to caller. */
PSEUDO_END (syscall)
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index 1c3cbd6..5323104 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2005, 2007, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -79,8 +79,7 @@
ENTRY (name) \
DO_CALL (syscall_name, args); \
cmpq $-4095, %rax; \
- jae SYSCALL_ERROR_LABEL; \
- L(pseudo_end):
+ jae SYSCALL_ERROR_LABEL
# undef PSEUDO_END
# define PSEUDO_END(name) \
diff --git a/sysdeps/unix/sysv/linux/x86_64/vfork.S b/sysdeps/unix/sysv/linux/x86_64/vfork.S
index 2e85f90..c28087d 100644
--- a/sysdeps/unix/sysv/linux/x86_64/vfork.S
+++ b/sysdeps/unix/sysv/linux/x86_64/vfork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2004, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -52,7 +52,6 @@ ENTRY (__vfork)
jae SYSCALL_ERROR_LABEL /* Branch forward if it failed. */
/* Normal return. */
-.Lpseudo_end:
ret
PSEUDO_END (__vfork)
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S b/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S
index 789552e..58a7178 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S
@@ -44,7 +44,6 @@ ENTRY (sched_getcpu)
jae SYSCALL_ERROR_LABEL
mov %edx, %eax
-L(pseudo_end):
ret
PSEUDO_END(sched_getcpu)
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 26 ++++++++++++++++++++
nptl/ChangeLog | 8 ++++++
nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S | 3 +-
nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 5 +--
.../sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h | 5 +--
sysdeps/unix/sysv/linux/i386/accept4.S | 3 +-
.../unix/sysv/linux/i386/call_sync_file_range.S | 3 +-
sysdeps/unix/sysv/linux/i386/clone.S | 3 +-
sysdeps/unix/sysv/linux/i386/epoll_pwait.S | 3 +-
sysdeps/unix/sysv/linux/i386/getcontext.S | 3 +-
sysdeps/unix/sysv/linux/i386/mmap.S | 4 +--
sysdeps/unix/sysv/linux/i386/mmap64.S | 7 +----
sysdeps/unix/sysv/linux/i386/semtimedop.S | 3 +-
sysdeps/unix/sysv/linux/i386/setcontext.S | 3 +-
sysdeps/unix/sysv/linux/i386/socket.S | 3 +-
sysdeps/unix/sysv/linux/i386/swapcontext.S | 4 +--
sysdeps/unix/sysv/linux/i386/syscall.S | 3 +-
sysdeps/unix/sysv/linux/i386/sysdep.h | 6 +---
sysdeps/unix/sysv/linux/i386/vfork.S | 4 +--
sysdeps/unix/sysv/linux/x86_64/clone.S | 3 +-
sysdeps/unix/sysv/linux/x86_64/getcontext.S | 3 +-
sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S | 1 -
sysdeps/unix/sysv/linux/x86_64/setcontext.S | 4 +--
sysdeps/unix/sysv/linux/x86_64/swapcontext.S | 4 +--
sysdeps/unix/sysv/linux/x86_64/syscall.S | 3 +-
sysdeps/unix/sysv/linux/x86_64/sysdep.h | 5 +--
sysdeps/unix/sysv/linux/x86_64/vfork.S | 3 +-
sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S | 1 -
28 files changed, 62 insertions(+), 64 deletions(-)
hooks/post-receive
--
GNU C Library master sources