svn commit: trunk/uClibc/libc/sysdeps/linux/nios
vapier at uclibc.org
vapier at uclibc.org
Tue Jan 10 02:03:38 UTC 2006
Author: vapier
Date: 2006-01-09 18:03:25 -0800 (Mon, 09 Jan 2006)
New Revision: 13209
Log:
more fixes by Thomas Chou in Bug 618
Modified:
trunk/uClibc/libc/sysdeps/linux/nios/__longjmp.S
trunk/uClibc/libc/sysdeps/linux/nios/clone.S
trunk/uClibc/libc/sysdeps/linux/nios/setjmp.S
trunk/uClibc/libc/sysdeps/linux/nios/vfork.S
Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/nios/__longjmp.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/nios/__longjmp.S 2006-01-10 01:43:40 UTC (rev 13208)
+++ trunk/uClibc/libc/sysdeps/linux/nios/__longjmp.S 2006-01-10 02:03:25 UTC (rev 13209)
@@ -16,6 +16,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <features.h>
#define _ASM
#define _SETJMP_H
#include <bits/setjmp.h>
Modified: trunk/uClibc/libc/sysdeps/linux/nios/clone.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/nios/clone.S 2006-01-10 01:43:40 UTC (rev 13208)
+++ trunk/uClibc/libc/sysdeps/linux/nios/clone.S 2006-01-10 02:03:25 UTC (rev 13209)
@@ -21,7 +21,7 @@
and invokes a function in the right context after its all over. */
#include <asm/errno.h>
-#include <asm/unistd.h>
+#include <sys/syscall.h>
#include "NM_Macros.S"
/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
@@ -87,5 +87,5 @@
.size __thread_start, .-__thread_start
-.globl clone;
+.weak clone
clone = __clone
Modified: trunk/uClibc/libc/sysdeps/linux/nios/setjmp.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/nios/setjmp.S 2006-01-10 01:43:40 UTC (rev 13208)
+++ trunk/uClibc/libc/sysdeps/linux/nios/setjmp.S 2006-01-10 02:03:25 UTC (rev 13209)
@@ -16,6 +16,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <features.h>
#define _ASM
#define _SETJMP_H
#include <bits/setjmp.h>
Modified: trunk/uClibc/libc/sysdeps/linux/nios/vfork.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/nios/vfork.S 2006-01-10 01:43:40 UTC (rev 13208)
+++ trunk/uClibc/libc/sysdeps/linux/nios/vfork.S 2006-01-10 02:03:25 UTC (rev 13209)
@@ -9,7 +9,11 @@
*
* Written by Wentao Xu <wentao at microtronix.com>
*/
-#include <asm/unistd.h>
+
+#include <features.h>
+
+#include <bits/errno.h>
+#include <sys/syscall.h>
#include "NM_Macros.S"
#ifndef __NR_vfork
@@ -18,15 +22,11 @@
.text
.align 2
- .globl errno
- .globl vfork
- .globl __libc_vfork
+ .globl __vfork
#if defined __HAVE_ELF__
- .type vfork, at function
- .type __libc_vfork, at function
+ .type __vfork, at function
#endif
-vfork:
-__libc_vfork:
+__vfork:
MOVIP %g1, __NR_vfork
trap 63
@@ -34,25 +34,21 @@
not %g1 /* (unsigned long) -4096 */
cmp %o0, %g1
skps cc_hi
- jmp %o7
- nop
-
+ jmp %o7
+ nop
+
fix_errno:
neg %o0
save %sp, -16
MOVIA %g1, __errno_location at h
call %g1
- nop
+ nop
st [%o0], %i0 /* store errno */
xor %i0, %i0
subi %i0, 1 /* retval=-1 */
ret
- restore
-
-
-
+ restore
-
-
-
+.size __vfork,.-__vfork
+strong_alias(__vfork,vfork)
More information about the uClibc-cvs
mailing list