From 45d7a972fd9395b7bb23674569d350c2344a47a5 Mon Sep 17 00:00:00 2001
From: andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 7 Jul 2004 18:24:00 +0000
Subject: [PATCH] 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84214 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 13 ++++++++++---
libjava/configure.host | 2 +-
libjava/sysdep/powerpc/locks.h | 24 ++++++++++++------------
3 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8299b732c5bc..3a0ec3e7fcbb 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 d008df1d0010..5971945b70fb 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 c9c3183d6bc7..5a6a945e4947 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");
--
GitLab