diff options
| -rw-r--r-- | libjava/ChangeLog | 13 | ||||
| -rw-r--r-- | libjava/configure.host | 2 | ||||
| -rw-r--r-- | libjava/sysdep/powerpc/locks.h | 24 |
3 files changed, 23 insertions, 16 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8299b73..3a0ec3e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,10 +1,17 @@ +2004-07-07 Andreas Tobler <a.tobler@schweiz.ch> + + * configure.host: Enable hash synchronization on Darwin. + * sysdep/powerpc/locks.h (compare_and_swap): Use '\n' instead of + ';', since this is a comment on Darwin. + (compare_and_swap_release): Likewise. + 2004-07-06 Mohan Embar <gnustuff@thisiscool.com> * java/net/URLStreamHandler.java (parseURL): Canonicalize file portion of URL in addition to spec for file: protocol. 2004-07-05 Anthony Green <green@redhat.com> - + * java/io/File.java (toURI): Merge from Classpath. 2004-07-05 Bryce McKinlay <mckinlay@redhat.com> @@ -13,7 +20,7 @@ before passing to URL constructor. Rethrow any MalformedURLException as a RuntimeException. Catch MalformedURLException specifically, not all exceptions. - + 2004-07-05 Bryce McKinlay <mckinlay@redhat.com> * java/util/Locale.java (readObject): Intern strings read from object @@ -30,7 +37,7 @@ * Makefile.in: Regenerated. 2004-07-03 Mark Wielaard <mark@klomp.org> - Anthony Green <green@redhat.com> + Anthony Green <green@redhat.com> * java/net/URL.java (getFile): Clarify return value doc. (getPath): Return null if file is empty - not empty String. diff --git a/libjava/configure.host b/libjava/configure.host index d008df1..5971945 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -233,7 +233,7 @@ EOF esac ;; powerpc*-*-darwin*) - enable_hash_synchronization_default=no + enable_hash_synchronization_default=yes slow_pthread_self= can_unwind_signal=yes ;; diff --git a/libjava/sysdep/powerpc/locks.h b/libjava/sysdep/powerpc/locks.h index c9c3183..5a6a945 100644 --- a/libjava/sysdep/powerpc/locks.h +++ b/libjava/sysdep/powerpc/locks.h @@ -33,12 +33,12 @@ compare_and_swap (volatile obj_addr_t *addr, obj_addr_t old, int ret; __asm__ __volatile__ ( - "0: " _LARX "%0,0,%1 ;" - " xor. %0,%3,%0;" - " bne 1f;" - " " _STCX "%2,0,%1;" - " bne- 0b;" - "1: " + "0: " _LARX "%0,0,%1 \n" + " xor. %0,%3,%0\n" + " bne 1f\n" + " " _STCX "%2,0,%1\n" + " bne- 0b\n" + "1: \n" : "=&r" (ret) : "r" (addr), "r" (new_val), "r" (old) : "cr0", "memory"); @@ -67,12 +67,12 @@ compare_and_swap_release (volatile obj_addr_t *addr, obj_addr_t old, __asm__ __volatile__ ("sync" : : : "memory"); __asm__ __volatile__ ( - "0: " _LARX "%0,0,%1 ;" - " xor. %0,%3,%0;" - " bne 1f;" - " " _STCX "%2,0,%1;" - " bne- 0b;" - "1: " + "0: " _LARX "%0,0,%1 \n" + " xor. %0,%3,%0\n" + " bne 1f\n" + " " _STCX "%2,0,%1\n" + " bne- 0b\n" + "1: \n" : "=&r" (ret) : "r" (addr), "r" (new_val), "r" (old) : "cr0", "memory"); |