Patchwork Enable java for aarch64

login
register
mail settings
Submitter Andreas Schwab
Date April 13, 2013, 6:21 p.m.
Message ID <mvmsj2uwauj.fsf@hawking.suse.de>
Download mbox | patch
Permalink /patch/236386/
State New
Headers show

Comments

Andreas Schwab - April 13, 2013, 6:21 p.m.
This enables building java for aarch64.  Most of the configuration bits
were copied from arm.

		=== libjava Summary ===

# of expected passes		2533
# of unexpected failures	29
# of untested testcases 	25

Andreas.

	* 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.
---
 configure                                |  2 ++
 configure.ac                             |  2 ++
 libjava/classpath/native/fdlibm/ieeefp.h |  8 +++++
 libjava/configure.host                   |  8 ++++-
 libjava/sysdep/aarch64/locks.h           | 57 ++++++++++++++++++++++++++++++++
 5 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 libjava/sysdep/aarch64/locks.h
Andrew Haley - April 14, 2013, 10:58 a.m.
On 04/13/2013 07:21 PM, Andreas Schwab wrote:
> # of unexpected failures	29

Looks basically OK.  What were the failures, though?

Andrew.
Matthias Klose - April 14, 2013, 11:17 a.m.
Am 13.04.2013 20:21, schrieb Andreas Schwab:
> This enables building java for aarch64.

Afaics, the aarch64 changes for boehm-gc are not yet checked in. Aren't these
needed as a prerequisite?
Andreas Schwab - April 15, 2013, 7:08 a.m.
Andrew Haley <aph@redhat.com> writes:

> Looks basically OK.  What were the failures, though?

FAIL: TestClosureGC run
FAIL: Array_3 execution - source compiled test
FAIL: Array_3 -findirect-dispatch execution - source compiled test
FAIL: Array_3 -O3 execution - source compiled test
FAIL: Array_3 -O3 -findirect-dispatch execution - source compiled test
FAIL: Invoke_1 execution - source compiled test
FAIL: Invoke_1 -findirect-dispatch execution - source compiled test
FAIL: Invoke_1 -O3 execution - source compiled test
FAIL: Invoke_1 -O3 -findirect-dispatch execution - source compiled test
FAIL: PR218 execution - source compiled test
FAIL: PR218 -O3 execution - source compiled test
FAIL: StackTrace2 execution - source compiled test
FAIL: StackTrace2 -findirect-dispatch execution - source compiled test
FAIL: StackTrace2 -O3 execution - source compiled test
FAIL: StackTrace2 -O3 -findirect-dispatch execution - source compiled test
FAIL: Throw_2 execution - source compiled test
FAIL: Throw_2 -findirect-dispatch execution - source compiled test
FAIL: Throw_2 -O3 execution - source compiled test
FAIL: Throw_2 -O3 -findirect-dispatch execution - source compiled test
FAIL: Throw_3 execution - source compiled test
FAIL: Throw_3 -findirect-dispatch execution - source compiled test
FAIL: Throw_3 -O3 execution - source compiled test
FAIL: Throw_3 -O3 -findirect-dispatch execution - source compiled test
FAIL: pr83 -findirect-dispatch execution - source compiled test
FAIL: pr83 -O3 -findirect-dispatch execution - source compiled test
FAIL: sourcelocation output - source compiled test
FAIL: sourcelocation -findirect-dispatch output - source compiled test
FAIL: sourcelocation -O3 output - source compiled test
FAIL: sourcelocation -O3 -findirect-dispatch output - source compiled test

Andreas.
Marcus Shawcroft - April 15, 2013, 7:10 a.m.
Yvan's patch was checked in a few days ago...

/Marcus

r197770 | clyon | 2013-04-11 13:06:04 +0100 (Thu, 11 Apr 2013) | 12 lines

2013-03-16  Yvan Roux <yvan.roux@linaro.org>

        * include/private/gcconfig.h (AARCH64): New macro (defined only if
        __aarch64__).
        * include/private/gcconfig.h (mach_type_known):
        Update comment adding ARM AArch64 target.
        * include/private/gcconfig.h (NOSYS, mach_type_known,CPP_WORDSZ,
        MACH_TYPE, ALIGNMENT, HBLKSIZE, OS_TYPE, LINUX_STACKBOTTOM,
        USE_GENERIC_PUSH_REGS, DYNAMIC_LOADING, DATASTART, DATAEND,
        STACKBOTTOM): Define for AArch64.

On 14 April 2013 12:17, Matthias Klose <doko@ubuntu.com> wrote:
> Am 13.04.2013 20:21, schrieb Andreas Schwab:
>> This enables building java for aarch64.
>
> Afaics, the aarch64 changes for boehm-gc are not yet checked in. Aren't these
> needed as a prerequisite?
>

Patch

diff --git a/configure b/configure
index d809535..e161cad 100755
--- 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 48ec1aa..bec489f 100644
--- 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/classpath/native/fdlibm/ieeefp.h b/libjava/classpath/native/fdlibm/ieeefp.h
index c230bbb..7ef2ae7e 100644
--- 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 0c3b41c..96f86fe 100644
--- 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
@@ -224,7 +229,8 @@  case "${host}" in
   x86_64*-linux* | \
   hppa*-linux* | \
   m68k*-linux* | \
-  sh-linux* | sh[34]*-linux*)
+  sh-linux* | sh[34]*-linux* | \
+  aarch64*-linux*)
   	can_unwind_signal=yes
 	libgcj_ld_symbolic='-Wl,-Bsymbolic'
 	if test x$slow_pthread_self = xyes \
diff --git a/libjava/sysdep/aarch64/locks.h b/libjava/sysdep/aarch64/locks.h
new file mode 100644
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