9 files changed, 18 insertions, 9 deletions
diff --git a/ldso/ldso/arm/dl-syscalls.h b/ldso/ldso/arm/dl-syscalls.h
index f0f4baed8..4b42a57e0 100644
--- a/ldso/ldso/arm/dl-syscalls.h
+++ b/ldso/ldso/arm/dl-syscalls.h
@@ -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"
 
diff --git a/ldso/ldso/cris/dl-syscalls.h b/ldso/ldso/cris/dl-syscalls.h
index dc0cc6164..996bb87c6 100644
--- a/ldso/ldso/cris/dl-syscalls.h
+++ b/ldso/ldso/cris/dl-syscalls.h
@@ -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"
diff --git a/ldso/ldso/frv/dl-syscalls.h b/ldso/ldso/frv/dl-syscalls.h
index 4ee1992a5..8e08d9e6c 100644
--- a/ldso/ldso/frv/dl-syscalls.h
+++ b/ldso/ldso/frv/dl-syscalls.h
@@ -20,9 +20,10 @@ USA.  */
 
 /* 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 */
diff --git a/ldso/ldso/i386/dl-syscalls.h b/ldso/ldso/i386/dl-syscalls.h
index dc0cc6164..996bb87c6 100644
--- a/ldso/ldso/i386/dl-syscalls.h
+++ b/ldso/ldso/i386/dl-syscalls.h
@@ -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"
diff --git a/ldso/ldso/m68k/dl-syscalls.h b/ldso/ldso/m68k/dl-syscalls.h
index dc0cc6164..996bb87c6 100644
--- a/ldso/ldso/m68k/dl-syscalls.h
+++ b/ldso/ldso/m68k/dl-syscalls.h
@@ -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"
diff --git a/ldso/ldso/mips/dl-syscalls.h b/ldso/ldso/mips/dl-syscalls.h
index a97ff562c..afb1cd630 100644
--- a/ldso/ldso/mips/dl-syscalls.h
+++ b/ldso/ldso/mips/dl-syscalls.h
@@ -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
diff --git a/ldso/ldso/sh/dl-syscalls.h b/ldso/ldso/sh/dl-syscalls.h
index a97ff562c..afb1cd630 100644
--- a/ldso/ldso/sh/dl-syscalls.h
+++ b/ldso/ldso/sh/dl-syscalls.h
@@ -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
diff --git a/ldso/ldso/sh64/dl-syscalls.h b/ldso/ldso/sh64/dl-syscalls.h
index 1db7b6719..4fe50fac4 100644
--- a/ldso/ldso/sh64/dl-syscalls.h
+++ b/ldso/ldso/sh64/dl-syscalls.h
@@ -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)					\
diff --git a/ldso/ldso/x86_64/dl-syscalls.h b/ldso/ldso/x86_64/dl-syscalls.h
index a97ff562c..afb1cd630 100644
--- a/ldso/ldso/x86_64/dl-syscalls.h
+++ b/ldso/ldso/x86_64/dl-syscalls.h
@@ -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