diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 22e6a1fc2a3..53c1b54d84f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-12  David Daney  <ddaney@avtrex.com>
+
+	* configure.host: Enable interpreter for mips64.  Enable hash
+	synchronization for all mips*-*-linux* targets.
+	* sysdep/mips/locks.h (compare_and_swap, compare_and_swap_release) Use
+	__sync_bool_compare_and_swap instead of in-line asm.
+	(release_set, read_barrier, write_barrier): Use __sync_synchronize
+	instead of in-line asm.
+
 2007-09-09  Andreas Tobler  <a.tobler@schweiz.org>
 
 	PR libgcj/33326
diff --git a/libjava/configure.host b/libjava/configure.host
index 192272d8c26..7fcfc3934d1 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -98,7 +98,7 @@ case "${host}" in
  	enable_java_net_default=no
  	enable_getenv_properties_default=no
 	;;
-  mipsel-*|mips-*)
+  mips*-*)
 	libgcj_interpreter=yes
 	;;
   i686-*|i586-*|i486-*|i386-*)
@@ -283,11 +283,7 @@ EOF
   	sysdeps_dir=mips
   	can_unwind_signal=yes
 	DIVIDESPEC=-fno-use-divide-subroutine
-	case "${host}" in
-	    mipsel*-linux* | mipsisa32el*-linux*)
-		enable_hash_synchronization_default=yes
-	    ;;
-	esac
+	enable_hash_synchronization_default=yes
 	;;
   powerpc*-*-darwin*)
 	enable_hash_synchronization_default=yes
diff --git a/libjava/sysdep/mips/locks.h b/libjava/sysdep/mips/locks.h
index 80509cadbbd..c8e30cf6888 100644
--- a/libjava/sysdep/mips/locks.h
+++ b/libjava/sysdep/mips/locks.h
@@ -22,29 +22,9 @@ typedef unsigned obj_addr_t __attribute__((__mode__(__pointer__)));
 inline static bool
 compare_and_swap(volatile obj_addr_t *addr,
                  obj_addr_t old,
-                 obj_addr_t new_val) 
+                 obj_addr_t new_val)
 {
-  long result;
-  __asm__ __volatile__(".set\tpush\n\t"
-                       ".set\tnoreorder\n\t"
-                       ".set\tnomacro\n\t"
-                       "1:\n\t"
-#if _MIPS_SIM == _ABIO32
-                       ".set\tmips2\n\t"
-#endif
-                       "ll\t%[result],0(%[addr])\n\t"
-                       "bne\t%[result],%[old],2f\n\t"
-                       "move\t%[result],$0\n\t"        // delay slot
-                       "move\t%[result],%[new_val]\n\t"
-                       "sc\t%[result],0(%[addr])\n\t"
-                       "beq\t%[result],$0,1b\n\t"
-                       "nop\n\t"                       // delay slot
-                       "2:\n\t"
-                       ".set\tpop"
-          : [result] "=&r" (result)
-          : [addr] "r" (addr), [new_val] "r" (new_val), [old] "r"(old)
-          : "memory");
-  return (bool) result;
+  return __sync_bool_compare_and_swap(addr, old, new_val);
 }
 
 // Set *addr to new_val with release semantics, i.e. making sure
@@ -53,12 +33,7 @@ compare_and_swap(volatile obj_addr_t *addr,
 inline static void
 release_set(volatile obj_addr_t *addr, obj_addr_t new_val)
 {
-  __asm__ __volatile__(".set\tpush\n\t"
-#if _MIPS_SIM == _ABIO32
-                       ".set\tmips2\n\t"
-#endif
-                       "sync\n\t"
-                       ".set\tpop" : : : "memory");
+  __sync_synchronize();
   *(addr) = new_val;
 }
 
@@ -67,16 +42,10 @@ release_set(volatile obj_addr_t *addr, obj_addr_t new_val)
 // implementation can be the same.
 inline static bool
 compare_and_swap_release(volatile obj_addr_t *addr,
-		  				     obj_addr_t old,
-						     obj_addr_t new_val)
+			 obj_addr_t old,
+			 obj_addr_t new_val)
 {
-  __asm__ __volatile__(".set\tpush\n\t"
-#if _MIPS_SIM == _ABIO32
-                       ".set\tmips2\n\t"
-#endif
-                       "sync\n\t"
-                       ".set\tpop" : : : "memory");
-  return compare_and_swap(addr, old, new_val);
+  return __sync_bool_compare_and_swap(addr, old, new_val);
 }
 
 // Ensure that subsequent instructions do not execute on stale
@@ -85,12 +54,7 @@ compare_and_swap_release(volatile obj_addr_t *addr,
 inline static void
 read_barrier()
 {
-  __asm__ __volatile__(".set\tpush\n\t"
-#if _MIPS_SIM == _ABIO32
-                       ".set\tmips2\n\t"
-#endif
-                       "sync\n\t"
-                       ".set\tpop" : : : "memory");
+  __sync_synchronize();
 }
 
 // Ensure that prior stores to memory are completed with respect to other
@@ -98,12 +62,7 @@ read_barrier()
 inline static void
 write_barrier()
 {
-  __asm__ __volatile__(".set\tpush\n\t"
-#if _MIPS_SIM == _ABIO32
-                       ".set\tmips2\n\t"
-#endif
-                       "sync\n\t"
-                       ".set\tpop" : : : "memory");
+  __sync_synchronize();
 }
 
 #endif   // __SYSDEP_LOCKS_H__