[commits] r664 - in /fsf/trunk/ports: ./ sysdeps/hppa/nptl/ sysdeps/unix/sysv/linux/hppa/bits/ sysdeps/unix/sysv/linux/hppa/nptl/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Nov 12 00:01:52 2006
New Revision: 664

Log:
Import glibc-ports-mainline for 2006-11-12

Added:
    fsf/trunk/ports/sysdeps/hppa/nptl/pthread_spin_init.c
Modified:
    fsf/trunk/ports/ChangeLog.hppa
    fsf/trunk/ports/sysdeps/hppa/nptl/pthread_spin_unlock.c
    fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h

Modified: fsf/trunk/ports/ChangeLog.hppa
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- fsf/trunk/ports/ChangeLog.hppa (original)
+++ fsf/trunk/ports/ChangeLog.hppa Sun Nov 12 00:01:52 2006
@@ -1,3 +1,16 @@
+2006-11-10  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/hppa/nptl/pthread_spin_init.c: New file.
+	* sysdeps/hppa/nptl/pthread_spin_unlock.c: Remove strong alias
+	to pthread_spin_init.
+	* sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h: Define
+	RTLD_SINGLE_THREAD_P.
+
+2006-09-20  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (splice): Add offin
+	and offout arguments to the prototype. =

+
 2006-09-15  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 =

 	* sysdeps/hppa/nptl/tcb-offsets.sym: Define TID_THREAD_OFFSET.

Added: fsf/trunk/ports/sysdeps/hppa/nptl/pthread_spin_init.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- fsf/trunk/ports/sysdeps/hppa/nptl/pthread_spin_init.c (added)
+++ fsf/trunk/ports/sysdeps/hppa/nptl/pthread_spin_init.c Sun Nov 12 00:01:=
52 2006
@@ -1,0 +1,29 @@
+/* Copyright (C) 2006 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.  */
+
+#include "pthreadP.h"
+
+int
+pthread_spin_init (pthread_spinlock_t *lock, int pshared)
+{
+  int tmp =3D 0;
+  /* This should be a memory barrier to newer compilers */
+  __asm__ __volatile__ ("stw,ma %1,0(%0)"
+                        : : "r" (lock), "r" (tmp) : "memory");           =

+  return 0;
+}

Modified: fsf/trunk/ports/sysdeps/hppa/nptl/pthread_spin_unlock.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- fsf/trunk/ports/sysdeps/hppa/nptl/pthread_spin_unlock.c (original)
+++ fsf/trunk/ports/sysdeps/hppa/nptl/pthread_spin_unlock.c Sun Nov 12 00:0=
1:52 2006
@@ -16,21 +16,14 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 =

-/* Ugly hack to avoid the declaration of pthread_spin_init.  */
-#define pthread_spin_init pthread_spin_init_XXX
 #include "pthreadP.h"
-#undef pthread_spin_init
 =

 int
 pthread_spin_unlock (pthread_spinlock_t *lock)
 {
-#if 0
-  volatile unsigned int *a =3D __ldcw_align (lock);
-#endif
   int tmp =3D 0;
   /* This should be a memory barrier to newer compilers */
   __asm__ __volatile__ ("stw,ma %1,0(%0)"
                         : : "r" (lock), "r" (tmp) : "memory");           =

   return 0;
 }
-strong_alias (pthread_spin_unlock, pthread_spin_init)

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h Sun Nov 12 00=
:01:52 2006
@@ -210,7 +210,8 @@
 		     unsigned int __flags);
 =

 /* Splice two files together.  */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __f=
lags)
+extern int splice (int __fdin, __off64_t *offin, int __fdout, =

+		   __off64_t *__offout, size_t __len, unsigned int __flags)
     __THROW;
 =

 /* In-kernel implementation of tee for pipe buffers.  */

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h (orig=
inal)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h Sun N=
ov 12 00:01:52 2006
@@ -212,4 +212,11 @@
 # define NO_CANCELLATION 1
 =

 #endif
-/* !defined NOT_IN_libc || defined IS_IN_libpthread */
+/* !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt=
 */
+
+#ifndef __ASSEMBLER__
+# define RTLD_SINGLE_THREAD_P \
+  __builtin_expect (THREAD_GETMEM (THREAD_SELF, \
+				   header.multiple_threads) =3D=3D 0, 1)
+#endif
+