Enable java for aarch64

	* configure.ac (aarch64-*-*): Don't disable java.
	* configure: Regenerate.

libjava/:
	* configure.host: Add support for aarch64.
	* sysdep/aarch64/locks.h: New file.

libjava/classpath/:
	* native/fdlibm/ieeefp.h: Add support for aarch64.

From-SVN: r197997

diff --git a/ChangeLog b/ChangeLog
index 2c74fe5887d23c5afdab0ccc0d57cd08c15795cc..965e227cc7af38f5440d6ca797817da33cf6809d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-16  Andreas Schwab  <schwab@suse.de>
+
+       * configure.ac (aarch64-*-*): Don't disable java.
+       * configure: Regenerate.
+
 2013-04-10  Chung-Ju Wu  <jasonwucj@gmail.com>
 
        * MAINTAINERS (Write After Approval): Add myself.

diff --git a/configure b/configure
index d809535ed0aaf58c7746c927c9894a0f1fed8417..e161cada19ea5ed270691d4172d4138675e84d14 100755 (executable)
--- a/configure
+++ b/configure
@@ -3272,6 +3272,8 @@ esac
 
 # Disable Java if libffi is not supported.
 case "${target}" in
+  aarch64-*-*)
+    ;;
   alpha*-*-*)
     ;;
   arm*-*-*)

diff --git a/configure.ac b/configure.ac
index 48ec1aae6b40964a6b231be9227dc1024a4d85bb..bec489fc39518a9113cc31f29f55eb60bb62f0e5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -611,6 +611,8 @@ esac
 
 # Disable Java if libffi is not supported.
 case "${target}" in
+  aarch64-*-*)
+    ;;
   alpha*-*-*)
     ;;
   arm*-*-*)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7ad315ed8b92894d3fca5e65f7be3533c5ee4fd7..ba3bd57a4a61ec48f58ec662c577ca7f17e9bb3e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-16  Andreas Schwab  <schwab@suse.de>
+
+       * configure.host: Add support for aarch64.
+       * sysdep/aarch64/locks.h: New file.
+
 2013-03-12  Andrew John Hughes  <gnu.andrew@redhat.com>
 
        * include/posix-threads.h:

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 62105e2696894570174982257848b42a945a0d7b..63955543ca898f937f57d7e6f1d3b337fffdd8b8 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,7 @@
+2013-04-16  Andreas Schwab  <schwab@suse.de>
+
+       * native/fdlibm/ieeefp.h: Add support for aarch64.
+
 2013-02-21  Jakub Jelinek  <jakub@redhat.com>
 
        PR bootstrap/56258

diff --git a/libjava/classpath/native/fdlibm/ieeefp.h b/libjava/classpath/native/fdlibm/ieeefp.h
index c230bbb3c72aa08ac5fb13e52d74cbcf89f15f05..7ef2ae7e8b70e68fe0e13e33bd63b72b58d82d90 100644 (file)
--- a/libjava/classpath/native/fdlibm/ieeefp.h
+++ b/libjava/classpath/native/fdlibm/ieeefp.h
@@ -4,6 +4,14 @@
 #ifndef __IEEE_BIG_ENDIAN
 #ifndef __IEEE_LITTLE_ENDIAN
 
+#ifdef __aarch64__
+#ifdef __AARCH64EB__
+#define __IEEE_BIG_ENDIAN
+#else
+#define __IEEE_LITTLE_ENDIAN
+#endif
+#endif
+
 #ifdef __alpha__
 #define __IEEE_LITTLE_ENDIAN
 #endif

diff --git a/libjava/configure.host b/libjava/configure.host
index 0c3b41c690e60b85a38dbb5009d58b2d5f328a2a..f2d1bb5ed3b53050a6226ae811ab43056484c246 100644 (file)
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -81,6 +81,11 @@ ATOMICSPEC=
 
 # This case statement supports per-CPU defaults.
 case "${host}" in
+  aarch64*-linux*)
+       libgcj_interpreter=yes
+       sysdeps_dir=aarch64
+       ATOMICSPEC=-fuse-atomic-builtins
+       ;;
   arm*-elf)
        with_libffi_default=no
        PROCESS=Ecos
@@ -289,6 +294,12 @@ EOF
        sysdeps_dir=i386
        DIVIDESPEC=-f%{m32:no-}use-divide-subroutine
        ;;
+  aarch64*-linux* )
+       slow_pthread_self=no
+       can_unwind_signal=no
+       CHECKREFSPEC=-fcheck-references
+       DIVIDESPEC=-fuse-divide-subroutine
+       ;;
   arm*-linux* )
        slow_pthread_self=no
        can_unwind_signal=no

diff --git a/libjava/sysdep/aarch64/locks.h b/libjava/sysdep/aarch64/locks.h
new file mode 100644 (file)
index 0000000..f91473d
--- /dev/null
+++ b/libjava/sysdep/aarch64/locks.h
@@ -0,0 +1,57 @@
+// locks.h - Thread synchronization primitives. AArch64 implementation.
+
+#ifndef __SYSDEP_LOCKS_H__
+#define __SYSDEP_LOCKS_H__
+
+typedef size_t obj_addr_t;     /* Integer type big enough for object   */
+                               /* address.                             */
+
+// Atomically replace *addr by new_val if it was initially equal to old.
+// Return true if the comparison succeeded.
+// Assumed to have acquire semantics, i.e. later memory operations
+// cannot execute before the compare_and_swap finishes.
+inline static bool
+compare_and_swap(volatile obj_addr_t *addr,
+                 obj_addr_t old,
+                 obj_addr_t new_val)
+{
+  return __sync_bool_compare_and_swap(addr, old, new_val);
+}
+
+// Set *addr to new_val with release semantics, i.e. making sure
+// that prior loads and stores complete before this
+// assignment.
+inline static void
+release_set(volatile obj_addr_t *addr, obj_addr_t new_val)
+{
+  __sync_synchronize();
+  *addr = new_val;
+}
+
+// Compare_and_swap with release semantics instead of acquire semantics.
+// On many architecture, the operation makes both guarantees, so the
+// 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)
+{
+  return __sync_bool_compare_and_swap(addr, old, new_val);
+}
+
+// Ensure that subsequent instructions do not execute on stale
+// data that was loaded from memory before the barrier.
+inline static void
+read_barrier()
+{
+  __sync_synchronize();
+}
+
+// Ensure that prior stores to memory are completed with respect to other
+// processors.
+inline static void
+write_barrier()
+{
+  __sync_synchronize();
+}
+#endif