svn commit: branches/uClibc-nptl/libc/sysdeps/linux/mips: bits

sjhill at uclibc.org sjhill at uclibc.org
Tue Feb 28 02:40:46 UTC 2006


Author: sjhill
Date: 2006-02-27 18:40:45 -0800 (Mon, 27 Feb 2006)
New Revision: 14341

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile
   branches/uClibc-nptl/libc/sysdeps/linux/mips/__longjmp.c
   branches/uClibc-nptl/libc/sysdeps/linux/mips/bits/kernel_sigaction.h
   branches/uClibc-nptl/libc/sysdeps/linux/mips/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/mips/cacheflush.c
   branches/uClibc-nptl/libc/sysdeps/linux/mips/mmap.c
   branches/uClibc-nptl/libc/sysdeps/linux/mips/pipe.S


Changeset:
Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile	2006-02-28 02:39:36 UTC (rev 14340)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/Makefile	2006-02-28 02:40:45 UTC (rev 14341)
@@ -5,9 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-TOPDIR=../../../../
-
-top_srcdir=$(TOPDIR)
+top_srcdir=../../../../
 top_builddir=../../../../
 all: objs
 include $(top_builddir)Rules.mak

Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/__longjmp.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/__longjmp.c	2006-02-28 02:39:36 UTC (rev 14340)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/__longjmp.c	2006-02-28 02:40:45 UTC (rev 14341)
@@ -21,64 +21,66 @@
 #include <setjmp.h>
 #include <stdlib.h>
 
-#undef __longjmp
-
 #ifndef	__GNUC__
   #error This file uses GNU C extensions; you must compile with GCC.
 #endif
 
+extern void __longjmp (__jmp_buf __env, int __val) attribute_noreturn;
+libc_hidden_proto(__longjmp)
+
 void __longjmp (__jmp_buf env, int val_arg)
 {
     /* gcc 1.39.19 miscompiled the longjmp routine (as it did setjmp before
        the hack around it); force it to use $a1 for the longjmp value.
        Without this it saves $a1 in a register which gets clobbered
        along the way.  */
-    register int val asm ("a1");
+    register int val __asm__ ("a1");
 
     /* Pull back the floating point callee-saved registers.  */
 #if defined __UCLIBC_HAS_FLOATS__ && ! defined __UCLIBC_HAS_SOFT_FLOAT__
-    asm volatile ("l.d $f20, %0" : : "m" (env[0].__fpregs[0]));
-    asm volatile ("l.d $f22, %0" : : "m" (env[0].__fpregs[1]));
-    asm volatile ("l.d $f24, %0" : : "m" (env[0].__fpregs[2]));
-    asm volatile ("l.d $f26, %0" : : "m" (env[0].__fpregs[3]));
-    asm volatile ("l.d $f28, %0" : : "m" (env[0].__fpregs[4]));
-    asm volatile ("l.d $f30, %0" : : "m" (env[0].__fpregs[5]));
+    __asm__ __volatile__ ("l.d $f20, %0" : : "m" (env[0].__fpregs[0]));
+    __asm__ __volatile__ ("l.d $f22, %0" : : "m" (env[0].__fpregs[1]));
+    __asm__ __volatile__ ("l.d $f24, %0" : : "m" (env[0].__fpregs[2]));
+    __asm__ __volatile__ ("l.d $f26, %0" : : "m" (env[0].__fpregs[3]));
+    __asm__ __volatile__ ("l.d $f28, %0" : : "m" (env[0].__fpregs[4]));
+    __asm__ __volatile__ ("l.d $f30, %0" : : "m" (env[0].__fpregs[5]));
 
     /* Get and reconstruct the floating point csr.  */
-    asm volatile ("lw $2, %0" : : "m" (env[0].__fpc_csr));
-    asm volatile ("ctc1 $2, $31");
+    __asm__ __volatile__ ("lw $2, %0" : : "m" (env[0].__fpc_csr));
+    __asm__ __volatile__ ("ctc1 $2, $31");
 #endif
 
     /* Get the GP. */
-    asm volatile ("lw $gp, %0" : : "m" (env[0].__gp));
+    __asm__ __volatile__ ("lw $gp, %0" : : "m" (env[0].__gp));
 
     /* Get the callee-saved registers.  */
-    asm volatile ("lw $16, %0" : : "m" (env[0].__regs[0]));
-    asm volatile ("lw $17, %0" : : "m" (env[0].__regs[1]));
-    asm volatile ("lw $18, %0" : : "m" (env[0].__regs[2]));
-    asm volatile ("lw $19, %0" : : "m" (env[0].__regs[3]));
-    asm volatile ("lw $20, %0" : : "m" (env[0].__regs[4]));
-    asm volatile ("lw $21, %0" : : "m" (env[0].__regs[5]));
-    asm volatile ("lw $22, %0" : : "m" (env[0].__regs[6]));
-    asm volatile ("lw $23, %0" : : "m" (env[0].__regs[7]));
+    __asm__ __volatile__ ("lw $16, %0" : : "m" (env[0].__regs[0]));
+    __asm__ __volatile__ ("lw $17, %0" : : "m" (env[0].__regs[1]));
+    __asm__ __volatile__ ("lw $18, %0" : : "m" (env[0].__regs[2]));
+    __asm__ __volatile__ ("lw $19, %0" : : "m" (env[0].__regs[3]));
+    __asm__ __volatile__ ("lw $20, %0" : : "m" (env[0].__regs[4]));
+    __asm__ __volatile__ ("lw $21, %0" : : "m" (env[0].__regs[5]));
+    __asm__ __volatile__ ("lw $22, %0" : : "m" (env[0].__regs[6]));
+    __asm__ __volatile__ ("lw $23, %0" : : "m" (env[0].__regs[7]));
 
     /* Get the PC.  */
-    asm volatile ("lw $25, %0" : : "m" (env[0].__pc));
+    __asm__ __volatile__ ("lw $25, %0" : : "m" (env[0].__pc));
 
     /* Restore the stack pointer and the FP.  They have to be restored
        last and in a single asm as gcc, depending on options used, may
        use either of them to access env.  */
-    asm volatile ("lw $29, %0\n\t"
+    __asm__ __volatile__ ("lw $29, %0\n\t"
 	    "lw $30, %1\n\t" : : "m" (env[0].__sp), "m" (env[0].__fp));
 
     /* Give setjmp 1 if given a 0, or what they gave us if non-zero.  */
     if (val == 0)
-	asm volatile ("li $2, 1");
+	__asm__ __volatile__ ("li $2, 1");
     else
-	asm volatile ("move $2, %0" : : "r" (val));
+	__asm__ __volatile__ ("move $2, %0" : : "r" (val));
 
-    asm volatile ("jr $25");
+    __asm__ __volatile__ ("jr $25");
 
     /* Avoid `volatile function does return' warnings.  */
     for (;;);
 }
+libc_hidden_def(__longjmp)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/bits/kernel_sigaction.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/bits/kernel_sigaction.h	2006-02-28 02:39:36 UTC (rev 14340)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/bits/kernel_sigaction.h	2006-02-28 02:40:45 UTC (rev 14341)
@@ -38,3 +38,6 @@
 	void		(*sa_restorer)(void);
 	int		s_resv[1]; /* reserved */
 };
+
+extern int __syscall_rt_sigaction (int, const struct kernel_sigaction *__unbounded,
+	struct kernel_sigaction *__unbounded, size_t);

Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/brk.c	2006-02-28 02:39:36 UTC (rev 14340)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/brk.c	2006-02-28 02:40:45 UTC (rev 14341)
@@ -21,9 +21,14 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
+libc_hidden_proto(brk)
+
+extern void *__curbrk;
+libc_hidden_proto(__curbrk)
 void *__curbrk = 0;
+libc_hidden_data_def(__curbrk)
 
-int attribute_hidden __brk (void *addr)
+int brk (void *addr)
 {
   void *newbrk;
 
@@ -48,4 +53,4 @@
 
   return 0;
 }
-strong_alias(__brk,brk)
+libc_hidden_def(brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/cacheflush.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/cacheflush.c	2006-02-28 02:39:36 UTC (rev 14340)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/cacheflush.c	2006-02-28 02:40:45 UTC (rev 14341)
@@ -21,6 +21,6 @@
 #include <sys/syscall.h>
 
 _syscall3(int, cacheflush, void *, addr, const int, nbytes, const int, op);
-weak_alias(cacheflush, _flush_cache)
+strong_alias(cacheflush, _flush_cache)
 _syscall3(int, cachectl, void *, addr, const int, nbytes, const int, op);
 

Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/mmap.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/mmap.c	2006-02-28 02:39:36 UTC (rev 14340)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/mmap.c	2006-02-28 02:40:45 UTC (rev 14341)
@@ -1,9 +1,17 @@
 /* Use new style mmap for mips */
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
 #include <unistd.h>
 #include <errno.h>
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
+libc_hidden_proto(mmap)
+
 #if 0
 /* For now, leave mmap using mmap1 since mmap2 seems
  * to have issues (i.e. it doesn't work 100% properly).
@@ -14,7 +22,6 @@
 #endif
 #endif
 
-#define __NR___mmap __NR_mmap
-attribute_hidden _syscall6 (__ptr_t, __mmap, __ptr_t, addr, size_t, len, int, prot,
+_syscall6 (__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot,
 	   int, flags, int, fd, __off_t, offset);
-strong_alias(__mmap,mmap)
+libc_hidden_def(mmap)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/mips/pipe.S
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/mips/pipe.S	2006-02-28 02:39:36 UTC (rev 14340)
+++ branches/uClibc-nptl/libc/sysdeps/linux/mips/pipe.S	2006-02-28 02:40:45 UTC (rev 14341)
@@ -7,9 +7,9 @@
 #include <asm/unistd.h>
 #include <asm/regdef.h>
 
-	.globl	__pipe
-	.ent	__pipe, 0
-__pipe:
+	.globl	pipe
+	.ent	pipe, 0
+pipe:
 	.frame	sp, 24, sp
 #ifdef __PIC__
 	.set	noreorder
@@ -38,7 +38,6 @@
 2:
 	addiu	sp,sp,24
 	j	ra
-	.end	__pipe
-	.size	__pipe,.-__pipe
+	.end	pipe
+	.size	pipe,.-pipe
 libc_hidden_def(pipe)
-weak_alias(__pipe, pipe)




More information about the uClibc-cvs mailing list