TheCloud/angelauramc-openjdk-build
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/angelauramc-openjdk-build.git synced 2025-09-16 15:47:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add aarch32 patches

Browse Source
This commit is contained in:
artdeell 2023-02-24 16:55:30 +03:00 committed by ArtDev
parent 6367c7524e
commit 65cfcff6a1
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildjdk.sh
View File

@ -64,8 +64,10 @@ cd openjdk
if [ "$BUILD_IOS" != "1" ]; then
git reset --hard
git apply --reject --whitespace=fix ../patches/jdk8u_android.diff || echo "git apply failed (universal patch set)"
if [ "$TARGET_JDK" != "arm" ]; then
if [ "$TARGET_JDK" != "aarch32" ]; then
git apply --reject --whitespace=fix ../patches/jdk8u_android_main.diff || echo "git apply failed (main non-universal patch set)"
else
git apply --reject --whitespace=fix ../patches/jdk8u_android_aarch32.diff || echo "git apply failed (aarch32 non-universal patch set)"
fi #TODO: make separate aarch32 patch set
fi

56
patches/jdk8u_android_aarch32.diff Normal file
View File

@ -0,0 +1,56 @@
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index d3a9f240..410693bf 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -95,13 +95,17 @@
# include <semaphore.h>
# include <fcntl.h>
# include <string.h>
-# include <syscall.h>
# include <sys/sysinfo.h>
-#ifndef __UCLIBC__
+#if !defined(__UCLIBC__) || !defined(__ANDROID__)
# include <gnu/libc-version.h>
#endif
# include <sys/ipc.h>
+#if !defined(__ANDROID__)
# include <sys/shm.h>
+# include <syscall.h>
+#else
+# include <sys/syscall.h>
+#endif
# include <link.h>
# include <stdint.h>
# include <inttypes.h>
@@ -3046,7 +3050,7 @@ extern "C" JNIEXPORT int fork1() { return fork(); }
// Handle request to load libnuma symbol version 1.1 (API v1). If it fails
// load symbol from base version instead.
void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
-#ifndef __UCLIBC__
+#if !defined(__UCLIBC__) || !defined(__ANDROID__)
void *f = dlvsym(handle, name, "libnuma_1.1");
if (f == NULL) {
f = dlsym(handle, name);
@@ -5976,7 +5980,7 @@ bool os::is_thread_cpu_time_supported() {
// Linux doesn't yet have a (official) notion of processor sets,
// so just return the system wide load average.
int os::loadavg(double loadavg[], int nelem) {
-#ifndef __UCLIBC__
+#if !defined(__UCLIBC__) || !defined(__ANDROID__)
return ::getloadavg(loadavg, nelem);
#else
return -1;
diff --git a/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp b/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp
index 2883fc17..0292a17f 100644
--- a/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp
+++ b/hotspot/src/os_cpu/linux_aarch32/vm/os_linux_aarch32.cpp
@@ -75,7 +75,9 @@
# include <pwd.h>
# include <poll.h>
# include <ucontext.h>
+#ifndef __ANDROID__
# include <fpu_control.h>
+#endif
#define REG_FP 29
#define SPELL_REG_SP "sp"