Mercurial > hg > icedtea7-forest-aarch64 > hotspot

changeset 5663:5b7dcf16fe5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make hsdis handle aarch64 native case
author adinn
date Tue, 21 Oct 2014 05:09:50 -0400
parents 32975889f683
children eff2294b2b17 628c88e6d165
files src/share/tools/hsdis/Makefile src/share/tools/hsdis/hsdis.c
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/tools/hsdis/Makefile	Thu Oct 16 10:43:31 2014 +0100
+++ b/src/share/tools/hsdis/Makefile	Tue Oct 21 05:09:50 2014 -0400
@@ -78,6 +78,7 @@
 CFLAGS/sparcv9	+= -m64
 CFLAGS/amd64	+= -m64
 CFLAGS/ppc64	+= -m64
+CFLAGS/aarch64	+= 
 endif
 CFLAGS		+= $(CFLAGS/$(ARCH))
 CFLAGS		+= -fPIC -g
@@ -89,11 +90,14 @@
 DLDFLAGS	+= -shared
 LDFLAGS         += -ldl
 OUTFLAGS	+= -o $@
+# special case x86-aarch64 hybrid
+ifeq ($(ARCH),amd64)
 ifeq ($(BUILD_AARCH64),true)
 CONFIGURE_ARGS= --target=aarch64-none-linux-gnu
 LP64=1
 CFLAGS+= -DTARGET_ARCH_aarch64
 endif
+endif
 ## OS = Windows ##
 else   # !SunOS, !Linux => Windows
 OS		= windows
--- a/src/share/tools/hsdis/hsdis.c	Thu Oct 16 10:43:31 2014 +0100
+++ b/src/share/tools/hsdis/hsdis.c	Tue Oct 21 05:09:50 2014 -0400
@@ -411,6 +411,9 @@
 #ifdef LIBARCH_i386
     res = "i386";
 #endif
+#ifdef LIBARCH_aarch64
+    res = "aarch64";
+#endif
 #ifdef LIBARCH_amd64
 #ifdef TARGET_ARCH_aarch64
     res = "aarch64";