aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r--sysdeps/unix/sysv/linux/i386/clone.S6
-rw-r--r--sysdeps/unix/sysv/linux/i386/i686/sysdep.h19
-rw-r--r--sysdeps/unix/sysv/linux/i386/mmap.S2
-rw-r--r--sysdeps/unix/sysv/linux/i386/s_pread64.S8
-rw-r--r--sysdeps/unix/sysv/linux/i386/s_pwrite64.S8
-rw-r--r--sysdeps/unix/sysv/linux/i386/socket.S2
-rw-r--r--sysdeps/unix/sysv/linux/i386/syscall.S2
-rw-r--r--sysdeps/unix/sysv/linux/i386/sysdep.h35
-rw-r--r--sysdeps/unix/sysv/linux/sigset-cvt-mask.h35
9 files changed, 75 insertions, 42 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/clone.S b/sysdeps/unix/sysv/linux/i386/clone.S
index 88d0e27549..d654d98c7a 100644
--- a/sysdeps/unix/sysv/linux/i386/clone.S
+++ b/sysdeps/unix/sysv/linux/i386/clone.S
@@ -33,10 +33,10 @@ ENTRY(__clone)
movl $-EINVAL,%eax
movl 4(%esp),%ecx /* no NULL function pointers */
testl %ecx,%ecx
- jz syscall_error
+ jz SYSCALL_ERROR_LABEL
movl 8(%esp),%ecx /* no NULL stack pointers */
testl %ecx,%ecx
- jz syscall_error
+ jz SYSCALL_ERROR_LABEL
/* Insert the argument onto the new stack. */
subl $8,%ecx
@@ -56,7 +56,7 @@ ENTRY(__clone)
popl %ebx
test %eax,%eax
- jl syscall_error
+ jl SYSCALL_ERROR_LABEL
jz thread_start
L(pseudo_end):
diff --git a/sysdeps/unix/sysv/linux/i386/i686/sysdep.h b/sysdeps/unix/sysv/linux/i386/i686/sysdep.h
index 001f3fc4d7..3f1391f8a4 100644
--- a/sysdeps/unix/sysv/linux/i386/i686/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/i686/sysdep.h
@@ -31,12 +31,10 @@
/* Store (- %eax) into errno through the GOT. */
# ifdef _LIBC_REENTRANT
# define SYSCALL_ERROR_HANDLER \
- .type syscall_error,@function; \
-0:movl (%esp),%ebx; \
+1:movl (%esp),%ebx; \
ret; \
-syscall_error: \
- pushl %ebx; \
- call 0b; \
+0:pushl %ebx; \
+ call 1b; \
addl $_GLOBAL_OFFSET_TABLE_, %ebx; \
xorl %edx, %edx; \
subl %eax, %edx; \
@@ -46,25 +44,22 @@ syscall_error: \
popl %ebx; \
movl %ecx, (%eax); \
movl $-1, %eax; \
- jmp L(pseudo_end); \
- .size syscall_error,.-syscall_error;
+ jmp L(pseudo_end);
/* A quick note: it is assumed that the call to `__errno_location' does
not modify the stack! */
# else
# define SYSCALL_ERROR_HANDLER \
.type syscall_error,@function; \
-0:movl (%esp),%ecx; \
+1:movl (%esp),%ecx; \
ret; \
-syscall_error: \
- call 0b; \
+0:call 1b; \
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
xorl %edx, %edx; \
subl %eax, %edx; \
movl errno@GOT(%ecx), %ecx; \
movl %edx, (%ecx); \
movl $-1, %eax; \
- jmp L(pseudo_end); \
- .size syscall_error,.-syscall_error;
+ jmp L(pseudo_end);
# endif /* _LIBC_REENTRANT */
#endif /* PIC */
diff --git a/sysdeps/unix/sysv/linux/i386/mmap.S b/sysdeps/unix/sysv/linux/i386/mmap.S
index 5c2449e961..e0dde22a9f 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap.S
@@ -37,7 +37,7 @@ ENTRY (__mmap)
/* If 0 > %eax > -4096 there was an error. */
cmpl $-4096, %eax
- ja syscall_error
+ ja SYSCALL_ERROR_LABEL
/* Successful; return the syscall's value. */
L(pseudo_end):
diff --git a/sysdeps/unix/sysv/linux/i386/s_pread64.S b/sysdeps/unix/sysv/linux/i386/s_pread64.S
index 23d7d14ba5..7817cf7980 100644
--- a/sysdeps/unix/sysv/linux/i386/s_pread64.S
+++ b/sysdeps/unix/sysv/linux/i386/s_pread64.S
@@ -44,10 +44,10 @@ ENTRY (__syscall_pread64)
movl 0x10(%esp,1),%ebx
/* Load syscall number into %eax. */
movl $SYS_ify(pread), %eax
- int $0x80 /* Do the system call. */
- POPARGS_5 /* Restore register contents. */
- cmpl $-4095, %eax /* Check %eax for error. */
- jae syscall_error /* Jump to error handler if error. */
+ int $0x80 /* Do the system call. */
+ POPARGS_5 /* Restore register contents. */
+ cmpl $-4095, %eax /* Check %eax for error. */
+ jae SYSCALL_ERROR_LABEL /* Jump to error handler if error. */
#endif
L(pseudo_end):
ret /* Return to caller. */
diff --git a/sysdeps/unix/sysv/linux/i386/s_pwrite64.S b/sysdeps/unix/sysv/linux/i386/s_pwrite64.S
index 7b72d12f0b..89449b6fb5 100644
--- a/sysdeps/unix/sysv/linux/i386/s_pwrite64.S
+++ b/sysdeps/unix/sysv/linux/i386/s_pwrite64.S
@@ -44,10 +44,10 @@ ENTRY (__syscall_pwrite64)
movl 0x10(%esp,1),%ebx
/* Load syscall number into %eax. */
movl $SYS_ify(pwrite), %eax
- int $0x80 /* Do the system call. */
- POPARGS_5 /* Restore register contents. */
- cmpl $-4095, %eax /* Check %eax for error. */
- jae syscall_error /* Jump to error handler if error. */
+ int $0x80 /* Do the system call. */
+ POPARGS_5 /* Restore register contents. */
+ cmpl $-4095, %eax /* Check %eax for error. */
+ jae SYSCALL_ERROR_LABEL /* Jump to error handler if error. */
#endif
L(pseudo_end):
ret /* Return to caller. */
diff --git a/sysdeps/unix/sysv/linux/i386/socket.S b/sysdeps/unix/sysv/linux/i386/socket.S
index 4326676bc2..245d37a17f 100644
--- a/sysdeps/unix/sysv/linux/i386/socket.S
+++ b/sysdeps/unix/sysv/linux/i386/socket.S
@@ -55,7 +55,7 @@ ENTRY (__socket)
/* %eax is < 0 if there was an error. */
cmpl $-125, %eax
- jae syscall_error
+ jae SYSCALL_ERROR_LABEL
/* Successful; return the syscall's value. */
L(pseudo_end):
diff --git a/sysdeps/unix/sysv/linux/i386/syscall.S b/sysdeps/unix/sysv/linux/i386/syscall.S
index 349408de30..48328c2a0e 100644
--- a/sysdeps/unix/sysv/linux/i386/syscall.S
+++ b/sysdeps/unix/sysv/linux/i386/syscall.S
@@ -30,7 +30,7 @@ ENTRY (syscall)
int $0x80 /* Do the system call. */
POPARGS_5 /* Restore register contents. */
cmpl $-4095, %eax /* Check %eax for error. */
- jae syscall_error /* Jump to error handler if error. */
+ jae SYSCALL_ERROR_LABEL /* Jump to error handler if error. */
L(pseudo_end):
ret /* Return to caller. */
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 5231d3e9a1..8c046efed7 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -46,13 +46,22 @@
is a real error number. Linus said he will make sure the no syscall
returns a value in -1 .. -4095 as a valid result so we can savely
test with -4095. */
+
+/* We don't want the label for the error handle to be global when we define
+ it here. */
+#ifdef PIC
+# define SYSCALL_ERROR_LABEL 0f
+#else
+# define SYSCALL_ERROR_LABEL syscall_error
+#endif
+
#undef PSEUDO
#define PSEUDO(name, syscall_name, args) \
.text; \
ENTRY (name) \
DO_CALL (args, syscall_name); \
cmpl $-4095, %eax; \
- jae syscall_error; \
+ jae SYSCALL_ERROR_LABEL; \
L(pseudo_end):
#undef PSEUDO_END
@@ -66,13 +75,11 @@
/* Store (- %eax) into errno through the GOT. */
#ifdef _LIBC_REENTRANT
#define SYSCALL_ERROR_HANDLER \
- .type syscall_error,@function; \
-syscall_error: \
- pushl %ebx; \
- call 0f; \
-0:popl %ebx; \
+0:pushl %ebx; \
+ call 1f; \
+1:popl %ebx; \
xorl %edx, %edx; \
- addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx; \
+ addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx; \
subl %eax, %edx; \
pushl %edx; \
call __errno_location@PLT; \
@@ -80,24 +87,20 @@ syscall_error: \
popl %ebx; \
movl %ecx, (%eax); \
movl $-1, %eax; \
- jmp L(pseudo_end); \
- .size syscall_error,.-syscall_error;
+ jmp L(pseudo_end);
/* A quick note: it is assumed that the call to `__errno_location' does
not modify the stack! */
#else
#define SYSCALL_ERROR_HANDLER \
- .type syscall_error,@function; \
-syscall_error: \
- call 0f; \
-0:popl %ecx; \
+0:call 1f; \
+1:popl %ecx; \
xorl %edx, %edx; \
- addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ecx; \
+ addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx; \
subl %eax, %edx; \
movl errno@GOT(%ecx), %ecx; \
movl %edx, (%ecx); \
movl $-1, %eax; \
- jmp L(pseudo_end); \
- .size syscall_error,.-syscall_error;
+ jmp L(pseudo_end);
#endif /* _LIBC_REENTRANT */
#endif /* PIC */
diff --git a/sysdeps/unix/sysv/linux/sigset-cvt-mask.h b/sysdeps/unix/sysv/linux/sigset-cvt-mask.h
new file mode 100644
index 0000000000..aefb805394
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sigset-cvt-mask.h
@@ -0,0 +1,35 @@
+/* Convert between lowlevel sigmask and libc representation of sigset_t.
+ Linux version.
+ Copyright (C) 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Joe Keane <jgk@jgk.org>.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#define sigset_set_old_mask(set, mask) \
+ do { \
+ unsigned long int *__ptr; \
+ int __cnt; \
+ __ptr = &(set)->__val[0]; \
+ *__ptr++ = (unsigned long int) (mask); \
+ __cnt = _SIGSET_NWORDS - 2; \
+ do \
+ *__ptr++ = 0ul; \
+ while (--__cnt >= 0); \
+ } while (0)
+
+#define sigset_get_old_mask(set, mask) \
+ ((mask) = (unsigned int) (set)->__val[0])
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 04:39:33 +0000