From adcb550ca6efa4934faece8adc5a40f60f2c03dd Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 21 Oct 1998 15:40:39 +0000 Subject: [PATCH] Update. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/Makefile [subdir=signal] (sysdep_routines): Move definition to... * sysdeps/unix/sysv/linux/alpha/Makefile: ...here... * sysdeps/unix/sysv/linux/arm/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/m68k/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/mips/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/powerpc/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: ...and here. --- ChangeLog | 11 +++ sysdeps/unix/sysv/linux/Makefile | 5 -- sysdeps/unix/sysv/linux/alpha/Makefile | 5 ++ sysdeps/unix/sysv/linux/arm/Makefile | 5 ++ sysdeps/unix/sysv/linux/i386/sigaction.c | 7 +- sysdeps/unix/sysv/linux/i386/sysdep.h | 95 ++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/m68k/Makefile | 5 ++ sysdeps/unix/sysv/linux/mips/Makefile | 2 + sysdeps/unix/sysv/linux/powerpc/Makefile | 4 ++ sysdeps/unix/sysv/linux/sparc/sparc32/Makefile | 5 ++ sysdeps/unix/sysv/linux/sparc/sparc64/Makefile | 4 ++ 11 files changed, 141 insertions(+), 7 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/powerpc/Makefile create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/Makefile diff --git a/ChangeLog b/ChangeLog index 06a52e3..7cdb396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * sysdeps/unix/sysv/linux/xstat64.c: Likewise. * sysdeps/unix/sysv/linux/i386/chown.c: Likewise. * sysdeps/unix/sysv/linux/i386/getgroups.c: Likewise. + * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/i386/setfsgid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setfsuid.c: Likewise. * sysdeps/unix/sysv/linux/i386/setgid.c: Likewise. @@ -61,6 +62,16 @@ * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: ...and here... * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: ...and here. + * sysdeps/unix/sysv/linux/Makefile [subdir=signal] (sysdep_routines): + Move definition to... + * sysdeps/unix/sysv/linux/alpha/Makefile: ...here... + * sysdeps/unix/sysv/linux/arm/syscalls.list: ...and here... + * sysdeps/unix/sysv/linux/m68k/syscalls.list: ...and here... + * sysdeps/unix/sysv/linux/mips/syscalls.list: ...and here... + * sysdeps/unix/sysv/linux/powerpc/syscalls.list: ...and here... + * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: ...and here... + * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: ...and here. + * sysdeps/unix/sysv/linux/i386/Makefile [subdir=misc] (sysdep_routines): Remove s_pread64 and s_pwrite64. diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 1430bfa..467b9e2 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -89,11 +89,6 @@ endif # Don't compile the ctype glue code, since there is no old non-GNU C library. inhibit-glue = yes -ifeq ($(subdir),signal) -sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ - rt_sigqueueinfo rt_sigaction rt_sigpending -endif - ifeq ($(subdir),dirent) sysdep_routines += getdents64 endif diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile index e03c31e..b62a871 100644 --- a/sysdeps/unix/sysv/linux/alpha/Makefile +++ b/sysdeps/unix/sysv/linux/alpha/Makefile @@ -15,3 +15,8 @@ sysdep_routines += osf_select osf_gettimeofday osf_settimeofday \ CFLAGS-ioperm.c = -Wa,-mev6 endif + +ifeq ($(subdir),signal) +sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ + rt_sigqueueinfo rt_sigaction rt_sigpending +endif diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile index e65a5c1..cebaa94 100644 --- a/sysdeps/unix/sysv/linux/arm/Makefile +++ b/sysdeps/unix/sysv/linux/arm/Makefile @@ -1,3 +1,8 @@ ifeq ($(subdir),misc) sysdep_routines += setfsgid setfsuid setresgid setresuid endif + +ifeq ($(subdir),signal) +sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ + rt_sigqueueinfo rt_sigaction rt_sigpending +endif diff --git a/sysdeps/unix/sysv/linux/i386/sigaction.c b/sysdeps/unix/sysv/linux/i386/sigaction.c index 0110a80..ab19246 100644 --- a/sysdeps/unix/sysv/linux/i386/sigaction.c +++ b/sysdeps/unix/sysv/linux/i386/sigaction.c @@ -22,6 +22,9 @@ #include #include +#include +#include + /* The difference here is that the sigaction structure used in the kernel is not the same as we use in the libc. Therefore we must translate it here. */ @@ -62,8 +65,8 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact) /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ - result = __syscall_rt_sigaction (sig, act ? &kact : NULL, - oact ? &koact : NULL, _NSIG / 8); + result = INLINE_SYSCALL (rt_sigaction, 4, sig, act ? &kact : NULL, + oact ? &koact : NULL, _NSIG / 8); if (result >= 0 || errno != ENOSYS) { diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index f9c70f4..2120f28 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -198,6 +198,101 @@ #define _DOARGS_5(n) movl n(%esp), %edi; _DOARGS_4 (n-4) #define _POPARGS_5 _POPARGS_4; popl %edi +#else /* !__ASSEMBLER__ */ + +/* Define a macro which expands inline into the wrapper code for a system + call. */ +#undef INLINE_SYSCALL +#define INLINE_SYSCALL(name, nr, args...) \ + ({ \ + unsigned int resultvar; \ + EXTRAVARS_##nr(args) \ + asm volatile ( \ + PUSHARGS_##nr \ + DOARGS_##nr \ + "int $0x80\n\t" \ + POPARGS_##nr \ + : "=a" (resultvar) \ + ASMFMT_##nr(args) \ + "i" (__NR_##name) : "memory", "cc"); \ + if (resultvar >= 0xfffff001) \ + { \ + __set_errno (-resultvar); \ + resultvar = 0xffffffff; \ + } \ + (int) resultvar; }) + + +#define PUSHARGS_0 /* Nothing */ +#define DOARGS_0 "movl %1, %%eax\n\t" +#define POPARGS_0 /* Nothing */ +#define _PUSHARGS_0 /* Nothing */ +#define _DOARGS_0 /* Nothing */ +#define _POPARGS_0 /* Nothing */ +#define ASMFMT_0() : +#define EXTRAVARS_0() /* Nothing */ + +#define PUSHARGS_1 "xchgl %%ebx, %%edx\n\t" _PUSHARGS_0 +#define DOARGS_1 _DOARGS_0 "movl %3, %%eax\n\t" +#define POPARGS_1 _POPARGS_0 "xchgl %%edx, %%ebx" +#define _PUSHARGS_1 _PUSHARGS_0 "pushl %%ebx\n\t" +#define _DOARGS_1 "movl %3, %%ebx\n\t" _DOARGS_0 +#define _POPARGS_1 "popl %%ebx\n\t" _POPARGS_0 +#define ASMFMT_1(arg1) \ + , "=d" (use_edx) : "1" (arg1), +#define EXTRAVARS_1(arg1) \ + unsigned long int use_edx; + +#define PUSHARGS_2 PUSHARGS_1 +#define DOARGS_2 _DOARGS_0 "movl %5, %%eax\n\t" +#define POPARGS_2 POPARGS_1 +#define _PUSHARGS_2 _PUSHARGS_1 +#define _DOARGS_2 _DOARGS_1 +#define _POPARGS_2 _POPARGS_1 +#define ASMFMT_2(arg1, arg2) \ + , "=&d" (use_edx), "=c" (use_ecx) : "1" (arg1), "2" (use_ecx), +#define EXTRAVARS_2(arg1, arg2) \ + unsigned long int use_ecx = (unsigned long int) (arg2), use_edx; + +#define PUSHARGS_3 _PUSHARGS_3 +#define DOARGS_3 _DOARGS_3 "movl %6, %%eax\n\t" +#define POPARGS_3 _POPARGS_3 +#define _PUSHARGS_3 _PUSHARGS_2 +#define _DOARGS_3 _DOARGS_2 +#define _POPARGS_3 _POPARGS_2 +#define ASMFMT_3(arg1, arg2, arg3) \ + , "=d" (use_edx), "=c" (use_ecx) \ + : "0" (arg1), "2" (use_ecx), "1" (use_edx), +#define EXTRAVARS_3(arg1, arg2, arg3) \ + unsigned long int use_ecx = (unsigned long int) (arg2); \ + unsigned long int use_edx = (unsigned long int) (arg3); + +#define PUSHARGS_4 _PUSHARGS_4 +#define DOARGS_4 _DOARGS_4 "movl %7, %%eax\n\t" +#define POPARGS_4 _POPARGS_4 +#define _PUSHARGS_4 _PUSHARGS_3 +#define _DOARGS_4 _DOARGS_3 +#define _POPARGS_4 _POPARGS_3 +#define ASMFMT_4(arg1, arg2, arg3, arg4) \ + , "=d" (use_edx), "=c" (use_ecx) \ + : "0" (arg1), "2" (use_ecx), "1" (use_edx), "S" (arg4), +#define EXTRAVARS_4(arg1, arg2, arg3, arg4) \ + unsigned long int use_ecx = (unsigned long int) (arg2); \ + unsigned long int use_edx = (unsigned long int) (arg3); + +#define PUSHARGS_5 _PUSHARGS_5 +#define DOARGS_5 _DOARGS_5 "movl %8, %%eax\n\t" +#define POPARGS_5 _POPARGS_5 +#define _PUSHARGS_5 PUSHARGS_4 +#define _DOARGS_5 _DOARGS_4 +#define _POPARGS_5 _POPARGS_4 +#define ASMFMT_5(arg1, arg2, arg3, arg4, arg5) \ + , "=d" (use_edx), "=c" (use_ecx) \ + : "0" (arg1), "2" (use_ecx), "1" (use_edx), "S" (arg4), "D" (arg5), +#define EXTRAVARS_5(arg1, arg2, arg3, arg4, arg5) \ + unsigned long int use_ecx = (unsigned long int) (arg2); \ + unsigned long int use_edx = (unsigned long int) (arg3); + #endif /* __ASSEMBLER__ */ #endif /* linux/i386/sysdep.h */ diff --git a/sysdeps/unix/sysv/linux/m68k/Makefile b/sysdeps/unix/sysv/linux/m68k/Makefile index 7e46d51..8741550 100644 --- a/sysdeps/unix/sysv/linux/m68k/Makefile +++ b/sysdeps/unix/sysv/linux/m68k/Makefile @@ -11,3 +11,8 @@ ifeq ($(subdir),elf) sysdep-others += lddlibc4 install-bin += lddlibc4 endif + +ifeq ($(subdir),signal) +sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ + rt_sigqueueinfo rt_sigaction rt_sigpending +endif diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index e6240ea..5d3e280 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -1,4 +1,6 @@ ifeq ($(subdir),signal) +sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ + rt_sigqueueinfo rt_sigaction rt_sigpending #sysdep_routines += sigsuspend endif diff --git a/sysdeps/unix/sysv/linux/powerpc/Makefile b/sysdeps/unix/sysv/linux/powerpc/Makefile new file mode 100644 index 0000000..9d02ace --- /dev/null +++ b/sysdeps/unix/sysv/linux/powerpc/Makefile @@ -0,0 +1,4 @@ +ifeq ($(subdir),signal) +sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ + rt_sigqueueinfo rt_sigaction rt_sigpending +endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile index 5ba1ccd..db33fc3 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile @@ -10,3 +10,8 @@ ifeq ($(subdir),elf) CFLAGS-rtld.c += -mv8 #rtld-routines += dl-sysdepsparc endif # elf + +ifeq ($(subdir),signal) +sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ + rt_sigqueueinfo rt_sigaction rt_sigpending +endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile new file mode 100644 index 0000000..9d02ace --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile @@ -0,0 +1,4 @@ +ifeq ($(subdir),signal) +sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ + rt_sigqueueinfo rt_sigaction rt_sigpending +endif -- 2.7.4