Mercurial > hg > openjdk > aarch64-port > jdk

--- a/.hgtags	Thu Jul 16 14:54:26 2015 -0700
+++ b/.hgtags	Mon Jul 20 15:23:09 2015 +0100
@@ -193,6 +193,7 @@
 a8012d8d7e9c5035de0bdd4887dc9f7c54008f21 jdk8-b69
 a996b57e554198f4592a5f3c30f2f9f4075e545d jdk8-b70
 2a5af0f766d0acd68a81fb08fe11fd66795f86af jdk8-b71
+bf581aa741664ba4a97df803ced8a58ceff3a94e initial_upload
 32a57e645e012a1f0665c075969ca598e0dbb948 jdk8-b72
 733885f57e14cc27f5a5ff0dffe641d2fa3c704a jdk8-b73
 57d5d954462831ac353a1f40d3bb05ddb4620952 jdk8-b74
@@ -206,6 +207,7 @@
 624bcb4800065c6656171948e31ebb2925f25c7a jdk8-b82
 ac519af51769e92c51b597a730974e8607357709 jdk8-b83
 7b4721e4edb4e1c65e9c839a70d7cc67f81c7632 jdk8-b84
+29e9f26732a282c010414adaa2a5a341462f4f6c aarch64-20130813
 296676d534c52888c36e305a2bf7f345c4ca70f8 jdk8-b85
 7989cd0cc3a9149864589438ee2c949015d8aa9a jdk8-b86
 d5228e624826a10ccc5b05f30ad8d839b58fe48d jdk8-b87
@@ -231,6 +233,8 @@
 eea685b9ccaa1980e0a7e07d6a3a84bcc7e9ab82 jdk8-b107
 006aaa5f069e7dd98fccdc696866c9f8582c087c jdk8-b108
 946f3fd5f8bf0ccd180c258d25e5837fa1bf004c jdk8-b109
+48a5df5ce99cecb91f2e8dc3e4a5748f09c963c1 preview_rc1
+e14d4b60b2c1b45d446ab94dfa4707b13f91fb7d preview_rc2
 54e099776f08430d3a7f4feabd9f2ba886b55320 jdk8-b110
 719befd87c7b96ae103c05730ca555227bfc0116 jdk8-b111
 f002f5f3a16cca62e139cb8eed05ffaeb373587d jdk8-b112
@@ -251,11 +255,16 @@
 ae303640bc1cca06f1c6ac887e6b523ceeb425a6 jdk8-b125
 a9088d517f2fa9919886d3d95023c518b59172b8 jdk8-b126
 fbf251b8ef8a4a2aa1fd58efc8d0d5c8e2fd582b jdk8-b127
+597eaf9ec7946aa344477b8a5375f129a8fbbf56 jdk8_b128_aarch64_rc1
+cd23c29828584ec3c39c974579079ab97d65874e jdk8_b128_aarch64_rc3
+ba03ec7a0b930582517592cf66abba734ec59891 jdk8_b128_aarch64_rc4
+5de3e4944a8f100652483cb915959edcb8a2d71d jdk8_b128_aarch64_992
 f644211c59fd7c1d0c81239c55b31e1d377d7650 jdk8-b128
 80568a19aab7300bc92baf2dc225be929f5b03ed jdk8-b129
 43386cc9a017a9f9e704760050086bb18b778ae0 jdk8-b130
 e291ac47c9a90366c3c0787a6f7ce547a2bda308 jdk8-b131
 43cb25339b5500871f41388a5197f1b01c4b57b8 jdk8-b132
+246d1b83d7116cb3f87cd491c937ec95337555d9 jdk8_final
 fa2d5a06308f3f36fb09662fa58070a02352f023 jdk8u5-b01
 343f4f8ba0982b3516e33c859b01634d919243c4 jdk8u5-b02
 c35571198602a5856280d5c7c10bda4e7b769104 jdk8u5-b03
@@ -360,7 +369,7 @@
 a1c3099e1b90230435e890ca56adc8a5aa5149ff jdk8u31-b33
 e6ed015afbbf3459ba3297e270b4f3170e989c80 jdk8u40-b00
 6e223d48080ef40f4ec11ecbcd19b4a20813b9eb jdk8u40-b01
-4797cd0713b44b009525f1276d571ade7e24f3f5 jdk8u40-b02
+d19e04dfb95b8085c17e142df42477cccad1c8d1 jdk8u40-b02
 c67acfb24eed87629887128df51007218ddf1f60 jdk8u40-b03
 dde62d949f7847469b2ede2ca4190c95066adc91 jdk8u40-b04
 d587834579dadd18cb8b096e61d92e2dbccc2782 jdk8u40-b05
@@ -370,9 +379,9 @@
 064adeb65ce82f9ff3cc7898e59d19eb64743c63 jdk8u40-b09
 c3a4729c70fa29d79ad77e0643ad7715ebbc96b5 jdk8u40-b10
 693da296b395139f2fe6d7131eb0b0d85f6015f6 jdk8u40-b11
-fb8db13639204e37388904bb6e57778c5d762631 jdk8u40-b12
-ba80109a9b3eb92b56012c9ec3aafd9aee2efa69 jdk8u40-b13
-ffc348308de2e872f5d510d440604c3726a67a18 jdk8u40-b14
+74fd977a8b57f6e5b06ce47f254b6ca9cd0d48cd jdk8u40-b12-aarch64
+709f573168709ea03ca7a59e3edbc5029daa9b9c jdk8u40-b12-aarch64-1262
+6be04852760c2619fe4c38a11012739349bb3654 jdk8u40-b12-aarch64-1263
 31dac938108da722c56a0526fba7f6ae84773056 jdk8u40-b15
 9dc67d03e6e540f646f27092ed23e94e95fa789e jdk8u40-b16
 fc4f5546417071c70cffd89ca83302309f6f7da9 jdk8u40-b17
--- a/make/gensrc/GensrcMisc.gmk	Thu Jul 16 14:54:26 2015 -0700
+++ b/make/gensrc/GensrcMisc.gmk	Mon Jul 20 15:23:09 2015 +0100
@@ -76,7 +76,7 @@
     INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
     LANG := C, \
     CC := $(BUILD_CC), \
-    LDEXE := $(BUILD_LD), \
+    LDEXE := $(BUILD_CC), \
     OBJECT_DIR := $(GENSRC_SOR_BIN), \
     OUTPUT_DIR := $(GENSRC_SOR_BIN), \
     PROGRAM := genSocketOptionRegistry))
--- a/make/lib/SoundLibraries.gmk	Thu Jul 16 14:54:26 2015 -0700
+++ b/make/lib/SoundLibraries.gmk	Mon Jul 20 15:23:09 2015 +0100
@@ -139,6 +139,10 @@
   ifeq ($(OPENJDK_TARGET_CPU), ppc64)
        LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
   endif
+
+  ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+	LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
+  endif
 endif

 LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
--- a/src/share/bin/java.c	Thu Jul 16 14:54:26 2015 -0700
+++ b/src/share/bin/java.c	Mon Jul 20 15:23:09 2015 +0100
@@ -699,6 +699,22 @@
     }
 }

+/*
+ * This is called if the jvmtype returned by CheckJvmType above
+ * didn't exist. In this case if it was the default VM and we
+ * selected the server vm we will allow it to use the client vm
+ * instead.
+ */
+char *
+GetAltJvmType(char *jvmtype)
+{
+    if ((knownVMs[0].flag == VM_IF_SERVER_CLASS)) {
+        if (jvmtype == knownVMs[0].server_class+1) return knownVMs[0].name+1;
+        if (jvmtype == knownVMs[0].name+1) return knownVMs[0].server_class+1;
+    }
+    return NULL;
+}
+
 /* copied from HotSpot function "atomll()" */
 static int
 parse_size(const char *s, jlong *result) {
--- a/src/share/bin/java.h	Thu Jul 16 14:54:26 2015 -0700
+++ b/src/share/bin/java.h	Mon Jul 20 15:23:09 2015 +0100
@@ -164,6 +164,7 @@
  */
 jint ReadKnownVMs(const char *jvmcfg, jboolean speculative);
 char *CheckJvmType(int *argc, char ***argv, jboolean speculative);
+char *GetAltJvmType(char *jvmtype);
 void AddOption(char *str, void *info);

 enum ergo_policy {
--- a/src/share/native/com/sun/media/sound/SoundDefs.h	Thu Jul 16 14:54:26 2015 -0700
+++ b/src/share/native/com/sun/media/sound/SoundDefs.h	Mon Jul 20 15:23:09 2015 +0100
@@ -43,6 +43,7 @@
 #define X_ZERO          6
 #define X_ARM           7
 #define X_PPC           8
+#define X_AARCH64	9

 // **********************************
 // Make sure you set X_PLATFORM and X_ARCH defines correctly.
--- a/src/share/native/sun/awt/libpng/pngpriv.h	Thu Jul 16 14:54:26 2015 -0700
+++ b/src/share/native/sun/awt/libpng/pngpriv.h	Mon Jul 20 15:23:09 2015 +0100
@@ -151,8 +151,8 @@
     * Note that gcc-4.9 defines __ARM_NEON instead of __ARM_NEON__, so we
     * check both variants.
     */
-#  if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
-   defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+#  if ((defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
+   defined(PNG_ALIGNED_MEMORY_SUPPORTED)) && defined(__arm__)
 #     define PNG_ARM_NEON_OPT 2
 #  else
 #     define PNG_ARM_NEON_OPT 0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/solaris/bin/aarch64/jvm.cfg	Mon Jul 20 15:23:09 2015 +0100
@@ -0,0 +1,36 @@
+# Copyright (c) 2003, 2013, 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.
+#
+-client IF_SERVER_CLASS -server
+-server KNOWN
+-minimal KNOWN
--- a/src/solaris/bin/java_md_solinux.c	Thu Jul 16 14:54:26 2015 -0700
+++ b/src/solaris/bin/java_md_solinux.c	Mon Jul 20 15:23:09 2015 +0100
@@ -474,8 +474,17 @@
         }

         if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, 0 )) {
-          JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath);
-          exit(4);
+          char *altjvmtype = GetAltJvmType(jvmtype);
+          jboolean found = JNI_FALSE;
+          if (altjvmtype) {
+            jvmtype = altjvmtype;
+            jvmpath[0] = '\0';
+            found = GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, 0) != NULL;
+          }
+          if (!found) {
+	    JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath);
+	    exit(4);
+          }
         }
         /*
          * we seem to have everything we need, so without further ado