AArch64 updates for icedtea7-forest
Andrew Haley
aph at redhat.com
Tue Mar 18 09:44:33 UTC 2014
All pretty straightforward, and hopefully uncontroversial.
Andrew.
-------------- next part --------------
comparing with ssh://icedtea.classpath.org/hg/icedtea7-forest/jdk
searching for changes
changeset: 7369:d6953869315d
user: aph
date: Mon Mar 17 17:17:43 2014 +0000
summary: Set flags and defines for Aarch64.
diff -r 9341cc31ced6 -r d6953869315d make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Sat Mar 15 01:07:27 2014 +0000
+++ b/make/common/shared/Platform.gmk Mon Mar 17 17:17:43 2014 +0000
@@ -224,6 +224,9 @@
ifeq ($(ARCH), sh)
ARCH_DATA_MODEL=32
endif
+ ifeq ($(ARCH), aarch64)
+ ARCH_DATA_MODEL=64
+ endif
endif
endif
diff -r 9341cc31ced6 -r d6953869315d make/javax/sound/SoundDefs.gmk
--- a/make/javax/sound/SoundDefs.gmk Sat Mar 15 01:07:27 2014 +0000
+++ b/make/javax/sound/SoundDefs.gmk Mon Mar 17 17:17:43 2014 +0000
@@ -74,6 +74,10 @@
CPPFLAGS += -DX_ARCH=X_AMD64
endif # ARCH amd64
+ ifeq ($(ARCH), aarch64)
+ CPPFLAGS += -DX_ARCH=X_AARCH64
+ endif # ARCH amd64
+
ifeq ($(ARCH), arm)
CPPFLAGS += -DX_ARCH=X_ARM
endif # ARCH arm
changeset: 7370:90cda5cd2340
user: aph
date: Mon Mar 17 17:56:51 2014 +0000
summary: build system changes to enable aarch64 build
diff -r d6953869315d -r 90cda5cd2340 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Mon Mar 17 17:17:43 2014 +0000
+++ b/make/common/shared/Platform.gmk Mon Mar 17 17:56:51 2014 +0000
@@ -227,6 +227,9 @@
ifeq ($(ARCH), aarch64)
ARCH_DATA_MODEL=64
endif
+ ifeq ($(ARCH), aarch64)
+ ARCH_DATA_MODEL=64
+ endif
endif
endif
diff -r d6953869315d -r 90cda5cd2340 make/java/main/java/mapfile-aarch64
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/java/main/java/mapfile-aarch64 Mon Mar 17 17:56:51 2014 +0000
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+# Specify what global symbols we export. Note that we're not really
+# interested in declaring a version, simply scoping the file is sufficient.
+#
+
+SUNWprivate_1.1 {
+ global:
+ main; # Provides basic adb symbol offsets
+ environ; # Public symbols and required by Java run time
+ _environ;
+ __environ_lock;
+
+ local:
+ *;
+};
diff -r d6953869315d -r 90cda5cd2340 make/javax/sound/SoundDefs.gmk
--- a/make/javax/sound/SoundDefs.gmk Mon Mar 17 17:17:43 2014 +0000
+++ b/make/javax/sound/SoundDefs.gmk Mon Mar 17 17:56:51 2014 +0000
@@ -134,6 +134,10 @@
CPPFLAGS += -DX_ARCH=X_AMD64
endif # ARCH amd64
+ ifeq ($(ARCH), aarch64)
+ CPPFLAGS += -DX_ARCH=X_AARCH64
+ endif # ARCH amd64
+
ifeq ($(ARCH), arm)
CPPFLAGS += -DX_ARCH=X_ARM
endif # ARCH arm
diff -r d6953869315d -r 90cda5cd2340 src/solaris/bin/aarch64/jvm.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/solaris/bin/aarch64/jvm.cfg Mon Mar 17 17:56:51 2014 +0000
@@ -0,0 +1,36 @@
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# List of JVMs that can be used as an option to java, javac, etc.
+# Order is important -- first in this list is the default JVM.
+# NOTE that this both this file and its format are UNSUPPORTED and
+# WILL GO AWAY in a future release.
+#
+# You may also select a JVM in an arbitrary location with the
+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
+# and may not be available in a future release.
+#
+# n.b. server must be first so it is used as the default
+-server KNOWN
+-client ALIASED_TO -server
+-minimal ERROR
changeset: 7371:3fb69cddcafa
tag: tip
user: aph
date: Mon Mar 17 14:45:30 2014 -0400
summary: CFLAGS_REQUIRED for aarch64.
diff -r 90cda5cd2340 -r 3fb69cddcafa make/common/Defs-linux.gmk
--- a/make/common/Defs-linux.gmk Mon Mar 17 17:56:51 2014 +0000
+++ b/make/common/Defs-linux.gmk Mon Mar 17 14:45:30 2014 -0400
@@ -202,6 +202,7 @@
LDFLAGS_COMMON_ppc64 += -m64 -L/lib64 -Wl,-melf64ppc
CFLAGS_REQUIRED_s390 +=
CFLAGS_REQUIRED_s390x += -m64
+CFLAGS_REQUIRED_aarch64 += -fno-omit-frame-pointer -fsigned-char -D_LITTLE_ENDIAN
CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
More information about the distro-pkg-dev
mailing list