From b031a35828456cc2cee76af5444d1d9c4ec2cd2d Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Wed, 21 Sep 2005 21:18:04 +0000 Subject: __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. --- ldso/ldso/arm/dl-syscalls.h | 3 ++- ldso/ldso/cris/dl-syscalls.h | 3 ++- ldso/ldso/frv/dl-syscalls.h | 3 ++- ldso/ldso/i386/dl-syscalls.h | 3 ++- ldso/ldso/m68k/dl-syscalls.h | 3 ++- ldso/ldso/mips/dl-syscalls.h | 3 ++- ldso/ldso/sh/dl-syscalls.h | 3 ++- ldso/ldso/sh64/dl-syscalls.h | 3 ++- ldso/ldso/x86_64/dl-syscalls.h | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) (limited to 'ldso') 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 /* 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 -- cgit v1.2.3