resolve merge

2 files changed, 4 insertions, 95 deletions

diff --git a/libpthread/linuxthreads/sysdeps/m68k/pspinlock.c b/libpthread/linuxthreads/sysdeps/m68k/pspinlock.c
deleted file mode 100644
index af77c2a9d..000000000
--- a/libpthread/linuxthreads/sysdeps/m68k/pspinlock.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* POSIX spinlock implementation.  M68k version.
-   Copyright (C) 2000 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; see the file COPYING.LIB.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include "internals.h"
-
-
-int
-__pthread_spin_lock (pthread_spinlock_t *lock)
-{
-  unsigned int val;
-
-  do
-    __asm__ __volatile__ (
-#if !defined(__mcoldfire__) && !defined(__mcf5200__) && !defined(__m68000)
-		"tas %1; sne %0"
-#else
-		"bset #7,%1; sne %0"
-#endif
-		: "=dm" (val), "=m" (*lock)
-		: "m" (*lock)
-		: "cc");
-  while (val);
-
-  return 0;
-}
-weak_alias (__pthread_spin_lock, pthread_spin_lock)
-
-
-int
-__pthread_spin_trylock (pthread_spinlock_t *lock)
-{
-  unsigned int val;
-
-  __asm__ __volatile__ (
-#if !defined(__mcoldfire__) && !defined(__mcf5200__) && !defined(__m68000)
-		"tas %1; sne %0"
-#else
-		"bset #7,%1; sne %0"
-#endif
-		: "=dm" (val), "=m" (*lock)
-		: "m" (*lock)
-		: "cc");
-
-  return val ? EBUSY : 0;
-}
-weak_alias (__pthread_spin_trylock, pthread_spin_trylock)
-
-
-int
-__pthread_spin_unlock (pthread_spinlock_t *lock)
-{
-  return *lock = 0;
-}
-weak_alias (__pthread_spin_unlock, pthread_spin_unlock)
-
-
-int
-__pthread_spin_init (pthread_spinlock_t *lock, int pshared)
-{
-  /* We can ignore the `pshared' parameter.  Since we are busy-waiting
-     all processes which can access the memory location `lock' points
-     to can use the spinlock.  */
-  return *lock = 0;
-}
-weak_alias (__pthread_spin_init, pthread_spin_init)
-
-
-int
-__pthread_spin_destroy (pthread_spinlock_t *lock)
-{
-  /* Nothing to do.  */
-  return 0;
-}
-weak_alias (__pthread_spin_destroy, pthread_spin_destroy)
diff --git a/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h b/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h
index 1eb9fd57b..3be216524 100644
--- a/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h
+++ b/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h
@@ -28,7 +28,6 @@
 #endif
 
 /* Spinlock implementation; required.  */
-PT_EI long int testandset (int *spinlock);
 PT_EI long int
 testandset (int *spinlock)
 {
@@ -36,11 +35,11 @@ testandset (int *spinlock)
 
   __asm__ __volatile__(
 #if !defined(__mcoldfire__) && !defined(__mcf5200__) && !defined(__m68000)
-	"tas %1; sne %0"
+         "tas %1; sne %0"
 #else
-	"bset #7,%1; sne %0"
+         "bset #7,%1; sne %0"
 #endif
-       : "=dm"(ret), "=m"(*spinlock)
+       : "=&dm"(ret), "=m"(*spinlock)
        : "m"(*spinlock)
        : "cc");
 
@@ -71,4 +70,5 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
   return ret;
 }
 #endif
+
 #endif /* pt-machine.h */