aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-06-07 14:06:56 +0000
committerUlrich Drepper <drepper@redhat.com>1998-06-07 14:06:56 +0000
commitc0fb8a563c1c49e5fbec9bc22deac618910a3ff4 (patch)
treee7db886672cef990feba6c4357ebece5a820d7cf /sysdeps
parent737547be99fd9afffbdf3f7ac817da0a06fffc9e (diff)
downloadglibc-c0fb8a563c1c49e5fbec9bc22deac618910a3ff4.tar
glibc-c0fb8a563c1c49e5fbec9bc22deac618910a3ff4.tar.gz
glibc-c0fb8a563c1c49e5fbec9bc22deac618910a3ff4.tar.bz2
glibc-c0fb8a563c1c49e5fbec9bc22deac618910a3ff4.zip
Update.
1998-06-07 13:32 Ulrich Drepper <drepper@cygnus.com> * libc.map: Add _dl_profile. * elf/dl-reloc.c (_dl_relocate_object): Take extra argument, pass this to ELF_DYNAMIC_RELOCATE. Always allocate array for relocation result if LD_PROFILE is defined. * elf/ldsodefs.h: Adjust prototypes. * elf/dl-open.c (_dl_open): Call relocation function with extra argument. * elf/rtld.c: Likewise. * elf/dl-profile.c (_dl_mcount): Don't mark as internal function. Correct loop condition. * elf/dynamic-link.h: Don't examine _dl_profile variable, pass consider_profile to runtime setup function. * sysdeps/i386/dl-machine.h (elf_machine_runtime_setup): Use _dl_runtime_profile for all shared objects if LD_PROFILE is defined. * elf/dl-support.c: Define __libc_stack_end. * elf/rtld.c: Likewise. * sysdeps/generic/libc-start.c: Store last stack address in __libc_stack_end. * sysdeps/i386/dl-machine.h (_dl_start_user): Store stack address. * sysdeps/i386/elf/start.s: Call __libc_start_main with extra argument. * elf/elf.h: Include <features.h>, not <sys/cdefs.h>. Include <stdint.h>, not <inttypes.h>. * elf/sprof.c: Implement flat profiling. * libio/fgetc.c: Call _IO_cleanup_region_end with 0 and call _IO_funlockfile explicitly. * libio/fileops.c: Likewise. * libio/fputc.c: Likewise. * libio/freopen.c: Likewise. * libio/freopen64.c: Likewise. * libio/fseek.c: Likewise. * libio/fseeko.c: Likewise. * libio/fseeko64.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/getc.c: Likewise. * libio/getchar.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/iofsetpos64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogets.c: Likewise. * libio/ioputs.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/peekc.c: Likewise. * libio/putc.c: Likewise. * libio/putchar.c: Likewise. * libio/rewind.c: Likewise. * malloc/mtrace.c: Pretty print. * misc/mntent.h (struct mentent): Make string elements const char *. * nis/nis_printf.c: Optimize I/O a little bit. * signal/Makefile (distribute): Add sigset-cvt-mask.h. * sysdeps/generic/sigset-cvt-mask.h: New file. * sysdeps/unix/sysv/linux/sigset-cvt-mask.h: New file. * sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h: New file. * sysdeps/posix/sigvec.c: Rewrite the use definitions from sigset-cvt-mask.h to do the dirty work. Patches by Joe Keane. * sysdeps/posix/mkstemp.c: Save one precious byte of rodata. * sysdeps/unix/sysv/linux/i386/sysdep.h: Rewrite PSEUDO etc to make syscall_error label in case of PIC anonymous. * sysdeps/unix/sysv/linux/i386/i686/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/clone.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/mmap.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/s_pread64.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/s_pwrite64.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/socket.S: Adapt for this change. * sysdeps/unix/sysv/linux/i386/syscall.S: Adapt for this change.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/libc-start.c6
-rw-r--r--sysdeps/generic/sigset-cvt-mask.h24
-rw-r--r--sysdeps/i386/dl-machine.h9
-rw-r--r--sysdeps/i386/elf/start.S5
-rw-r--r--sysdeps/posix/mkstemp.c2
-rw-r--r--sysdeps/posix/sigvec.c164
-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
-rw-r--r--sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h33
16 files changed, 231 insertions, 129 deletions
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index 3225a7ce5d..1e07929e7e 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -25,11 +25,12 @@ extern void __libc_init_first (int argc, char **argv, char **envp);
extern int _dl_starting_up;
weak_extern (_dl_starting_up)
extern int __libc_multiple_libcs;
+extern void *__libc_stack_end;
int
__libc_start_main (int (*main) (int, char **, char **), int argc,
char **argv, void (*init) (void), void (*fini) (void),
- void (*rtld_fini) (void))
+ void (*rtld_fini) (void), void *stack_end)
{
#ifndef PIC
/* The next variable is only here to work around a bug in gcc <= 2.7.2.2.
@@ -38,6 +39,9 @@ __libc_start_main (int (*main) (int, char **, char **), int argc,
int *dummy_addr = &_dl_starting_up;
__libc_multiple_libcs = dummy_addr && !_dl_starting_up;
+
+ /* Store the lowest stack address. */
+ __libc_stack_end = stack_end;
#endif
/* Set the global _environ variable correctly. */
diff --git a/sysdeps/generic/sigset-cvt-mask.h b/sysdeps/generic/sigset-cvt-mask.h
new file mode 100644
index 0000000000..749ed5e613
--- /dev/null
+++ b/sysdeps/generic/sigset-cvt-mask.h
@@ -0,0 +1,24 @@
+/* Convert between lowlevel sigmask and libc representation of sigset_t.
+ Generic 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) (*(set) = (unsigned long int) (mask))
+
+#define sigset_get_old_mask(set, mask) ((mask) = (unsigned int) *(set))
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 2f936e3d1e..542c35f190 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -105,8 +105,11 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
if (profile)
{
got[2] = (Elf32_Addr) &_dl_runtime_profile;
- /* Say that we really want profiling and the timers are started. */
- _dl_profile_map = l;
+
+ if (_dl_name_match_p (_dl_profile, l))
+ /* This is the object we are looking for. Say that we really
+ want profiling and the timers are started. */
+ _dl_profile_map = l;
}
else
/* This function will get called to fix up the GOT entry indicated by
@@ -209,6 +212,8 @@ _dl_start_user:\n\
call 0f\n\
0: popl %ebx\n\
addl $_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx\n\
+ # Store the highest stack address\n\
+ movl %esp,__libc_stack_end@GOT(%ebx)\n\
# See if we were run as a command with the executable file\n\
# name as an extra leading argument.\n\
movl _dl_skip_args@GOT(%ebx), %eax\n\
diff --git a/sysdeps/i386/elf/start.S b/sysdeps/i386/elf/start.S
index 95f74ed647..019e749a6f 100644
--- a/sysdeps/i386/elf/start.S
+++ b/sysdeps/i386/elf/start.S
@@ -53,6 +53,11 @@ _start:
boundary to avoid penalties from misaligned accesses. Thanks
to Edward Seidl <seidl@janed.com> for pointing this out. */
andl $0xfffffff8, %esp
+
+ /* Provide the highest stack address to the user code (for stacks
+ which grow downwards). */
+ pushl %esp
+
pushl %edx /* Push address of the shared library
termination function. */
diff --git a/sysdeps/posix/mkstemp.c b/sysdeps/posix/mkstemp.c
index f0db5d5d53..2c9c96bdcc 100644
--- a/sysdeps/posix/mkstemp.c
+++ b/sysdeps/posix/mkstemp.c
@@ -33,7 +33,7 @@ int
mkstemp (template)
char *template;
{
- static const char letters[]
+ static const char letters[62]
= "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
static uint64_t value;
struct timeval tv;
diff --git a/sysdeps/posix/sigvec.c b/sysdeps/posix/sigvec.c
index 12285fad66..cc4839d73f 100644
--- a/sysdeps/posix/sigvec.c
+++ b/sysdeps/posix/sigvec.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,55 +20,20 @@
#include <errno.h>
#include <stddef.h>
+/* Include macros to convert between `sigset_t' and old-style mask. */
+#include "sigset-cvt-mask.h"
/* We use a wrapper handler to support SV_RESETHAND. */
-
-static __sighandler_t wrapped_handlers[NSIG];
-static sigset_t wrapped_masks[NSIG];
-
-static void wrapper_handler __P ((int sig));
-static inline int convert_mask __P ((sigset_t *set, const int mask));
-
-static void
-wrapper_handler (sig)
- int sig;
+struct sigvec_wrapper_data
{
- int save;
- struct sigaction act;
+ __sighandler_t sw_handler;
+ unsigned int sw_mask;
+};
- act.sa_handler = SIG_DFL;
- act.sa_mask = wrapped_masks[sig];
- act.sa_flags = 0;
- save = errno;
- (void) __sigaction (sig, &act, (struct sigaction *) NULL);
- __set_errno (save);
+static void sigvec_wrapper_handler __P ((int sig));
- (*wrapped_handlers[sig]) (sig);
-}
+static struct sigvec_wrapper_data sigvec_wrapper_data[NSIG];
-static inline int
-convert_mask (set, mask)
- sigset_t *set;
- const int mask;
-{
- register int sig;
-
- if (sizeof (*set) == sizeof (mask))
- *(int *) set = mask;
- else if (sizeof (*set) == sizeof (unsigned long int))
- *(unsigned long int *) set = (unsigned int) mask;
- else
- {
- if (__sigemptyset (set) < 0)
- return -1;
-
- for (sig = 1; sig < NSIG && sig <= sizeof (mask) * 8; ++sig)
- if ((mask & sigmask (sig)) && __sigaddset (set, sig) < 0)
- return -1;
- }
-
- return 0;
-}
/* If VEC is non-NULL, set the handler for SIG to the `sv_handler' member
of VEC. The signals in `sv_mask' will be blocked while the handler runs.
@@ -91,25 +56,32 @@ __sigvec (sig, vec, ovec)
n = NULL;
else
{
- n = &new;
- n->sa_handler = vec->sv_handler;
- if (convert_mask (&n->sa_mask, vec->sv_mask) < 0)
- return -1;
- n->sa_flags = 0;
-
- if (vec->sv_flags & SV_ONSTACK)
+ __sighandler_t handler;
+ unsigned int mask;
+ unsigned int sv_flags;
+ unsigned int sa_flags;
+
+ handler = vec->sv_handler;
+ mask = vec->sv_mask;
+ sv_flags = vec->sv_flags;
+ sa_flags = 0;
+ if (sv_flags & SV_ONSTACK)
{
#ifdef SA_ONSTACK
- n->sa_flags |= SA_ONSTACK;
+ sa_flags |= SA_ONSTACK;
#else
__set_errno (ENOSYS);
return -1;
#endif
}
#ifdef SA_RESTART
- if (!(vec->sv_flags & SV_INTERRUPT))
- n->sa_flags |= SA_RESTART;
+ if (!(sv_flags & SV_INTERRUPT))
+ sa_flags |= SA_RESTART;
#endif
+ n = &new;
+ new.sa_handler = handler;
+ sigset_set_old_mask (&new.sa_mask, mask);
+ new.sa_flags = sa_flags;
}
if (__sigaction (sig, n, &old) < 0)
@@ -117,12 +89,18 @@ __sigvec (sig, vec, ovec)
}
else
{
+ __sighandler_t handler;
+ unsigned int mask;
+ struct sigvec_wrapper_data *data;
struct sigaction wrapper;
- wrapper.sa_handler = wrapper_handler;
- wrapped_handlers[sig] = vec->sv_handler;
- if (convert_mask (&wrapped_masks[sig], vec->sv_mask) < 0)
- return -1;
+ handler = vec->sv_handler;
+ mask = (unsigned int)vec->sv_mask;
+ data = &sigvec_wrapper_data[sig];
+ wrapper.sa_handler = sigvec_wrapper_handler;
+ /* FIXME: should we set wrapper.sa_mask, wrapper.sa_flags?? */
+ data->sw_handler = handler;
+ data->sw_mask = mask;
if (__sigaction (sig, &wrapper, &old) < 0)
return -1;
@@ -130,38 +108,58 @@ __sigvec (sig, vec, ovec)
if (ovec != NULL)
{
- register int i;
- int mask = 0;
-
- if (sizeof (int) == sizeof (sigset_t))
- mask = *(int *) &old.sa_mask;
- else if (sizeof (unsigned long int) == sizeof (sigset_t))
- mask = *(unsigned long int *) &old.sa_mask;
- else
- for (i = 1; i < NSIG && i <= sizeof (mask) * 8; ++i)
- if (__sigismember (&old.sa_mask, i))
- mask |= sigmask (i);
-
- ovec->sv_mask = mask;
- ovec->sv_flags = 0;
+ __sighandler_t handler;
+ unsigned int sv_flags;
+ unsigned int sa_flags;
+ unsigned int mask;
+
+ handler = old.sa_handler;
+ sv_flags = 0;
+ sa_flags = old.sa_flags;
+ if (handler == sigvec_wrapper_handler)
+ {
+ handler = sigvec_wrapper_data[sig].sw_handler;
+ /* should we use data->sw_mask?? */
+ sv_flags |= SV_RESETHAND;
+ }
+ sigset_get_old_mask (&old.sa_mask, mask);
#ifdef SA_ONSTACK
- if (old.sa_flags & SA_ONSTACK)
- ovec->sv_flags |= SV_ONSTACK;
+ if (sa_flags & SA_ONSTACK)
+ sv_flags |= SV_ONSTACK;
#endif
#ifdef SA_RESTART
- if (!(old.sa_flags & SA_RESTART))
+ if (!(sa_flags & SA_RESTART))
#endif
- ovec->sv_flags |= SV_INTERRUPT;
- if (old.sa_handler == wrapper_handler)
- {
- ovec->sv_flags |= SV_RESETHAND;
- ovec->sv_handler = wrapped_handlers[sig];
- }
- else
- ovec->sv_handler = old.sa_handler;
+ sv_flags |= SV_INTERRUPT;
+ ovec->sv_handler = handler;
+ ovec->sv_mask = (int)mask;
+ ovec->sv_flags = (int)sv_flags;
}
return 0;
}
weak_alias (__sigvec, sigvec)
+
+
+static void
+sigvec_wrapper_handler (sig)
+ int sig;
+{
+ struct sigvec_wrapper_data *data;
+ unsigned int mask;
+ struct sigaction act;
+ int save;
+ __sighandler_t handler;
+
+ data = &sigvec_wrapper_data[sig];
+ mask = data->sw_mask;
+ act.sa_handler = SIG_DFL;
+ sigset_set_old_mask (&act.sa_mask, mask);
+ act.sa_flags = 0;
+ save = errno;
+ handler = data->sw_handler;
+ (void) __sigaction (sig, &act, (struct sigaction *) NULL);
+ __set_errno (save);
+ (*handler) (sig);
+}
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])
diff --git a/sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h b/sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h
new file mode 100644
index 0000000000..4daab22bc5
--- /dev/null
+++ b/sysdeps/unix/sysv/sysv4/sigset-cvt-mask.h
@@ -0,0 +1,33 @@
+/* Convert between lowlevel sigmask and libc representation of sigset_t.
+ SysVr4 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; \
+ __ptr = &(set)->__sigbits[0]; \
+ __ptr[0] = (mask); \
+ __ptr[1] = 0ul; \
+ __ptr[2] = 0ul; \
+ __ptr[3] = 0ul; \
+ } while (0)
+
+#define sigset_get_old_mask(set, mask) \
+ ((mask) = (unsigned int) (set)->__sigbits[0])