[Git][java-team/openjfx][master] 2 commits: Supporting ppc64el and s390x

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / openjfx


Commits:
97117b31 by Pierre Gruet at 2026-09-24T13:55:52+02:00
Supporting ppc64el and s390x

- - - - -
c8f98fda by Pierre Gruet at 2026-09-24T13:56:07+02:00
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/debian_supported_architectures.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+openjfx (21.0.12+3-2) unstable; urgency=medium
+
+  * Team upload
+  * Supporting ppc64el and s390x
+
+ -- Pierre Gruet <pgt at debian.org>  Thu, 24 Sep 2026 13:55:58 +0200
+
 openjfx (21.0.12+3-1) unstable; urgency=medium
 
   * Team upload


=====================================
debian/patches/debian_supported_architectures.patch
=====================================
@@ -0,0 +1,103 @@
+Description: detecting and supporting official Debian architectures.
+ One has to detect properly the architecture. For ppc64el and s390x, assembler
+ code is provided.
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: no
+Last-Update: 2026-09-24
+
+--- a/build.gradle
++++ b/build.gradle
+@@ -351,11 +351,14 @@
+ // this build running on a Mac, Windows, or Linux machine? 32 or 64 bit?
+ ext.OS_NAME = System.getProperty("os.name").toLowerCase()
+ ext.OS_ARCH = System.getProperty("os.arch")
+-ext.ARCH_NAME = "x64"
++ext.ARCH_NAME = ext.OS_ARCH
+ ext.IS_64 = OS_ARCH.toLowerCase().contains("64")
+ ext.IS_AARCH64 = OS_ARCH.toLowerCase().contains("aarch64")
+ ext.IS_LOONGARCH64 = OS_ARCH.toLowerCase().contains("loongarch64")
+ ext.IS_RISCV64 = OS_ARCH.toLowerCase().contains("riscv64")
++ext.IS_PPC64EL = OS_ARCH.toLowerCase().contains("ppc64le")
++ext.IS_ARMHF = OS_ARCH.toLowerCase().contains("arm")
++ext.IS_S390X = OS_ARCH.toLowerCase().contains("s390x")
+ ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin")
+ ext.IS_WINDOWS = OS_NAME.contains("windows")
+ ext.IS_LINUX = OS_NAME.contains("linux")
+@@ -384,11 +387,19 @@
+         ARCH_NAME = "loongarch64"
+     } else if (IS_RISCV64) {
+         ARCH_NAME = "riscv64"
++    } else if (IS_PPC64EL) {
++        ARCH_NAME = "ppc64le"
+     } else {
+         ARCH_NAME = "x64"
+     }
+ } else {
+-    ARCH_NAME = "x32"
++    if (IS_ARMHF) {
++        ARCH_NAME = "armhf"
++    } else if (IS_S390X) {
++        ARCH_NAME = "s390x"
++    } else {
++        ARCH_NAME = "x32"
++    }
+ }
+ 
+ // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/StackPointer.cpp
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/StackPointer.cpp
+@@ -149,6 +149,28 @@
+      ".previous" "\n"
+ );
+ 
++#elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__)
++asm (
++    ".text" "\n"
++    ".globl " SYMBOL_STRING(currentStackPointer) "\n"
++    SYMBOL_STRING(currentStackPointer) ":" "\n"
++
++    "mr 3, 1" "\n"    // r3 = r1 (return current stack pointer)
++    "blr" "\n"
++    ".previous" "\n"
++);
++
++#elif defined(__s390x__)
++
++asm (
++    ".text\n"
++    ".globl " SYMBOL_STRING(currentStackPointer) "\n"
++    SYMBOL_STRING(currentStackPointer) ":\n"
++    "lgr %r2, %r15\n"
++    "br  %r14\n"
++    ".previous\n"
++);
++
+ #elif CPU(LOONGARCH64)
+ asm (
+     ".text" "\n"
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformCPU.h
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformCPU.h
+@@ -55,6 +55,12 @@
+ #define WTF_MIPS_FP64 (defined __mips_fpr && __mips_fpr == 64)
+ #endif
+ 
++/* CPU(S390X) - S390X, Debian addition */
++#if defined(__s390x__)
++#define WTF_CPU_S390X 1
++#define WTF_CPU_KNOWN 1
++#endif
++
+ /* CPU(LOONGARCH64) - LOONGARCH64 */
+ #if defined(__loongarch64)
+ #define WTF_CPU_LOONGARCH64 1
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/PageBlock.h
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/PageBlock.h
+@@ -55,7 +55,7 @@
+ constexpr size_t CeilingOnPageSize = 16 * KB;
+ #elif USE(64KB_PAGE_BLOCK) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN)
+ constexpr size_t CeilingOnPageSize = 64 * KB;
+-#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64)
++#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64) || CPU(S390X)
+ constexpr size_t CeilingOnPageSize = 4 * KB;
+ #else
+ #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture!


=====================================
debian/patches/series
=====================================
@@ -22,3 +22,4 @@ freetype_c_types.patch
 missing_include_DFGBasicBlockInlines.patch
 pattern_matching_java_12.patch
 honouring_number_of_processors.patch
+debian_supported_architectures.patch



View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/compare/5ad5b75bcc03b7675ca224d13e6d33e6b6db3b86...c8f98fda715ac34d48ec3ba29eec97d645eab9d7

-- 
View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/compare/5ad5b75bcc03b7675ca224d13e6d33e6b6db3b86...c8f98fda715ac34d48ec3ba29eec97d645eab9d7
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260924/c4aacfc2/attachment.htm>