Source: openjdk-22
Version: 22.0.2+9-4
Severity: normal
Tags: patch
User: [email protected]
Usertags: alpha
X-Debbugs-Cc: [email protected]
Hi,
openjdk-22 currently FTBFS on alpha due to a failing assert:
Executing: [/usr/bin/alpha-linux-gnu-g++-14 -MMD -MF
/<<PKGBUILDDIR>>/build/hotspot/variant-zero/libjvm/objs/os_linux.d.tmp
(...) -O3 -c -o
/<<PKGBUILDDIR>>/build/hotspot/variant-zero/libjvm/objs/os_linux_zero.o
/<<PKGBUILDDIR>>/src/hotspot/os_cpu/ \
linux_zero/os_linux_zero.cpp -frandom-seed="os_linux_zero.cpp"]
cc1plus: warning: '-Werror=' argument '-Werror=implicit-function-declaration'
is not valid for C++
/<<PKGBUILDDIR>>/src/hotspot/os/linux/os_linux.cpp:2900:37: error: static
assertion failed: MAP_FIXED_NOREPLACE != MAP_FIXED_NOREPLACE_value
2900 | static_assert(MAP_FIXED_NOREPLACE == MAP_FIXED_NOREPLACE_value,
"MAP_FIXED_NOREPLACE != MAP_FIXED_NOREPLACE_value");
| ^
/<<PKGBUILDDIR>>/src/hotspot/os/linux/os_linux.cpp:2900:37: note: the
comparison reduces to '(2097152 == 1048576)'
gmake[4]: *** [lib/CompileJvm.gmk:154:
/<<PKGBUILDDIR>>/build/hotspot/variant-zero/libjvm/objs/os_linux.o] Error 1
gmake[3]: *** [make/Main.gmk:253: hotspot-zero-libs] Error 2
gmake[3]: *** Waiting for unfinished jobs....
The attached patch fixes the problem. Would be great if it could be incldued
for the next upload. In the meantime, I have uploaded a patched version of
openjdk-22 for alpha to unreleased.
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer
`. `' Physicist
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
--- openjdk-22-22.0.2+9.orig/src/hotspot/os/linux/os_linux.cpp
+++ openjdk-22-22.0.2+9/src/hotspot/os/linux/os_linux.cpp
@@ -2892,7 +2892,12 @@ void os::pd_commit_memory_or_exit(char*
// Note that the value for MAP_FIXED_NOREPLACE differs between architectures,
but all architectures
// supported by OpenJDK share the same flag value.
+#if defined(ALPHA)
+#define MAP_FIXED_NOREPLACE_value 0x200000
+#else
#define MAP_FIXED_NOREPLACE_value 0x100000
+#endif
+
#ifndef MAP_FIXED_NOREPLACE
#define MAP_FIXED_NOREPLACE MAP_FIXED_NOREPLACE_value
#else
