+2004-05-05 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/alpha/atomicity.h: Remove.
+ * sysdeps/generic/atomicity.h: Remove.
+
+2004-05-05 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sysdeps/i386/i486/bits/string.h (strpbrk): Cast return to
+ char *.
+
2004-04-22 David Mosberger <davidm@hpl.hp.com>
* sysdeps/unix/sysv/linux/ia64/Makefile (librt-routines): Mention
+++ /dev/null
-/* Low-level functions for atomic operations. Alpha version.
- Copyright (C) 1999 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _ATOMICITY_H
-#define _ATOMICITY_H 1
-
-#include <inttypes.h>
-
-
-static inline int
-__attribute__ ((unused))
-exchange_and_add (volatile uint32_t *mem, int val)
-{
- register int result, tmp;
-
- __asm__ __volatile__ (
- "/* Inline exchange & add */\n"
- "1:\t"
- "ldl_l %0,%3\n\t"
- "addl %0,%4,%1\n\t"
- "stl_c %1,%2\n\t"
- "beq %1,2f\n"
- ".subsection 1\n"
- "2:\t"
- "br 1b\n"
- ".previous\n\t"
- "mb\n\t"
- "/* End exchange & add */"
- : "=&r"(result), "=&r"(tmp), "=m"(*mem)
- : "m" (*mem), "r"(val));
-
- return result;
-}
-
-static inline void
-__attribute__ ((unused))
-atomic_add (volatile uint32_t *mem, int val)
-{
- register int result;
-
- __asm__ __volatile__ (
- "/* Inline exchange & add */\n"
- "1:\t"
- "ldl_l %0,%2\n\t"
- "addl %0,%3,%0\n\t"
- "stl_c %0,%1\n\t"
- "beq %0,2f\n\t"
- ".subsection 1\n"
- "2:\t"
- "br 1b\n"
- ".previous\n\t"
- "mb\n\t"
- "/* End exchange & add */"
- : "=&r"(result), "=m"(*mem)
- : "m" (*mem), "r"(val));
-}
-
-static inline long
-__attribute__ ((unused))
-compare_and_swap (volatile long int *p, long int oldval, long int newval)
-{
- long int ret;
-
- __asm__ __volatile__ (
- "/* Inline compare & swap */\n"
- "1:\t"
- "ldq_l %0,%4\n\t"
- "cmpeq %0,%2,%0\n\t"
- "beq %0,3f\n\t"
- "mov %3,%0\n\t"
- "stq_c %0,%1\n\t"
- "beq %0,2f\n\t"
- ".subsection 1\n"
- "2:\t"
- "br 1b\n"
- ".previous\n\t"
- "3:\t"
- "mb\n\t"
- "/* End compare & swap */"
- : "=&r"(ret), "=m"(*p)
- : "r"(oldval), "r"(newval), "m"(*p));
-
- return ret;
-}
-
-#endif /* atomicity.h */
+++ /dev/null
-/* Low-level functions for atomic operations. Stub version.
- Copyright (C) 1997,2001 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _ATOMICITY_H
-#define _ATOMICITY_H 1
-
-#include <inttypes.h>
-
-#warning stub atomicity functions are not atomic
-
-static inline int
-__attribute__ ((unused))
-exchange_and_add (volatile uint32_t *mem, int val)
-{
- int result = *mem;
- *mem += val;
- return result;
-}
-
-static inline void
-__attribute__ ((unused))
-atomic_add (volatile uint32_t *mem, int val)
-{
- *mem += val;
-}
-
-static inline int
-__attribute__ ((unused))
-compare_and_swap (volatile long int *p, long int oldval, long int newval)
-{
- if (*p != oldval)
- return 0;
-
- *p = newval;
- return 1;
-}
-
-#endif /* atomicity.h */
/* Optimized, inlined string functions. i486 version.
- Copyright (C) 1997,1998,1999,2000,2001,2002,2003
+ Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004
Free Software Foundation, Inc.
This file is part of the GNU C Library.
#define strpbrk(s, accept) \
(__extension__ (__builtin_constant_p (accept) && sizeof ((accept)[0]) == 1 \
? ((accept)[0] == '\0' \
- ? ((void) (s), NULL) \
+ ? ((void) (s), (char *) 0) \
: ((accept)[1] == '\0' \
? strchr ((s), (accept)[0]) \
: __strpbrk_cg ((s), (accept), strlen (accept)))) \
projects / external / glibc.git / commitdiff