svn commit: trunk/uClibc/ldso/ldso: arm cris frv i386 m68k mips sh sh64 x86_ etc...

jocke at uclibc.org jocke at uclibc.org
Wed Sep 21 21:18:09 UTC 2005


Author: jocke
Date: 2005-09-21 14:18:04 -0700 (Wed, 21 Sep 2005)
New Revision: 11539

Log:
__set_errno must be redefined after #include "sys/syscall.h".
syscall.h should not have it's own version of __set_errno, instead syscall.h should
include errno.h(see powerpc) since errno handling depends on threads/no threads.

I leave the the fixing of syscall.h since there might be some smaller compile problems.


Modified:
   trunk/uClibc/ldso/ldso/arm/dl-syscalls.h
   trunk/uClibc/ldso/ldso/cris/dl-syscalls.h
   trunk/uClibc/ldso/ldso/frv/dl-syscalls.h
   trunk/uClibc/ldso/ldso/i386/dl-syscalls.h
   trunk/uClibc/ldso/ldso/m68k/dl-syscalls.h
   trunk/uClibc/ldso/ldso/mips/dl-syscalls.h
   trunk/uClibc/ldso/ldso/sh/dl-syscalls.h
   trunk/uClibc/ldso/ldso/sh64/dl-syscalls.h
   trunk/uClibc/ldso/ldso/x86_64/dl-syscalls.h


Changeset:
Modified: trunk/uClibc/ldso/ldso/arm/dl-syscalls.h
===================================================================
--- trunk/uClibc/ldso/ldso/arm/dl-syscalls.h	2005-09-21 18:25:05 UTC (rev 11538)
+++ trunk/uClibc/ldso/ldso/arm/dl-syscalls.h	2005-09-21 21:18:04 UTC (rev 11539)
@@ -1,6 +1,7 @@
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-#include "sys/syscall.h"
 

Modified: trunk/uClibc/ldso/ldso/cris/dl-syscalls.h
===================================================================
--- trunk/uClibc/ldso/ldso/cris/dl-syscalls.h	2005-09-21 18:25:05 UTC (rev 11538)
+++ trunk/uClibc/ldso/ldso/cris/dl-syscalls.h	2005-09-21 21:18:04 UTC (rev 11539)
@@ -1,5 +1,6 @@
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-#include "sys/syscall.h"

Modified: trunk/uClibc/ldso/ldso/frv/dl-syscalls.h
===================================================================
--- trunk/uClibc/ldso/ldso/frv/dl-syscalls.h	2005-09-21 18:25:05 UTC (rev 11538)
+++ trunk/uClibc/ldso/ldso/frv/dl-syscalls.h	2005-09-21 21:18:04 UTC (rev 11539)
@@ -20,9 +20,10 @@
 
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-#include "sys/syscall.h"
 #include <sys/mman.h>
 
 /* The code below is extracted from libc/sysdeps/linux/frv/_mmap.c */

Modified: trunk/uClibc/ldso/ldso/i386/dl-syscalls.h
===================================================================
--- trunk/uClibc/ldso/ldso/i386/dl-syscalls.h	2005-09-21 18:25:05 UTC (rev 11538)
+++ trunk/uClibc/ldso/ldso/i386/dl-syscalls.h	2005-09-21 21:18:04 UTC (rev 11539)
@@ -1,5 +1,6 @@
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-#include "sys/syscall.h"

Modified: trunk/uClibc/ldso/ldso/m68k/dl-syscalls.h
===================================================================
--- trunk/uClibc/ldso/ldso/m68k/dl-syscalls.h	2005-09-21 18:25:05 UTC (rev 11538)
+++ trunk/uClibc/ldso/ldso/m68k/dl-syscalls.h	2005-09-21 21:18:04 UTC (rev 11539)
@@ -1,5 +1,6 @@
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-#include "sys/syscall.h"

Modified: trunk/uClibc/ldso/ldso/mips/dl-syscalls.h
===================================================================
--- trunk/uClibc/ldso/ldso/mips/dl-syscalls.h	2005-09-21 18:25:05 UTC (rev 11538)
+++ trunk/uClibc/ldso/ldso/mips/dl-syscalls.h	2005-09-21 21:18:04 UTC (rev 11539)
@@ -1,7 +1,8 @@
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-#include "sys/syscall.h"
 
 #define MMAP_HAS_6_ARGS

Modified: trunk/uClibc/ldso/ldso/sh/dl-syscalls.h
===================================================================
--- trunk/uClibc/ldso/ldso/sh/dl-syscalls.h	2005-09-21 18:25:05 UTC (rev 11538)
+++ trunk/uClibc/ldso/ldso/sh/dl-syscalls.h	2005-09-21 21:18:04 UTC (rev 11539)
@@ -1,7 +1,8 @@
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-#include "sys/syscall.h"
 
 #define MMAP_HAS_6_ARGS

Modified: trunk/uClibc/ldso/ldso/sh64/dl-syscalls.h
===================================================================
--- trunk/uClibc/ldso/ldso/sh64/dl-syscalls.h	2005-09-21 18:25:05 UTC (rev 11538)
+++ trunk/uClibc/ldso/ldso/sh64/dl-syscalls.h	2005-09-21 21:18:04 UTC (rev 11539)
@@ -1,8 +1,9 @@
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-#include "sys/syscall.h"
 
 #undef __syscall_return
 #define __syscall_return(type, res)					\

Modified: trunk/uClibc/ldso/ldso/x86_64/dl-syscalls.h
===================================================================
--- trunk/uClibc/ldso/ldso/x86_64/dl-syscalls.h	2005-09-21 18:25:05 UTC (rev 11538)
+++ trunk/uClibc/ldso/ldso/x86_64/dl-syscalls.h	2005-09-21 21:18:04 UTC (rev 11539)
@@ -1,7 +1,8 @@
 /* We can't use the real errno in ldso, since it has not yet
  * been dynamicly linked in yet. */
+#include "sys/syscall.h"
 extern int _dl_errno;
+#undef __set_errno
 #define __set_errno(X) {(_dl_errno) = (X);}
-#include "sys/syscall.h"
 
 #define MMAP_HAS_6_ARGS




More information about the uClibc-cvs mailing list