diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-02-05 11:10:14 -0800 | 
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-02-05 11:10:32 -0800 | 
| commit | f7eba78a7464c7b31326abf92dab254608835028 (patch) | |
| tree | 5558a9e8d2c7c4484387030427701d81bd8b83e5 /libc/sysdeps/linux/sparc | |
| parent | 3e808a4c28f214314e8457672fae0f5d17f5450a (diff) | |
| parent | df1580676a48dc3a9faf7e508ad3ec822a8e5a05 (diff) | |
Merge commit 'origin/master' into nptl
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/sysdeps/linux/sparc')
| -rw-r--r-- | libc/sysdeps/linux/sparc/sigaction.c | 9 | 
1 files changed, 4 insertions, 5 deletions
diff --git a/libc/sysdeps/linux/sparc/sigaction.c b/libc/sysdeps/linux/sparc/sigaction.c index a22ac40af..7140fd3a4 100644 --- a/libc/sysdeps/linux/sparc/sigaction.c +++ b/libc/sysdeps/linux/sparc/sigaction.c @@ -34,7 +34,8 @@ _syscall5(int, rt_sigaction, int, a, int, b, int, c, int, d, int, e);  static void __rt_sigreturn_stub(void);  static void __sigreturn_stub(void); -int __libc_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) +libc_hidden_proto(sigaction) +int sigaction(int sig, const struct sigaction *act, struct sigaction *oact)  {  	int ret;  	struct sigaction kact, koact; @@ -65,10 +66,8 @@ int __libc_sigaction(int sig, const struct sigaction *act, struct sigaction *oac  	return ret;  } -#ifndef LIBC_SIGACTION -weak_alias(__libc_sigaction,sigaction) -libc_hidden_weak(sigaction) -#endif +libc_hidden_def(sigaction) +weak_alias(sigaction,__libc_sigaction)  static void  __rt_sigreturn_stub(void)  | 
