From a72046d68eedf199defa618740020fbbecb9d33f Mon Sep 17 00:00:00 2001
From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com>
Date: Mon, 14 Sep 2020 18:21:10 +0700
Subject: [PATCH 1/3] Not use clang

---
 buildjdk.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 65909e9..6f2a667 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -19,16 +19,11 @@ cp -R -f openjdk-mobile-aarch64-patch/* openjdk/
 # Remove generated script to regenerate aarch64 build
 # rm openjdk/autoconf/generated-configure.sh
 
-echo BEGINls
-ls
-ls *
-ls */*
-echo ENDEDls
-
 cd openjdk
 rm -rf build
 #	--build=x86_64-linux-gnu \
 #	--hostt=aarch64-linux-android \
+#	--with-toolchain-type=clang \
 bash ./configure \
 	--enable-option-checking=fatal \
 	--openjdk-target=aarch64-linux-android \
@@ -40,7 +35,6 @@ bash ./configure \
 	--with-debug-level=release \
 	--with-freetype-lib=$FREETYPE_DIR/lib \
 	--with-freetype-include=$FREETYPE_DIR/include/freetype2 \
-	--with-toolchain-type=clang \
         --x-includes=/usr/include \
         --x-libraries=/usr/lib \
    || error_code=$?

From 59063bd4e39a661e9279bc7ae3dbc1bc5b9dba38 Mon Sep 17 00:00:00 2001
From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com>
Date: Mon, 14 Sep 2020 18:22:08 +0700
Subject: [PATCH 2/3] Not use clang

---
 setdevkitpath.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setdevkitpath.sh b/setdevkitpath.sh
index a8bec4b..ab9eb06 100644
--- a/setdevkitpath.sh
+++ b/setdevkitpath.sh
@@ -16,8 +16,8 @@ export LDFLAGS="-L$NDK/platforms/android-21/arch-arm64/usr/lib"
 # Deprecated...
 export AR=$TOOLCHAIN/bin/$TARGET-ar
 export AS=$TOOLCHAIN/bin/$TARGET-as
-export CC=$TOOLCHAIN/bin/$TARGET-clang
-export CXX=$TOOLCHAIN/bin/$TARGET-clang++
+export CC=$TOOLCHAIN/bin/$TARGET-gcc
+export CXX=$TOOLCHAIN/bin/$TARGET-g++
 export LD=$TOOLCHAIN/bin/$TARGET-ld
 export RANLIB=$TOOLCHAIN/bin/$TARGET-ranlib
 export STRIP=$TOOLCHAIN/bin/$TARGET-strip

From 45196c4fc25f9bb018b977f58b9e7b5b2dcff454 Mon Sep 17 00:00:00 2001
From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com>
Date: Mon, 14 Sep 2020 18:34:46 +0700
Subject: [PATCH 3/3] Remove -mthumb from aarch64 target

---
 openjdk-mobile-aarch64-patch/common/autoconf/flags.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openjdk-mobile-aarch64-patch/common/autoconf/flags.m4 b/openjdk-mobile-aarch64-patch/common/autoconf/flags.m4
index 509edd2..85bc727 100644
--- a/openjdk-mobile-aarch64-patch/common/autoconf/flags.m4
+++ b/openjdk-mobile-aarch64-patch/common/autoconf/flags.m4
@@ -154,8 +154,8 @@ AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS],
       EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt -fPIE"
       EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--unresolved-symbols=ignore-all -Wl,--gc-sections -fPIE"
     elif test "x$OPENJDK_TARGET_CPU" = xarm64 || test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-      EXTRA_CFLAGS="$EXTRA_CFLAGS -mthumb -march=armv8-a -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE  -Wno-psabi -fPIE"
-      EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -mthumb -march=armv8-a -fPIE"
+      EXTRA_CFLAGS="$EXTRA_CFLAGS -march=armv8-a -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE  -Wno-psabi -fPIE"
+      EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -march=armv8-a -fPIE"
       EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--unresolved-symbols=ignore-all -Wl,--gc-sections -fPIE"
     else
       EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE -Wno-psabi -march=i686 -msse3 -mstackrealign -mfpmath=sse -fPIE"