diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-01-03 21:57:20 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-01-03 21:57:20 +0000 |
| commit | 6fc1ece8240f262043817c8e50841e78b8ec057f (patch) | |
| tree | 44e769438af0582d1304eb02ee21e5136dbd336d /ports/sysdeps/unix/sysv | |
| parent | 6ffa8f2f3b013e11bfdb0bdfbe678218f2ad6af4 (diff) | |
| download | eglibc2-6fc1ece8240f262043817c8e50841e78b8ec057f.tar.gz | |
Merge changes between r16431 and r16494 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@16495 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'ports/sysdeps/unix/sysv')
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h | 9 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h index 9c8077187..506558d3f 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h +++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004, 2005, 2007, 2008, 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 @@ -28,12 +29,10 @@ # define PSEUDO(name, syscall_name, args) \ .section ".text"; \ PSEUDO_PROLOGUE; \ - .type __##syscall_name##_nocancel,%function; \ - .globl __##syscall_name##_nocancel; \ - __##syscall_name##_nocancel: \ + ENTRY (__##syscall_name##_nocancel); \ DO_CALL (syscall_name, args); \ PSEUDO_RET; \ - .size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \ + END (__##syscall_name##_nocancel); \ ENTRY (name); \ SINGLE_THREAD_P; \ DOARGS_##args; \ diff --git a/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S b/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S index 98e33cb8b..d9cc40fb0 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S +++ b/ports/sysdeps/unix/sysv/linux/arm/sigrestorer.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 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 @@ -24,10 +24,12 @@ ENTRY(__default_sa_restorer) swi SYS_ify(sigreturn) +END(__default_sa_restorer) #ifdef __NR_rt_sigreturn ENTRY(__default_rt_sa_restorer) swi SYS_ify(rt_sigreturn) +END(__default_rt_sa_restorer) #endif |