From 3c8e929c22b8765584d376d51a380da6eaa5f3a9 Mon Sep 17 00:00:00 2001 From: Tran Khanh Duy <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 21 Sep 2020 17:53:00 +0700 Subject: [PATCH] Add support for x86_64 build --- termux-openjdk-aarch64-patches/aarch64-flags.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/termux-openjdk-aarch64-patches/aarch64-flags.patch b/termux-openjdk-aarch64-patches/aarch64-flags.patch index c25f03a..0776298 100644 --- a/termux-openjdk-aarch64-patches/aarch64-flags.patch +++ b/termux-openjdk-aarch64-patches/aarch64-flags.patch @@ -1,6 +1,6 @@ --- ./common/autoconf/flags.m4 2017-05-14 10:01:38.475911076 +0530 +++ ./common/autoconf/flags.m4 2020-09-16 18:05:25.204273780 +0530 -@@ -153,10 +153,15 @@ +@@ -153,10 +153,17 @@ AC_DEFUN_ONCE([FLAGS_SETUP_USER_SUPPLIED_FLAGS], EXTRA_CFLAGS="$EXTRA_CFLAGS -mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE -Wno-psabi -fPIE" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -mthumb -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt -fPIE" @@ -9,11 +9,13 @@ + 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" ++ elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE -Wno-psabi -march=x86_64 -msse3 -mstackrealign -mfpmath=sse -fPIE" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--unresolved-symbols=ignore-all -Wl,--gc-sections -Wl,-z,nocopyreloc -fPIE" else EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-short-enums -D__GLIBC__ -D_GNU_SOURCE -Wno-psabi -march=i686 -msse3 -mstackrealign -mfpmath=sse -fPIE" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,--unresolved-symbols=ignore-all -Wl,--gc-sections -Wl,-z,nocopyreloc -fPIE" fi -+ # TODO x86_64 port fi # Hotspot needs these set in their legacy form