[git commit prelink] sh: fix build in !NPTL case
Filippo Arcidiacono
filippo.arcidiacono at st.com
Fri Jun 24 14:27:36 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=5e87d86aceed23e9f2cffe4e6cbcd99569a4dac1
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/prelink
Fix build issue due to missing symbols in !NPTL case:
- vfork
- _longjmp_unwind
Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono at st.com>
Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
libc/sysdeps/linux/sh/Makefile.arch | 2 +-
libc/sysdeps/linux/sh/longjmp.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/libc/sysdeps/linux/sh/Makefile.arch b/libc/sysdeps/linux/sh/Makefile.arch
index 3e32e10..09d7ecf 100644
--- a/libc/sysdeps/linux/sh/Makefile.arch
+++ b/libc/sysdeps/linux/sh/Makefile.arch
@@ -9,4 +9,4 @@
CSRC := \
mmap.c pipe.c __init_brk.c brk.c sbrk.c pread_write.c longjmp.c cacheflush.c
-SSRC := setjmp.S __longjmp.S ___fpscr_values.S
+SSRC := setjmp.S __longjmp.S ___fpscr_values.S vfork.S
diff --git a/libc/sysdeps/linux/sh/longjmp.c b/libc/sysdeps/linux/sh/longjmp.c
index dd0616d..28ab715 100644
--- a/libc/sysdeps/linux/sh/longjmp.c
+++ b/libc/sysdeps/linux/sh/longjmp.c
@@ -29,7 +29,9 @@ libc_hidden_proto(sigprocmask)
extern int __longjmp(char *env, int val);
libc_hidden_proto(__longjmp)
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
extern void _longjmp_unwind (jmp_buf env, int val);
+#endif
/* Set the signal mask to the one specified in ENV, and jump
@@ -39,7 +41,9 @@ void __libc_siglongjmp (sigjmp_buf env, int val)
{
/* Perform any cleanups needed by the frames being unwound. */
+#if __UCLIBC_HAS_THREADS_NATIVE__
_longjmp_unwind (env, val);
+#endif
if (env[0].__mask_was_saved)
/* Restore the saved signal mask. */
--
1.7.3.4
More information about the uClibc-cvs
mailing list