mirror of
https://github.com/termux/termux-packages.git
synced 2025-05-11 21:23:11 +00:00
1440fde499
- Fixes https://github.com/termux/termux-packages/issues/24651 - Fixes the problem in both `openjdk-17` and `openjdk-21` on the affected device Samsung Galaxy S8+ SM-G955F, but does not break `.jar` launching on other devices. - Possible side effects could include subtle changes in file-timestamp-reading behavior, as described here (JDK's original behavior on Linux prior to the commit that causes a problem on Samsung Galaxy S8+): https://bugs.openjdk.org/browse/JDK-8316304 - Inspired by similar changes elsewhere in termux-packages, like https://github.com/termux/termux-packages/pull/22088
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 58a290a32c05355aa4698188b5cbd4113fb8644f Mon Sep 17 00:00:00 2001
|
|
From: Henrik Grimler <grimler@termux.dev>
|
|
Date: Sun, 31 Mar 2024 12:02:51 +0200
|
|
Subject: [PATCH] make: autoconf: define ARM for arm build with clang
|
|
|
|
Fixes error like
|
|
|
|
ad_arm.cpp:19849:4: error: "ARM must be defined"
|
|
^
|
|
1 warning and 1 error generated.
|
|
gmake[3]: *** [lib/CompileJvm.gmk:143: /home/builder/.termux-build/openjdk-17/src/build/linux-arm-server-release/hotspot/variant-server/libjvm/objs/ad_arm.o] Error 1
|
|
gmake[2]: *** [make/Main.gmk:252: hotspot-server-libs] Error 2
|
|
---
|
|
make/autoconf/flags-cflags.m4 | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
|
|
index 3cd0550eb314..1b2d520690ed 100644
|
|
--- a/make/autoconf/flags-cflags.m4
|
|
+++ b/make/autoconf/flags-cflags.m4
|
|
@@ -715,7 +715,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
|
|
$1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
|
|
fi
|
|
fi
|
|
-
|
|
+ if test "x$FLAGS_CPU" = xarm; then
|
|
+ # For whatever reason arm build with clang fails with:
|
|
+ # ad_arm.cpp:19849:4: error: "ARM must be defined"
|
|
+ # Fix by defining arm here as well.
|
|
+ $1_CFLAGS_CPU_JVM="-DARM"
|
|
+ fi
|
|
elif test "x$TOOLCHAIN_TYPE" = xxlc; then
|
|
if test "x$FLAGS_CPU" = xppc64; then
|
|
$1_CFLAGS_CPU_JVM="-qarch=ppc64"
|
|
--
|
|
2.44.0
|
|
|