[Merge] Merge AArch64 support

robberphex · Dec 7, 2020 · e533a2b · e533a2b
1 parent d37951e
commit e533a2b
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 13 deletions.
diff --git a/dragonwell_version b/dragonwell_version
@@ -19,5 +19,5 @@
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-DRAGONWELL_VERSION=8.5.4
+DRAGONWELL_VERSION=8.5.5
 DRAGONWELL_JDK_UPDATE_VERSION=272
diff --git a/get_source_dragonwell.sh b/get_source_dragonwell.sh
@@ -36,13 +36,14 @@ warning() {
 subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
 
 # default options
-GITURL="git@gitlab.alibaba-inc.com:dragonwell"
-REPO_PREFIX="jdk8u_"
+site="github"
+connect="https"
+REPO_PREFIX="dragonwell8_"
 DEPTH=1000
 BRANCH="master"
 
 usage() {
-      echo "usage: $0 [-h|--help] [-b|--branch branch_name] [-s|--site github|gitlab]"
+      echo "usage: $0 [-h|--help] [-b|--branch branch_name] [-s|--site github|gitlab] [-c|--connection https|ssh]"
       exit 1
 }
 
@@ -63,24 +64,42 @@ do
       shift;
       site=$1
       if [[ $site == "github" ]]; then
-        GITURL="https://github.com/alibaba"
         REPO_PREFIX="dragonwell8_"
       elif [[ $site == "gitlab" ]]; then
-        # inside alibaba
-        GITURL="git@gitlab.alibaba-inc.com:dragonwell"
         REPO_PREFIX="jdk8u_"
       else
         usage
       fi
       ;;
 
+    -c | --connection )
+      shift;
+      connect=$1
+      if [ "x$connect" != "xssh" -a "x$connect" != "xhttps" ]; then
+        usage
+      fi
+      ;;
+
+
     *)  # unknown option
       ;;
   esac
   shift
 done
 
-GIT=`command -v git`
+if [ "x$site" = "xgithub" -a "x$connect" = "xssh" ]; then
+    GITURL="git@github.com:alibaba"
+elif [ "x$site" = "xgithub" -a "x$connect" = "xhttps" ]; then
+    GITURL="https://github.com/alibaba"
+elif [ "x$site" = "xgitlab" -a "x$connect" = "xssh" ]; then
+    GITURL="git@gitlab.alibaba-inc.com:dragonwell"
+elif [ "x$site" = "xgitlab" -a "x$connect" = "xhttps" ]; then
+    GITURL="http://gitlab.alibaba-inc.com/dragonwell"
+else
+    usage
+fi
+
+GIT=$(command -v git)
 if [ "x$GIT" = "x" ]; then
   error "Could not locate git command"
 fi

diff --git a/make.sh b/make.sh
@@ -32,21 +32,32 @@ if [ $# -lt 1 ]; then
   echo "USAGE: $0 release/debug/fastdebug"
 fi
 
+ARCH=$(uname -m)
+if [ "x"$ARCH = 'xx86_64' ]; then
+  ARCH_DIR="amd64"
+elif [ "x"$ARCH = 'xaarch64' ]; then
+  ARCH_DIR="aarch64"
+else
+  echo "Unrecognized architecture: ${ARCH}"
+  exit 1
+fi
+
+
 LC_ALL=C
 BUILD_MODE=$1
 
 case "$BUILD_MODE" in
     release)
         DEBUG_LEVEL="release"
-        JDK_IMAGES_DIR=`pwd`/build/linux-x86_64-normal-server-release/images
+        JDK_IMAGES_DIR=$(pwd)/build/linux-${ARCH}-normal-server-release/images
     ;;
     debug)
         DEBUG_LEVEL="slowdebug"
-        JDK_IMAGES_DIR=`pwd`/build/linux-x86_64-normal-server-slowdebug/images
+        JDK_IMAGES_DIR=$(pwd)/build/linux-${ARCH}-normal-server-slowdebug/images
     ;;
     fastdebug)
 	DEBUG_LEVEL="fastdebug"
-	JDK_IMAGES_DIR=`pwd`/build/linux-x86_64-normal-server-fastdebug/images
+	JDK_IMAGES_DIR=$(pwd)/build/linux-${ARCH}-normal-server-fastdebug/images
     ;;
     *)
         echo "Argument must be release or debug or fastdebug!"
@@ -73,7 +84,7 @@ bash ./configure --with-milestone=fcs \
                  --with-build-number=${BUILD_INDEX} \
                  --with-user-release-suffix="" \
                  --enable-unlimited-crypto \
-                 --with-cacerts-file=`pwd`/common/security/cacerts \
+                 --with-cacerts-file=$(pwd)/common/security/cacerts \
                  --with-jvm-variants=server \
                  --with-debug-level=$DEBUG_LEVEL \
                  --with-zlib=system $*
@@ -131,7 +142,7 @@ grep "^OpenJDK .*VM" /tmp/version.out | grep "(Alibaba Dragonwell $DISTRO_VERSIO
 if [ 0 != $? ]; then RET=1; fi
 \rm -f /tmp/version.out
 
-ldd $NEW_JAVA_HOME/jre/lib/amd64/libzip.so|grep libz
+ldd $NEW_JAVA_HOME/jre/lib/${ARCH_DIR}/libzip.so|grep libz
 if [ 0 != $? ]; then RET=1; fi
 
 exit $RET