diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/Dist | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/Versions | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/_test_and_set.c | 30 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/sys/tas.h | 76 |
6 files changed, 128 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index e00bd9d6b1..29d210eff1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-07-12 Maciej W. Rozycki <macro@ds2.pg.gda.pl> + + * sysdeps/unix/sysv/linux/mips/Dist: Add sys/tas.h. + * sysdeps/unix/sysv/linux/mips/Makefile (sysdep_routines): Add + _test_and_set. + (headers): Add sys/tas.h. + * sysdeps/unix/sysv/linux/mips/Versions: Export _test_and_set for + GLIBC_2.2 from libc. + * sysdeps/unix/sysv/linux/mips/_test_and_set.c: New file. + * sysdeps/unix/sysv/linux/mips/sys/tas.h: New file for + _test_and_set. + 2000-07-28 Andreas Jaeger <aj@suse.de> * sysdeps/gnu/netinet/tcp.h: Add TCP options from Linux 2.4. @@ -9,7 +21,7 @@ * dlfcn/tst-dladdr.c: New file. Based on a test by Volkmar Sieh <vs@caldera.de>. - + 2000-07-27 Jes Sorensen <jes@linuxcare.com> * sysdeps/unix/sysv/linux/ia64/syscalls.list: Add truncate(64) and diff --git a/sysdeps/unix/sysv/linux/mips/Dist b/sysdeps/unix/sysv/linux/mips/Dist index 576aef8046..4675db6793 100644 --- a/sysdeps/unix/sysv/linux/mips/Dist +++ b/sysdeps/unix/sysv/linux/mips/Dist @@ -1,10 +1,11 @@ clone.S +entry.h kernel_sigaction.h kernel_stat.h kernel_termios.h -entry.h -xstatconv.c sys/acct.h sys/cachectl.h sys/procfs.h sys/sysmips.h +sys/tas.h +xstatconv.c diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index 41451ca7d1..65365e129a 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -5,7 +5,7 @@ sysdep_routines += rt_sigsuspend rt_sigprocmask rt_sigtimedwait \ endif ifeq ($(subdir),misc) -sysdep_routines += cachectl cacheflush sysmips +sysdep_routines += cachectl cacheflush sysmips _test_and_set -headers += sys/cachectl.h sys/sysmips.h +headers += sys/cachectl.h sys/sysmips.h sys/tas.h endif diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions index b5cb918d9d..d65bf18cb0 100644 --- a/sysdeps/unix/sysv/linux/mips/Versions +++ b/sysdeps/unix/sysv/linux/mips/Versions @@ -14,4 +14,8 @@ libc { # s* sysmips; } + GLIBC_2.2 { + # _* + _test_and_set; + } } diff --git a/sysdeps/unix/sysv/linux/mips/_test_and_set.c b/sysdeps/unix/sysv/linux/mips/_test_and_set.c new file mode 100644 index 0000000000..870b12a142 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/_test_and_set.c @@ -0,0 +1,30 @@ +/* Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Maciej W. Rozycki <macro@ds2.pg.gda.pl>, 2000. + + 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 the real-function versions of all inline functions + defined in sys/tas.h */ + +#include <features.h> + +#define _EXTERN_INLINE +#ifndef __USE_EXTERN_INLINES +# define __USE_EXTERN_INLINES 1 +#endif + +#include "sys/tas.h" diff --git a/sysdeps/unix/sysv/linux/mips/sys/tas.h b/sysdeps/unix/sysv/linux/mips/sys/tas.h new file mode 100644 index 0000000000..b24aabb46a --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/sys/tas.h @@ -0,0 +1,76 @@ +/* Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Maciej W. Rozycki <macro@ds2.pg.gda.pl>, 2000. + + 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. */ + +#ifndef _SYS_TAS_H +#define _SYS_TAS_H 1 + +#include <features.h> +#include <sgidefs.h> +#include <sys/sysmips.h> + +__BEGIN_DECLS + +extern int _test_and_set (int *p, int v) __THROW; + +#ifdef __USE_EXTERN_INLINES + +# ifndef _EXTERN_INLINE +# define _EXTERN_INLINE extern __inline +# endif + +# if (_MIPS_ISA >= _MIPS_ISA_MIPS2) + +_EXTERN_INLINE int +_test_and_set (int *p, int v) __THROW +{ + int r, t; + + __asm__ __volatile__ + ("1:\n\t" + "ll %0,%3\n\t" + ".set push\n\t" + ".set noreorder\n\t" + "beq %0,%4,2f\n\t" + " move %1,%4\n\t" + ".set pop\n\t" + "sc %1,%2\n\t" + "beqz %1,1b\n" + "2:" + : "=&r" (r), "=&r" (t), "=m" (*p) + : "m" (*p), "r" (v) + : "memory"); + + return r; +} + +# else /* !(_MIPS_ISA >= _MIPS_ISA_MIPS2) */ + +_EXTERN_INLINE int +_test_and_set (int *p, int v) __THROW +{ + return sysmips (MIPS_ATOMIC_SET, (int) p, v, 0); +} + +# endif /* !(_MIPS_ISA >= _MIPS_ISA_MIPS2) */ + +#endif /* __USE_EXTERN_INLINES */ + +__END_DECLS + +#endif /* sys/tas.h */ |