Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove unused pseudo_end label
  • Loading branch information
Andreas Schwab committed Jul 25, 2012
1 parent 0c7936d commit 842a39c
Show file tree
Hide file tree
Showing 28 changed files with 62 additions and 64 deletions.
26 changes: 26 additions & 0 deletions ChangeLog
View file
@@ -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.
Expand Down
8 changes: 8 additions & 0 deletions nptl/ChangeLog
View file
@@ -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.
Expand Down
3 changes: 1 addition & 2 deletions nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S
View file
@@ -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>.
Expand Down Expand Up @@ -60,7 +60,6 @@ ENTRY (__vfork)

cmpl $-4095, %eax
jae SYSCALL_ERROR_LABEL /* Branch forward if it failed. */
.Lpseudo_end:
ret
PSEUDO_END (__vfork)

Expand Down
5 changes: 2 additions & 3 deletions nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
View file
@@ -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.
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
View file
@@ -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.
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/i386/accept4.S
View file
@@ -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
Expand Down Expand Up @@ -67,7 +67,6 @@ ENTRY (__libc_accept4)
jae errlabel

/* Successful; return the syscall's value. */
L(pseudo_end):
ret


Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/i386/call_sync_file_range.S
View file
@@ -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
Expand Down Expand Up @@ -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)
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/i386/clone.S
View file
@@ -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)
Expand Down Expand Up @@ -115,7 +115,6 @@ ENTRY (BP_SYM (__clone))
jl SYSCALL_ERROR_LABEL
jz L(thread_start)

L(pseudo_end):
ret

L(thread_start):
Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/i386/epoll_pwait.S
View file
@@ -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
Expand Down Expand Up @@ -74,6 +74,5 @@ ENTRY (epoll_pwait)
movl $-ENOSYS, %eax
jmp SYSCALL_ERROR_LABEL
#endif
L(pseudo_end):
ret
PSEUDO_END (epoll_pwait)
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/i386/getcontext.S
View file
@@ -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.
Expand Down Expand Up @@ -77,7 +77,6 @@ ENTRY(__getcontext)

/* All done, return 0 for success. */
xorl %eax, %eax
L(pseudo_end):
ret
PSEUDO_END(__getcontext)

Expand Down
4 changes: 1 addition & 3 deletions sysdeps/unix/sysv/linux/i386/mmap.S
View file
@@ -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
Expand Down Expand Up @@ -98,7 +97,6 @@ L(skip):
ja SYSCALL_ERROR_LABEL

/* Successful; return the syscall's value. */
L(pseudo_end):
ret

PSEUDO_END (__mmap)
Expand Down
7 changes: 1 addition & 6 deletions sysdeps/unix/sysv/linux/i386/mmap64.S
View file
@@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/i386/semtimedop.S
View file
@@ -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.
Expand Down Expand Up @@ -65,7 +65,6 @@ ENTRY (BP_SYM (semtimedop))
ja SYSCALL_ERROR_LABEL

/* Successful; return the syscall's value. */
L(pseudo_end):
ret

#ifdef PIC
Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/i386/setcontext.S
View file
@@ -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.
Expand Down Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/i386/socket.S
View file
@@ -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
Expand Down Expand Up @@ -68,7 +68,6 @@ ENTRY (__socket)
jae SYSCALL_ERROR_LABEL

/* Successful; return the syscall's value. */
L(pseudo_end):
ret


Expand Down
4 changes: 1 addition & 3 deletions sysdeps/unix/sysv/linux/i386/swapcontext.S
View file
@@ -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.
Expand Down Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/i386/syscall.S
View file
@@ -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
Expand Down Expand Up @@ -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)
6 changes: 2 additions & 4 deletions sysdeps/unix/sysv/linux/i386/sysdep.h
View file
@@ -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.
Expand Down Expand Up @@ -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) \
Expand Down
4 changes: 1 addition & 3 deletions sysdeps/unix/sysv/linux/i386/vfork.S
View file
@@ -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>.
Expand Down Expand Up @@ -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
Expand All @@ -79,7 +78,6 @@ ENTRY (__vfork)
int $0x80
cmpl $-4095, %eax
jae SYSCALL_ERROR_LABEL
.Lpseudo_end:
ret
#endif
PSEUDO_END (__vfork)
Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/x86_64/clone.S
View file
@@ -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
Expand Down Expand Up @@ -84,7 +84,6 @@ ENTRY (BP_SYM (__clone))
jl SYSCALL_ERROR_LABEL
jz L(thread_start)

L(pseudo_end):
ret

L(thread_start):
Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/x86_64/getcontext.S
View file
@@ -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.
Expand Down Expand Up @@ -81,7 +81,6 @@ ENTRY(__getcontext)

/* All done, return 0 for success. */
xorl %eax, %eax
L(pseudo_end):
ret
PSEUDO_END(__getcontext)

Expand Down
1 change: 0 additions & 1 deletion sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
View file
Expand Up @@ -70,6 +70,5 @@ ENTRY (sched_getcpu)
jae SYSCALL_ERROR_LABEL

movl %edx, %eax
L(pseudo_end):
ret
PSEUDO_END(sched_getcpu)
4 changes: 1 addition & 3 deletions sysdeps/unix/sysv/linux/x86_64/setcontext.S
View file
@@ -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.
Expand Down Expand Up @@ -96,8 +96,6 @@ ENTRY(__setcontext)

/* Clear rax to indicate success. */
xorl %eax, %eax

L(pseudo_end):
ret
PSEUDO_END(__setcontext)

Expand Down
4 changes: 1 addition & 3 deletions sysdeps/unix/sysv/linux/x86_64/swapcontext.S
View file
@@ -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.
Expand Down Expand Up @@ -114,8 +114,6 @@ ENTRY(__swapcontext)

/* Clear rax to indicate success. */
xorl %eax, %eax

L(pseudo_end):
ret
PSEUDO_END(__swapcontext)

Expand Down
3 changes: 1 addition & 2 deletions sysdeps/unix/sysv/linux/x86_64/syscall.S
View file
@@ -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
Expand Down Expand Up @@ -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)

0 comments on commit 842a39c

Please sign in to comment.