Update.

1998-06-25 19:26  Ulrich Drepper  <drepper@cygnus.com>

	* Makeconfig (CPPFLAGS): Use $($(subdir)-CPPFLAGS) if defined first.
	* locale/Makefile: Define locale-CPPFLAGS instead of redefining
	CPPFLAGS.

	* libc.map: Export __sigaction.

1998-06-25  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/bits/sched.h (CLONE_PTRACE): Add it
	(from Linux 2.1.107).

1998-06-24  Ulrich Drepper  <drepper@cygnus.com>

	* nss/nss_files/files-XXX.c (_nss_files_get,ENTNAME_r): Initialize
	position when file was opened here.
	Reported by Howard Chu <hyc@platinum.com>.

	* sysdeps/generic/glob.c: Also protect FNM_* macros from being
	undefined in a second inclusion.

1998-06-20  Mark Kettenis  <kettenis@phys.uva.nl>

	* sysdeps/mach/hurd/i386/Makefile: New file.
	* sysdeps/mach/hurd/i386/init-first.c [!PIC] (init1): Call
	__libc_init_secure.
	(_hurd_stack_setup): Renamed
	from __libc_init_first.
	(__libc_init_first): New function.
	* sysdeps/mach/hurd/i386/static-start.S: New file.

1998-05-30  Mark Kettenis  <kettenis@phys.uva.nl>

	* sysdeps/mach/hurd/i386/init-first.c

1998-06-22  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* grp/initgroups.c: Use _CALL_DL_FCT.

1998-06-23  Mark Kettenis  <kettenis@phys.uva.nl>

	* elf/dl-load.c (_dl_map_object_from_fd): Add missing cast.

3 files changed, 74 insertions, 5 deletions

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 2f1f4f566b..2bbeb928e9 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -20,8 +20,7 @@
 	* sysdeps/pthread/pthread.h: Likewise.
 	Patches by Xavier leroy.
 
-	* sysdeps/i386/pt-machine.h: When compiling for i686 don't test for
-	xchgcmp instruction, it is available.
+	* sysdeps/i386/i686/pt-machine.h: New file.
 
 1998-06-25  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h
new file mode 100644
index 0000000000..bb0f0bc8e1
--- /dev/null
+++ b/linuxthreads/sysdeps/i386/i686/pt-machine.h
@@ -0,0 +1,72 @@
+/* Machine-dependent pthreads configuration and inline functions.
+   i686 version.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Richard Henderson <rth@tamu.edu>.
+
+   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.  */
+
+
+/* Spinlock implementation; required.  */
+extern inline int
+testandset (int *spinlock)
+{
+  int ret;
+
+  __asm__ __volatile__("xchgl %0, %1"
+	: "=r"(ret), "=m"(*spinlock)
+	: "0"(1), "m"(*spinlock));
+
+  return ret;
+}
+
+
+/* Get some notion of the current stack.  Need not be exactly the top
+   of the stack, just something somewhere in the current frame.  */
+#define CURRENT_STACK_FRAME  stack_pointer
+register char * stack_pointer __asm__ ("%esp");
+
+
+/* Compare-and-swap for semaphores.  It's always available on i686.  */
+#define HAS_COMPARE_AND_SWAP
+
+extern inline int
+__compare_and_swap (long int *p, long int oldval, long int newval)
+{
+  char ret;
+  long int readval;
+
+  __asm__ __volatile__ ("lock; cmpxchgl %3, %1; sete %0"
+			: "=q" (ret), "=m" (*p), "=a" (readval)
+			: "r" (newval), "m" (*p), "a" (oldval));
+  return ret;
+}
+
+
+extern inline int
+get_eflags (void)
+{
+  int res;
+  __asm__ __volatile__ ("pushfl; popl %0" : "=r" (res) : );
+  return res;
+}
+
+
+extern inline void
+set_eflags (int newflags)
+{
+  __asm__ __volatile__ ("pushl %0; popfl" : : "r" (newflags) : "cc");
+}
diff --git a/linuxthreads/sysdeps/i386/pt-machine.h b/linuxthreads/sysdeps/i386/pt-machine.h
index c2a7d0883f..6723c80bda 100644
--- a/linuxthreads/sysdeps/i386/pt-machine.h
+++ b/linuxthreads/sysdeps/i386/pt-machine.h
@@ -45,9 +45,7 @@ register char * stack_pointer __asm__ ("%esp");
    We test dynamically whether it's available or not. */
 
 #define HAS_COMPARE_AND_SWAP
-#ifndef __i686__
-# define TEST_FOR_COMPARE_AND_SWAP
-#endif
+#define TEST_FOR_COMPARE_AND_SWAP
 
 extern inline int
 __compare_and_swap (long int *p, long int oldval, long int newval)