From 0ee72c0b1534e16e6240e99f822b2401cfc1dd4d Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 4 Oct 2001 07:38:56 +0000 Subject: Patch from David McCullough : * reduce the sigset types to 32 bits (I've mentioned this before) I think I saw this change go in for another platform anyway ;-) * Do not use _IO_FILE as it clashes with the C++ libraries which know too much about how glibc workds :-( * Do not use _G_va_list for the same reason. * remove the CTORS/DTORS from crt0.S for ARM as the compiler provided crtbegin.o and crtend.o have these (and only these) already in them and you get multiple defined errs :-( --- libc/sysdeps/linux/arm/bits/sigset.h | 76 +++++----------------------------- libc/sysdeps/linux/arm/crt0.S | 2 + libc/sysdeps/linux/sh/bits/sigset.h | 79 +++++------------------------------- 3 files changed, 22 insertions(+), 135 deletions(-) (limited to 'libc/sysdeps') diff --git a/libc/sysdeps/linux/arm/bits/sigset.h b/libc/sysdeps/linux/arm/bits/sigset.h index 7ccadda45..6a516cd29 100644 --- a/libc/sysdeps/linux/arm/bits/sigset.h +++ b/libc/sysdeps/linux/arm/bits/sigset.h @@ -24,11 +24,7 @@ typedef int __sig_atomic_t; /* A `sigset_t' has a bit for each signal. */ -# define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int))) -typedef struct - { - unsigned long int __val[_SIGSET_NWORDS]; - } __sigset_t; +typedef unsigned long __sigset_t; #endif @@ -47,79 +43,27 @@ typedef struct # endif /* Return a mask that includes the bit for SIG only. */ -# define __sigmask(sig) \ - (((unsigned long int) 1) << (((sig) - 1) % (8 * sizeof (unsigned long int)))) - -/* Return the word index for SIG. */ -# define __sigword(sig) (((sig) - 1) / (8 * sizeof (unsigned long int))) +# define __sigmask(sig) (1L << ((sig) - 1)) # if defined __GNUC__ && __GNUC__ >= 2 -# define __sigemptyset(set) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - sigset_t *__set = (set); \ - while (--__cnt >= 0) __set->__val[__cnt] = 0; \ - 0; })) -# define __sigfillset(set) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - sigset_t *__set = (set); \ - while (--__cnt >= 0) __set->__val[__cnt] = ~0UL; \ - 0; })) +# define __sigemptyset(set) (*(set) = 0) +# define __sigfillset(set) (*(set) = ~0) # ifdef __USE_GNU /* The POSIX does not specify for handling the whole signal set in one command. This is often wanted and so we define three more functions here. */ -# define __sigisemptyset(set) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - const sigset_t *__set = (set); \ - int __ret = __set->__val[--__cnt]; \ - while (!__ret && --__cnt >= 0) \ - __ret = __set->__val[__cnt]; \ - __ret == 0; })) -# define __sigandset(dest, left, right) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - sigset_t *__dest = (dest); \ - const sigset_t *__left = (left); \ - const sigset_t *__right = (right); \ - while (--__cnt >= 0) \ - __dest->__val[__cnt] = (__left->__val[__cnt] \ - & __right->__val[__cnt]); \ - 0; })) -# define __sigorset(dest, left, right) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - sigset_t *__dest = (dest); \ - const sigset_t *__left = (left); \ - const sigset_t *__right = (right); \ - while (--__cnt >= 0) \ - __dest->__val[__cnt] = (__left->__val[__cnt] \ - | __right->__val[__cnt]); \ - 0; })) +# define __sigisemptyset(set) (*(set) == 0) +# define __sigandset(dest, left, right) (*(dest) = *(left) & *(right)) +# define __sigorset(dest, left, right) (*(dest) = *(left) | *(right)) # endif # endif /* These functions needn't check for a bogus signal number -- error checking is done in the non __ versions. */ -extern int __sigismember (__const __sigset_t *, int); -extern int __sigaddset (__sigset_t *, int); -extern int __sigdelset (__sigset_t *, int); - -# ifdef __USE_EXTERN_INLINES -# define __SIGSETFN(NAME, BODY, CONST) \ - _EXTERN_INLINE int \ - NAME (CONST __sigset_t *__set, int __sig) \ - { \ - unsigned long int __mask = __sigmask (__sig); \ - unsigned long int __word = __sigword (__sig); \ - return BODY; \ - } - -__SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, __const) -__SIGSETFN (__sigaddset, ((__set->__val[__word] |= __mask), 0), ) -__SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), ) - -# undef __SIGSETFN -# endif - +# define __sigismember(set, sig) (*(set) & (1L << ((sig)-1))) +# define __sigaddset(set, sig) (*(set) |= (1L << ((sig)-1))) +# define __sigdelset(set, sig) (*(set) &= ~(1L << ((sig)-1))) #endif /* ! _SIGSET_H_fns. */ diff --git a/libc/sysdeps/linux/arm/crt0.S b/libc/sysdeps/linux/arm/crt0.S index 01bcb321f..65253881c 100644 --- a/libc/sysdeps/linux/arm/crt0.S +++ b/libc/sysdeps/linux/arm/crt0.S @@ -62,6 +62,7 @@ _start: /* Ok, now run uClibc's main() -- shouldn't return */ bl __uClibc_main +#if 0 /* this is already provided by crtbegin/crtend in the arm-elf compiler */ /* a little bit of stuff to support C++ */ .section .ctors,"aw" .align 4 @@ -74,3 +75,4 @@ __CTOR_LIST__: .global __DTOR_LIST__ __DTOR_LIST__: .long -1 +#endif diff --git a/libc/sysdeps/linux/sh/bits/sigset.h b/libc/sysdeps/linux/sh/bits/sigset.h index de852a8a0..dcdc924c2 100644 --- a/libc/sysdeps/linux/sh/bits/sigset.h +++ b/libc/sysdeps/linux/sh/bits/sigset.h @@ -24,11 +24,7 @@ typedef int __sig_atomic_t; /* A `sigset_t' has a bit for each signal. */ -# define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int))) -typedef struct - { - unsigned long int __val[_SIGSET_NWORDS]; - } __sigset_t; +typedef unsigned long __sigset_t; #endif @@ -47,82 +43,27 @@ typedef struct # endif /* Return a mask that includes the bit for SIG only. */ -# define __sigmask(sig) \ - (((unsigned long int) 1) << (((sig) - 1) % (8 * sizeof (unsigned long int)))) - -/* Return the word index for SIG. */ -# define __sigword(sig) (((sig) - 1) / (8 * sizeof (unsigned long int))) +# define __sigmask(sig) (1L << ((sig) - 1)) # if defined __GNUC__ && __GNUC__ >= 2 -# define __sigemptyset(set) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - sigset_t *__set = (set); \ - while (--__cnt >= 0) __set->__val[__cnt] = 0; \ - 0; })) -# define __sigfillset(set) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - sigset_t *__set = (set); \ - while (--__cnt >= 0) __set->__val[__cnt] = ~0UL; \ - 0; })) +# define __sigemptyset(set) (*(set) = 0) +# define __sigfillset(set) (*(set) = ~0) # ifdef __USE_GNU /* The POSIX does not specify for handling the whole signal set in one command. This is often wanted and so we define three more functions here. */ -# define __sigisemptyset(set) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - const sigset_t *__set = (set); \ - int __ret = __set->__val[--__cnt]; \ - while (!__ret && --__cnt >= 0) \ - __ret = __set->__val[__cnt]; \ - __ret == 0; })) -# define __sigandset(dest, left, right) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - sigset_t *__dest = (dest); \ - const sigset_t *__left = (left); \ - const sigset_t *__right = (right); \ - while (--__cnt >= 0) \ - __dest->__val[__cnt] = (__left->__val[__cnt] \ - & __right->__val[__cnt]); \ - 0; })) -# define __sigorset(dest, left, right) \ - (__extension__ ({ int __cnt = _SIGSET_NWORDS; \ - sigset_t *__dest = (dest); \ - const sigset_t *__left = (left); \ - const sigset_t *__right = (right); \ - while (--__cnt >= 0) \ - __dest->__val[__cnt] = (__left->__val[__cnt] \ - | __right->__val[__cnt]); \ - 0; })) +# define __sigisemptyset(set) (*(set) == 0) +# define __sigandset(dest, left, right) (*(dest) = *(left) & *(right)) +# define __sigorset(dest, left, right) (*(dest) = *(left) | *(right)) # endif # endif -__BEGIN_DECLS - /* These functions needn't check for a bogus signal number -- error checking is done in the non __ versions. */ -extern int __sigismember (__const __sigset_t *, int); -extern int __sigaddset (__sigset_t *, int); -extern int __sigdelset (__sigset_t *, int); - -# ifdef __USE_EXTERN_INLINES -# define __SIGSETFN(NAME, BODY, CONST) \ - _EXTERN_INLINE int \ - NAME (CONST __sigset_t *__set, int __sig) \ - { \ - unsigned long int __mask = __sigmask (__sig); \ - unsigned long int __word = __sigword (__sig); \ - return BODY; \ - } - -__SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, __const) -__SIGSETFN (__sigaddset, ((__set->__val[__word] |= __mask), 0), ) -__SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), ) - -# undef __SIGSETFN -# endif - -__END_DECLS +# define __sigismember(set, sig) (*(set) & (1L << ((sig)-1))) +# define __sigaddset(set, sig) (*(set) |= (1L << ((sig)-1))) +# define __sigdelset(set, sig) (*(set) &= ~(1L << ((sig)-1))) #endif /* ! _SIGSET_H_fns. */ -- cgit v1.2.3