Revert "resolve merge"

This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344.

1 files changed, 4 insertions, 17 deletions

diff --git a/libpthread/linuxthreads/sysdeps/cris/pt-machine.h b/libpthread/linuxthreads/sysdeps/cris/pt-machine.h
index a89579ee0..9b2acb761 100644
--- a/libpthread/linuxthreads/sysdeps/cris/pt-machine.h
+++ b/libpthread/linuxthreads/sysdeps/cris/pt-machine.h
@@ -14,8 +14,9 @@
    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/>.  */
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, see <http://www.gnu.org/licenses/>.  */
+
 #ifndef _PT_MACHINE_H
 #define _PT_MACHINE_H   1
 
@@ -32,19 +33,6 @@ testandset (int *spinlock)
 
   /* Note the use of a dummy output of *spinlock to expose the write.  The
      memory barrier is to stop *other* writes being moved past this code.  */
-
-#ifdef __arch_v32
-  __asm__ __volatile__("clearf p\n"
-		       "0:\n\t"
-		       "movu.b [%2],%0\n\t"
-		       "ax\n\t"
-		       "move.b %3,[%2]\n\t"
-		       "bcs 0b\n\t"
-		       "clearf p"
-		       : "=&r" (ret), "=m" (*spinlock)
-		       : "r" (spinlock), "r" ((int) 1), "m" (*spinlock)
-		       : "memory");
-#else  /* not __arch_v32 */
   __asm__ __volatile__("clearf\n"
 		       "0:\n\t"
 		       "movu.b [%2],%0\n\t"
@@ -53,9 +41,8 @@ testandset (int *spinlock)
 		       "bwf 0b\n\t"
 		       "clearf"
 		       : "=&r" (ret), "=m" (*spinlock)
-		       : "r" (spinlock), "r" ((int) 1), "m" (*spinlock)
+		       : "r" (spinlock), "r" ((int) 1)
 		       : "memory");
-#endif /* __arch_v32 */
   return ret;
 }