New package: openjdk11-11.0.5+10
This commit is contained in:
parent
0ee2c1209b
commit
262f0e1e23
9 changed files with 1120 additions and 0 deletions
|
@ -1781,6 +1781,12 @@ libawt_xawt.so openjdk-jre-8u20_1
|
|||
libjava.so openjdk-jre-8u20_1
|
||||
libjli.so openjdk-jre-8u20_1
|
||||
libjvm.so openjdk-jre-8u20_1
|
||||
libjawt.so openjdk11-11.0.5+10_1
|
||||
libawt.so openjdk11-11.0.5+10_1
|
||||
libawt_xawt.so openjdk11-11.0.5+10_1
|
||||
libjava.so openjdk11-11.0.5+10_1
|
||||
libjli.so openjdk11-11.0.5+10_1
|
||||
libjvm.so openjdk11-11.0.5+10_1
|
||||
libucl.so.5 libucl-0.8.1_1
|
||||
libhandle.so.1 xfsprogs-3.2.1_1
|
||||
libnfnetlink.so.0 libnfnetlink-1.0.1_1
|
||||
|
|
1
srcpkgs/openjdk11-doc
Symbolic link
1
srcpkgs/openjdk11-doc
Symbolic link
|
@ -0,0 +1 @@
|
|||
openjdk11
|
1
srcpkgs/openjdk11-src
Symbolic link
1
srcpkgs/openjdk11-src
Symbolic link
|
@ -0,0 +1 @@
|
|||
openjdk11
|
11
srcpkgs/openjdk11/files/musl_patches/aarch64.patch
Normal file
11
srcpkgs/openjdk11/files/musl_patches/aarch64.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280
|
||||
--- old/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
|
||||
+++ new/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
|
||||
@@ -77,7 +77,6 @@
|
||||
# include <pwd.h>
|
||||
# include <poll.h>
|
||||
# include <ucontext.h>
|
||||
-# include <fpu_control.h>
|
||||
|
||||
#ifdef BUILTIN_SIM
|
||||
#define REG_SP REG_RSP
|
30
srcpkgs/openjdk11/files/musl_patches/arm.patch
Normal file
30
srcpkgs/openjdk11/files/musl_patches/arm.patch
Normal file
|
@ -0,0 +1,30 @@
|
|||
Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280
|
||||
--- old/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
|
||||
+++ new/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp
|
||||
@@ -71,7 +71,6 @@
|
||||
# include <pwd.h>
|
||||
# include <poll.h>
|
||||
# include <ucontext.h>
|
||||
-# include <fpu_control.h>
|
||||
# include <asm/ptrace.h>
|
||||
|
||||
#define SPELL_REG_SP "sp"
|
||||
@@ -104,6 +103,18 @@
|
||||
#define ARM_REGS_IN_CONTEXT 31
|
||||
|
||||
#else
|
||||
+
|
||||
+// Stupid hack as the origin if below doesnt compile with gcc 8.2.0:
|
||||
+//
|
||||
+// os_linux_arm.cpp:114:5: error: missing binary operator before token "("
|
||||
+// #if NGREG == 16
|
||||
+// ^~~~~
|
||||
+//
|
||||
+// The NGREG is 18, so force it to that value.
|
||||
+#ifdef NGREG
|
||||
+# undef NGREG
|
||||
+#endif
|
||||
+#define NGREG 18
|
||||
|
||||
#if NGREG == 16
|
||||
// These definitions are based on the observation that until
|
537
srcpkgs/openjdk11/files/musl_patches/build.patch
Normal file
537
srcpkgs/openjdk11/files/musl_patches/build.patch
Normal file
|
@ -0,0 +1,537 @@
|
|||
Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280
|
||||
--- old/make/ReleaseFile.gmk
|
||||
+++ new/make/ReleaseFile.gmk
|
||||
@@ -53,6 +53,7 @@
|
||||
$(call info-file-item, "JAVA_VERSION_DATE", "$(VERSION_DATE)")
|
||||
$(call info-file-item, "OS_NAME", "$(RELEASE_FILE_OS_NAME)")
|
||||
$(call info-file-item, "OS_ARCH", "$(RELEASE_FILE_OS_ARCH)")
|
||||
+ $(call info-file-item, "LIBC", "musl")
|
||||
endef
|
||||
|
||||
# Param 1 - The file containing the MODULES list
|
||||
--- old/make/autoconf/build-aux/config.guess
|
||||
+++ new/make/autoconf/build-aux/config.guess
|
||||
@@ -30,6 +30,17 @@
|
||||
DIR=`dirname $0`
|
||||
OUT=`. $DIR/autoconf-config.guess`
|
||||
|
||||
+# config.guess doesn't identify systems running the musl C library, and will
|
||||
+# instead return a string with a -gnu suffix. This block detects musl and
|
||||
+# modifies the string to have a -musl suffix instead.
|
||||
+echo $OUT | grep -- -linux- > /dev/null 2> /dev/null
|
||||
+if test $? = 0; then
|
||||
+ ldd_version=`ldd --version 2>&1 | head -1 | cut -f1 -d' '`
|
||||
+ if [ x"${ldd_version}" = x"musl" ]; then
|
||||
+ OUT=`echo $OUT | sed 's/-gnu/-musl/'`
|
||||
+ fi
|
||||
+fi
|
||||
+
|
||||
# Test and fix solaris on x86_64
|
||||
echo $OUT | grep i386-pc-solaris > /dev/null 2> /dev/null
|
||||
if test $? = 0; then
|
||||
--- old/make/hotspot/lib/CompileJvm.gmk
|
||||
+++ new/make/hotspot/lib/CompileJvm.gmk
|
||||
@@ -77,6 +77,7 @@
|
||||
-DHOTSPOT_BUILD_USER='"$(USERNAME)"' \
|
||||
-DHOTSPOT_VM_DISTRO='"$(HOTSPOT_VM_DISTRO)"' \
|
||||
-DCPU='"$(OPENJDK_TARGET_CPU_VM_VERSION)"' \
|
||||
+ -DLIBC='"musl"' \
|
||||
#
|
||||
|
||||
################################################################################
|
||||
--- old/make/lib/CoreLibraries.gmk
|
||||
+++ new/make/lib/CoreLibraries.gmk
|
||||
@@ -241,6 +241,7 @@
|
||||
endif
|
||||
|
||||
LIBJLI_CFLAGS += $(LIBZ_CFLAGS)
|
||||
+LIBJLI_CFLAGS += -DLIBC=\"musl\"
|
||||
|
||||
ifneq ($(USE_EXTERNAL_LIBZ), true)
|
||||
LIBJLI_EXTRA_FILES += \
|
||||
--- old/src/hotspot/os/linux/os_linux.cpp
|
||||
+++ new/src/hotspot/os/linux/os_linux.cpp
|
||||
@@ -99,7 +99,6 @@
|
||||
# include <string.h>
|
||||
# include <syscall.h>
|
||||
# include <sys/sysinfo.h>
|
||||
-# include <gnu/libc-version.h>
|
||||
# include <sys/ipc.h>
|
||||
# include <sys/shm.h>
|
||||
# include <link.h>
|
||||
@@ -511,6 +510,11 @@
|
||||
// detecting pthread library
|
||||
|
||||
void os::Linux::libpthread_init() {
|
||||
+#if !defined(__GLIBC__) && !defined(__UCLIBC__)
|
||||
+ // Hard code Alpine Linux supported musl compatible settings
|
||||
+ os::Linux::set_glibc_version("glibc 2.9");
|
||||
+ os::Linux::set_libpthread_version("NPTL");
|
||||
+#else
|
||||
// Save glibc and pthread version strings.
|
||||
#if !defined(_CS_GNU_LIBC_VERSION) || \
|
||||
!defined(_CS_GNU_LIBPTHREAD_VERSION)
|
||||
@@ -528,6 +532,7 @@
|
||||
str = (char *)malloc(n, mtInternal);
|
||||
confstr(_CS_GNU_LIBPTHREAD_VERSION, str, n);
|
||||
os::Linux::set_libpthread_version(str);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -2916,20 +2921,36 @@
|
||||
extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { }
|
||||
extern "C" JNIEXPORT void numa_error(char *where) { }
|
||||
|
||||
+static void* dlvsym_if_available(void* handle, const char* name, const char* version) {
|
||||
+ typedef void* (*dlvsym_func_type)(void* handle, const char* name, const char* version);
|
||||
+ static dlvsym_func_type dlvsym_func;
|
||||
+ static bool initialized = false;
|
||||
+
|
||||
+ if (!initialized) {
|
||||
+ dlvsym_func = (dlvsym_func_type)dlsym(RTLD_NEXT, "dlvsym");
|
||||
+ initialized = true;
|
||||
+ }
|
||||
+
|
||||
+ if (dlvsym_func != NULL) {
|
||||
+ void *f = dlvsym_func(handle, name, version);
|
||||
+ if (f != NULL) {
|
||||
+ return f;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return dlsym(handle, name);
|
||||
+}
|
||||
+
|
||||
// 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) {
|
||||
- void *f = dlvsym(handle, name, "libnuma_1.1");
|
||||
- if (f == NULL) {
|
||||
- f = dlsym(handle, name);
|
||||
- }
|
||||
- return f;
|
||||
+ return dlvsym_if_available(handle, name, "libnuma_1.1");
|
||||
}
|
||||
|
||||
// Handle request to load libnuma symbol version 1.2 (API v2) only.
|
||||
// Return NULL if the symbol is not defined in this particular version.
|
||||
void* os::Linux::libnuma_v2_dlsym(void* handle, const char* name) {
|
||||
- return dlvsym(handle, name, "libnuma_1.2");
|
||||
+ return dlvsym_if_available(handle, name, "libnuma_1.2");
|
||||
}
|
||||
|
||||
bool os::Linux::libnuma_init() {
|
||||
--- old/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
|
||||
+++ new/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
|
||||
@@ -75,9 +75,6 @@
|
||||
# include <pwd.h>
|
||||
# include <poll.h>
|
||||
# include <ucontext.h>
|
||||
-#ifndef AMD64
|
||||
-# include <fpu_control.h>
|
||||
-#endif
|
||||
|
||||
#ifdef AMD64
|
||||
#define REG_SP REG_RSP
|
||||
--- old/src/hotspot/share/gc/shared/genCollectedHeap.cpp
|
||||
+++ new/src/hotspot/share/gc/shared/genCollectedHeap.cpp
|
||||
@@ -1147,7 +1147,7 @@
|
||||
static ScratchBlock *removeSmallestScratch(ScratchBlock **prev_ptr) {
|
||||
bool first = true;
|
||||
size_t min_size = 0; // "first" makes this conceptually infinite.
|
||||
- ScratchBlock **smallest_ptr, *smallest;
|
||||
+ ScratchBlock **smallest_ptr = NULL, *smallest;
|
||||
ScratchBlock *cur = *prev_ptr;
|
||||
while (cur) {
|
||||
assert(*prev_ptr == cur, "just checking");
|
||||
--- old/src/hotspot/share/runtime/vm_version.cpp
|
||||
+++ new/src/hotspot/share/runtime/vm_version.cpp
|
||||
@@ -272,7 +272,7 @@
|
||||
#endif
|
||||
|
||||
#define INTERNAL_VERSION_SUFFIX VM_RELEASE ")" \
|
||||
- " for " OS "-" CPU FLOAT_ARCH_STR \
|
||||
+ " for " OS "-" CPU FLOAT_ARCH_STR LIBC \
|
||||
" JRE (" VERSION_STRING "), built on " __DATE__ " " __TIME__ \
|
||||
" by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER
|
||||
|
||||
--- old/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
|
||||
+++ new/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
|
||||
@@ -204,7 +204,7 @@
|
||||
#elif defined(__APPLE__)
|
||||
inline int g_isnan(double f) { return isnan(f); }
|
||||
#elif defined(LINUX) || defined(_ALLBSD_SOURCE)
|
||||
-inline int g_isnan(float f) { return isnanf(f); }
|
||||
+inline int g_isnan(float f) { return isnan(f); }
|
||||
inline int g_isnan(double f) { return isnan(f); }
|
||||
#else
|
||||
#error "missing platform-specific definition here"
|
||||
--- old/src/java.base/linux/native/libnet/linux_close.c
|
||||
+++ new/src/java.base/linux/native/libnet/linux_close.c
|
||||
@@ -60,7 +60,7 @@
|
||||
/*
|
||||
* Signal to unblock thread
|
||||
*/
|
||||
-static int sigWakeup = (__SIGRTMAX - 2);
|
||||
+static int sigWakeup;
|
||||
|
||||
/*
|
||||
* fdTable holds one entry per file descriptor, up to a certain
|
||||
@@ -149,6 +149,7 @@
|
||||
/*
|
||||
* Setup the signal handler
|
||||
*/
|
||||
+ sigWakeup = SIGRTMAX - 2;
|
||||
sa.sa_handler = sig_wakeup;
|
||||
sa.sa_flags = 0;
|
||||
sigemptyset(&sa.sa_mask);
|
||||
--- old/src/java.base/unix/native/libjava/childproc.c
|
||||
+++ new/src/java.base/unix/native/libjava/childproc.c
|
||||
@@ -237,7 +237,13 @@
|
||||
{
|
||||
if (envp == NULL || (char **) envp == environ) {
|
||||
execvp(file, (char **) argv);
|
||||
- return;
|
||||
+ // ENOEXEC indicates that the file header was not recognized. The musl C
|
||||
+ // library does not implement the fallback to /bin/sh for that case, so fall
|
||||
+ // through to the code below which implements that fallback using
|
||||
+ // execve_with_shell_fallback.
|
||||
+ if (errno != ENOEXEC) {
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (*file == '\0') {
|
||||
--- old/src/java.base/unix/native/libjava/jdk_util_md.h
|
||||
+++ new/src/java.base/unix/native/libjava/jdk_util_md.h
|
||||
@@ -37,7 +37,7 @@
|
||||
#define ISNAND(d) isnan(d)
|
||||
#elif defined(__linux__) || defined(_ALLBSD_SOURCE)
|
||||
#include <math.h>
|
||||
-#define ISNANF(f) isnanf(f)
|
||||
+#define ISNANF(f) isnan(f)
|
||||
#define ISNAND(d) isnan(d)
|
||||
#elif defined(_AIX)
|
||||
#include <math.h>
|
||||
--- old/src/java.base/unix/native/libjli/java_md_solinux.c
|
||||
+++ new/src/java.base/unix/native/libjli/java_md_solinux.c
|
||||
@@ -235,6 +235,39 @@
|
||||
char *dmllp = NULL;
|
||||
char *p; /* a utility pointer */
|
||||
|
||||
+#ifdef __linux
|
||||
+#ifndef LIBC
|
||||
+#error "LIBC not set"
|
||||
+#endif
|
||||
+
|
||||
+ if (strcmp(LIBC, "musl") == 0) {
|
||||
+ /*
|
||||
+ * The musl library loader requires LD_LIBRARY_PATH to be set in
|
||||
+ * order to correctly resolve the dependency libjava.so has on libjvm.so.
|
||||
+ *
|
||||
+ * Specifically, it differs from glibc in the sense that even if
|
||||
+ * libjvm.so has already been loaded it will not be considered a
|
||||
+ * candidate for resolving the dependency unless the *full* path
|
||||
+ * of the already loaded library matches the dependency being loaded.
|
||||
+ *
|
||||
+ * libjvm.so is being loaded by the launcher using a long path to
|
||||
+ * dlopen, not just the basename of the library. Typically this
|
||||
+ * is something like "../lib/server/libjvm.so". However, if/when
|
||||
+ * libjvm.so later tries to dlopen libjava.so (which it does in
|
||||
+ * order to get access to a few functions implemented in
|
||||
+ * libjava.so) the musl loader will, as part of loading
|
||||
+ * dependent libraries, try to load libjvm.so using only its
|
||||
+ * basename "libjvm.so". Since this does not match the longer
|
||||
+ * path path it was first loaded with, the already loaded
|
||||
+ * library is not considered a candidate, and the loader will
|
||||
+ * instead look for libjvm.so elsewhere. If it's not in
|
||||
+ * LD_LIBRARY_PATH the dependency load will fail, and libjava.so
|
||||
+ * will therefore fail as well.
|
||||
+ */
|
||||
+ return JNI_TRUE;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
#ifdef AIX
|
||||
/* We always have to set the LIBPATH on AIX because ld doesn't support $ORIGIN. */
|
||||
return JNI_TRUE;
|
||||
--- old/src/java.base/unix/native/libnio/ch/NativeThread.c
|
||||
+++ new/src/java.base/unix/native/libnio/ch/NativeThread.c
|
||||
@@ -36,7 +36,7 @@
|
||||
#ifdef __linux__
|
||||
#include <pthread.h>
|
||||
/* Also defined in net/linux_close.c */
|
||||
- #define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
|
||||
+ #define INTERRUPT_SIGNAL (SIGRTMAX - 2)
|
||||
#elif _AIX
|
||||
#include <pthread.h>
|
||||
/* Also defined in net/aix_close.c */
|
||||
--- old/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
|
||||
+++ new/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
|
||||
@@ -27,9 +27,6 @@
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xos.h>
|
||||
#include <X11/Xatom.h>
|
||||
-#ifdef __linux__
|
||||
-#include <execinfo.h>
|
||||
-#endif
|
||||
|
||||
#include <jvm.h>
|
||||
#include <jni.h>
|
||||
@@ -786,26 +783,6 @@
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
-
|
||||
-#ifdef __linux__
|
||||
-void print_stack(void)
|
||||
-{
|
||||
- void *array[10];
|
||||
- size_t size;
|
||||
- char **strings;
|
||||
- size_t i;
|
||||
-
|
||||
- size = backtrace (array, 10);
|
||||
- strings = backtrace_symbols (array, size);
|
||||
-
|
||||
- fprintf (stderr, "Obtained %zd stack frames.\n", size);
|
||||
-
|
||||
- for (i = 0; i < size; i++)
|
||||
- fprintf (stderr, "%s\n", strings[i]);
|
||||
-
|
||||
- free (strings);
|
||||
-}
|
||||
-#endif
|
||||
|
||||
Window get_xawt_root_shell(JNIEnv *env) {
|
||||
static jclass classXRootWindow = NULL;
|
||||
--- old/src/jdk.jdwp.agent/share/native/libjdwp/util.h
|
||||
+++ new/src/jdk.jdwp.agent/share/native/libjdwp/util.h
|
||||
@@ -35,15 +35,15 @@
|
||||
#ifdef DEBUG
|
||||
/* Just to make sure these interfaces are not used here. */
|
||||
#undef free
|
||||
- #define free(p) Do not use this interface.
|
||||
+ #define free do_not_use_this_interface_free
|
||||
#undef malloc
|
||||
- #define malloc(p) Do not use this interface.
|
||||
+ #define malloc do_not_use_this_interface_malloc
|
||||
#undef calloc
|
||||
- #define calloc(p) Do not use this interface.
|
||||
+ #define calloc do_not_use_this_interface_calloc
|
||||
#undef realloc
|
||||
- #define realloc(p) Do not use this interface.
|
||||
+ #define realloc do_not_use_this_interface_realloc
|
||||
#undef strdup
|
||||
- #define strdup(p) Do not use this interface.
|
||||
+ #define strdup do_not_use_this_interface_strdup
|
||||
#endif
|
||||
|
||||
#include "log_messages.h"
|
||||
--- old/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
|
||||
+++ new/test/hotspot/jtreg/runtime/StackGuardPages/exeinvoke.c
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#include <assert.h>
|
||||
#include <jni.h>
|
||||
+#include <jvm.h>
|
||||
#include <alloca.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
@@ -91,6 +92,20 @@
|
||||
}
|
||||
}
|
||||
|
||||
+int get_java_stacksize () {
|
||||
+ size_t stacksize;
|
||||
+ pthread_attr_t attr;
|
||||
+ JDK1_1InitArgs jdk_args;
|
||||
+
|
||||
+ jdk_args.version = JNI_VERSION_1_1;
|
||||
+ JNI_GetDefaultJavaVMInitArgs(&jdk_args);
|
||||
+ if (jdk_args.javaStackSize <= 0) {
|
||||
+ fprintf(stderr, "Test ERROR. Can't get a valid value for the default stacksize.\n");
|
||||
+ exit(7);
|
||||
+ }
|
||||
+ return jdk_args.javaStackSize;
|
||||
+}
|
||||
+
|
||||
void *run_java_overflow (void *p) {
|
||||
JNIEnv *env;
|
||||
jclass class_id;
|
||||
@@ -254,13 +269,19 @@
|
||||
exit(7);
|
||||
}
|
||||
|
||||
+ int stack_size = get_java_stacksize();
|
||||
pthread_t thr;
|
||||
+ pthread_attr_t thread_attr;
|
||||
|
||||
+ pthread_attr_init(&thread_attr);
|
||||
+ pthread_attr_setstacksize(&thread_attr, stack_size);
|
||||
+
|
||||
if (argc > 1 && strcmp(argv[1], "test_java_overflow") == 0) {
|
||||
printf("\nTesting JAVA_OVERFLOW\n");
|
||||
|
||||
printf("Testing stack guard page behaviour for other thread\n");
|
||||
- pthread_create (&thr, NULL, run_java_overflow, NULL);
|
||||
+
|
||||
+ pthread_create (&thr, &thread_attr, run_java_overflow, NULL);
|
||||
pthread_join (thr, NULL);
|
||||
|
||||
printf("Testing stack guard page behaviour for initial thread\n");
|
||||
@@ -273,7 +294,7 @@
|
||||
printf("\nTesting NATIVE_OVERFLOW\n");
|
||||
|
||||
printf("Testing stack guard page behaviour for other thread\n");
|
||||
- pthread_create (&thr, NULL, run_native_overflow, NULL);
|
||||
+ pthread_create (&thr, &thread_attr, run_native_overflow, NULL);
|
||||
pthread_join (thr, NULL);
|
||||
|
||||
printf("Testing stack guard page behaviour for initial thread\n");
|
||||
--- old/test/jdk/java/lang/ProcessBuilder/Basic.java
|
||||
+++ new/test/jdk/java/lang/ProcessBuilder/Basic.java
|
||||
@@ -389,8 +389,8 @@
|
||||
if (failed != 0) throw new Error("null PATH");
|
||||
} else if (action.equals("PATH search algorithm")) {
|
||||
equal(System.getenv("PATH"), "dir1:dir2:");
|
||||
- check(new File("/bin/true").exists());
|
||||
- check(new File("/bin/false").exists());
|
||||
+ check(new File(TrueExe.path()).exists());
|
||||
+ check(new File(FalseExe.path()).exists());
|
||||
String[] cmd = {"prog"};
|
||||
ProcessBuilder pb1 = new ProcessBuilder(cmd);
|
||||
ProcessBuilder pb2 = new ProcessBuilder(cmd);
|
||||
@@ -431,13 +431,13 @@
|
||||
checkPermissionDenied(pb);
|
||||
|
||||
// continue searching if EACCES
|
||||
- copy("/bin/true", "dir2/prog");
|
||||
+ copy(TrueExe.path(), "dir2/prog");
|
||||
equal(run(pb).exitValue(), True.exitValue());
|
||||
new File("dir1/prog").delete();
|
||||
new File("dir2/prog").delete();
|
||||
|
||||
new File("dir2/prog").mkdirs();
|
||||
- copy("/bin/true", "dir1/prog");
|
||||
+ copy(TrueExe.path(), "dir1/prog");
|
||||
equal(run(pb).exitValue(), True.exitValue());
|
||||
|
||||
// Check empty PATH component means current directory.
|
||||
@@ -453,10 +453,10 @@
|
||||
pb.command(command);
|
||||
File prog = new File("./prog");
|
||||
// "Normal" binaries
|
||||
- copy("/bin/true", "./prog");
|
||||
+ copy(TrueExe.path(), "./prog");
|
||||
equal(run(pb).exitValue(),
|
||||
True.exitValue());
|
||||
- copy("/bin/false", "./prog");
|
||||
+ copy(FalseExe.path(), "./prog");
|
||||
equal(run(pb).exitValue(),
|
||||
False.exitValue());
|
||||
prog.delete();
|
||||
@@ -511,12 +511,12 @@
|
||||
new File("dir2/prog").delete();
|
||||
new File("prog").delete();
|
||||
new File("dir3").mkdirs();
|
||||
- copy("/bin/true", "dir1/prog");
|
||||
- copy("/bin/false", "dir3/prog");
|
||||
+ copy(TrueExe.path(), "dir1/prog");
|
||||
+ copy(FalseExe.path(), "dir3/prog");
|
||||
pb.environment().put("PATH","dir3");
|
||||
equal(run(pb).exitValue(), True.exitValue());
|
||||
- copy("/bin/true", "dir3/prog");
|
||||
- copy("/bin/false", "dir1/prog");
|
||||
+ copy(TrueExe.path(), "dir3/prog");
|
||||
+ copy(FalseExe.path(), "dir1/prog");
|
||||
equal(run(pb).exitValue(), False.exitValue());
|
||||
|
||||
} finally {
|
||||
@@ -613,6 +613,13 @@
|
||||
new File("/bin/false").exists());
|
||||
}
|
||||
|
||||
+ static class BusyBox {
|
||||
+ public static boolean is() { return is; }
|
||||
+ private static final boolean is =
|
||||
+ (! Windows.is() &&
|
||||
+ new File("/bin/busybox").exists());
|
||||
+ }
|
||||
+
|
||||
static class UnicodeOS {
|
||||
public static boolean is() { return is; }
|
||||
private static final String osName = System.getProperty("os.name");
|
||||
@@ -651,6 +658,45 @@
|
||||
}
|
||||
}
|
||||
|
||||
+ // On alpine linux, /bin/true and /bin/false are just links to /bin/busybox.
|
||||
+ // Some tests copy /bin/true and /bin/false to files with a different filename.
|
||||
+ // However, copying the busbox executable into a file with a different name
|
||||
+ // won't result in the expected return codes. As workaround, we create
|
||||
+ // executable files that can be copied and produce the exepected return
|
||||
+ // values. We use this workaround, if we find the busybox executable.
|
||||
+
|
||||
+ private static class TrueExe {
|
||||
+ public static String path() { return path; }
|
||||
+ private static final String path = path0();
|
||||
+ private static String path0(){
|
||||
+ if (!BusyBox.is()) {
|
||||
+ return "/bin/true";
|
||||
+ }
|
||||
+ else {
|
||||
+ File trueExe = new File("true");
|
||||
+ setFileContents(trueExe, "#!/bin/true\n");
|
||||
+ trueExe.setExecutable(true);
|
||||
+ return trueExe.getAbsolutePath();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ private static class FalseExe {
|
||||
+ public static String path() { return path; }
|
||||
+ private static final String path = path0();
|
||||
+ private static String path0(){
|
||||
+ if (!BusyBox.is()) {
|
||||
+ return "/bin/false";
|
||||
+ }
|
||||
+ else {
|
||||
+ File falseExe = new File("false");
|
||||
+ setFileContents(falseExe, "#!/bin/false\n");
|
||||
+ falseExe.setExecutable(true);
|
||||
+ return falseExe.getAbsolutePath();
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
static class EnglishUnix {
|
||||
private static final Boolean is =
|
||||
(! Windows.is() && isEnglish("LANG") && isEnglish("LC_ALL"));
|
||||
@@ -1954,7 +2000,7 @@
|
||||
//----------------------------------------------------------------
|
||||
try {
|
||||
new File("suBdiR").mkdirs();
|
||||
- copy("/bin/true", "suBdiR/unliKely");
|
||||
+ copy(TrueExe.path(), "suBdiR/unliKely");
|
||||
final ProcessBuilder pb =
|
||||
new ProcessBuilder(new String[]{"unliKely"});
|
||||
pb.environment().put("PATH", "suBdiR");
|
||||
--- old/test/jdk/java/lang/ProcessHandle/InfoTest.java
|
||||
+++ new/test/jdk/java/lang/ProcessHandle/InfoTest.java
|
||||
@@ -298,6 +298,13 @@
|
||||
}
|
||||
if (info.command().isPresent()) {
|
||||
String command = info.command().get();
|
||||
- String expected = Platform.isWindows() ? "sleep.exe" : "sleep";
|
||||
+ String expected = "sleep";
|
||||
+ if (Platform.isWindows()) {
|
||||
+ expected = "sleep.exe";
|
||||
+ } else if (new File("/bin/busybox").exists()) {
|
||||
+ // With busybox sleep is just a sym link to busybox.
|
||||
+ // The busbox executable is seen as ProcessHandle.Info command.
|
||||
+ expected = "busybox";
|
||||
+ }
|
||||
Assert.assertTrue(command.endsWith(expected), "Command: expected: \'" +
|
||||
expected + "\', actual: " + command);
|
221
srcpkgs/openjdk11/files/musl_patches/ppc64le.patch
Normal file
221
srcpkgs/openjdk11/files/musl_patches/ppc64le.patch
Normal file
|
@ -0,0 +1,221 @@
|
|||
Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280
|
||||
--- old/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
|
||||
+++ new/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
|
||||
@@ -1290,7 +1290,11 @@
|
||||
// the safepoing polling page.
|
||||
ucontext_t* uc = (ucontext_t*) ucontext;
|
||||
// Set polling address.
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
address addr = (address)uc->uc_mcontext.regs->gpr[ra] + (ssize_t)ds;
|
||||
+#else // Musl
|
||||
+ address addr = (address)uc->uc_mcontext.gp_regs[ra] + (ssize_t) ds;
|
||||
+#endif
|
||||
if (polling_address_ptr != NULL) {
|
||||
*polling_address_ptr = addr;
|
||||
}
|
||||
@@ -1311,15 +1315,24 @@
|
||||
int rb = inv_rb_field(instruction);
|
||||
|
||||
// look up content of ra and rb in ucontext
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
address ra_val=(address)uc->uc_mcontext.regs->gpr[ra];
|
||||
long rb_val=(long)uc->uc_mcontext.regs->gpr[rb];
|
||||
+#else // Musl
|
||||
+ address ra_val=(address)uc->uc_mcontext.gp_regs[ra];
|
||||
+ long rb_val=(long)uc->uc_mcontext.gp_regs[rb];
|
||||
+#endif
|
||||
return os::is_memory_serialize_page(thread, ra_val+rb_val);
|
||||
} else if (is_stw(instruction) || is_stwu(instruction)) {
|
||||
int ra = inv_ra_field(instruction);
|
||||
int d1 = inv_d1_field(instruction);
|
||||
|
||||
// look up content of ra in ucontext
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
address ra_val=(address)uc->uc_mcontext.regs->gpr[ra];
|
||||
+#else // Musl
|
||||
+ address ra_val=(address)uc->uc_mcontext.gp_regs[ra];
|
||||
+#endif
|
||||
return os::is_memory_serialize_page(thread, ra_val+d1);
|
||||
} else {
|
||||
return false;
|
||||
@@ -1382,11 +1395,20 @@
|
||||
|| (is_stdu(instruction) && rs == 1)) {
|
||||
int ds = inv_ds_field(instruction);
|
||||
// return banged address
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
return ds+(address)uc->uc_mcontext.regs->gpr[ra];
|
||||
+#else // Musl
|
||||
+ return ds+(address)uc->uc_mcontext.gp_regs[ra];
|
||||
+#endif
|
||||
} else if (is_stdux(instruction) && rs == 1) {
|
||||
int rb = inv_rb_field(instruction);
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
address sp = (address)uc->uc_mcontext.regs->gpr[1];
|
||||
long rb_val = (long)uc->uc_mcontext.regs->gpr[rb];
|
||||
+#else // Musl
|
||||
+ address sp = (address)uc->uc_mcontext.gp_regs[1];
|
||||
+ long rb_val = (long)uc->uc_mcontext.gp_regs[rb];
|
||||
+#endif
|
||||
return ra != 1 || rb_val >= 0 ? NULL // not a stack bang
|
||||
: sp + rb_val; // banged address
|
||||
}
|
||||
--- old/src/hotspot/cpu/ppc/vm_version_ppc.cpp
|
||||
+++ new/src/hotspot/cpu/ppc/vm_version_ppc.cpp
|
||||
@@ -768,7 +768,7 @@
|
||||
unsigned long auxv = getauxval(AT_HWCAP2);
|
||||
|
||||
if (auxv & PPC_FEATURE2_HTM_NOSC) {
|
||||
- if (auxv & PPC_FEATURE2_HAS_HTM) {
|
||||
+ if (auxv & PPC_FEATURE2_HTM) {
|
||||
// TM on POWER8 and POWER9 in compat mode (VM) is supported by the JVM.
|
||||
// TM on POWER9 DD2.1 NV (baremetal) is not supported by the JVM (TM on
|
||||
// POWER9 DD2.1 NV has a few issues that need a couple of firmware
|
||||
--- old/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
|
||||
+++ new/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
|
||||
@@ -108,24 +108,42 @@
|
||||
// - if uc was filled by getcontext(), it is undefined - getcontext() does not fill
|
||||
// it because the volatile registers are not needed to make setcontext() work.
|
||||
// Hopefully it was zero'd out beforehand.
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
guarantee(uc->uc_mcontext.regs != NULL, "only use ucontext_get_pc in sigaction context");
|
||||
return (address)uc->uc_mcontext.regs->nip;
|
||||
+#else // Musl
|
||||
+ guarantee(uc->uc_mcontext.gp_regs != NULL, "only use ucontext_get_pc in sigaction context");
|
||||
+ return (address)uc->uc_mcontext.gp_regs[32];
|
||||
+#endif
|
||||
}
|
||||
|
||||
// modify PC in ucontext.
|
||||
// Note: Only use this for an ucontext handed down to a signal handler. See comment
|
||||
// in ucontext_get_pc.
|
||||
void os::Linux::ucontext_set_pc(ucontext_t * uc, address pc) {
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
guarantee(uc->uc_mcontext.regs != NULL, "only use ucontext_set_pc in sigaction context");
|
||||
uc->uc_mcontext.regs->nip = (unsigned long)pc;
|
||||
+#else // Musl
|
||||
+ guarantee(uc->uc_mcontext.gp_regs != NULL, "only use ucontext_set_pc in sigaction context");
|
||||
+ uc->uc_mcontext.gp_regs[32] = (unsigned long)pc;
|
||||
+#endif
|
||||
}
|
||||
|
||||
static address ucontext_get_lr(const ucontext_t * uc) {
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
return (address)uc->uc_mcontext.regs->link;
|
||||
+#else // Musl
|
||||
+ return (address)uc->uc_mcontext.gp_regs[36];
|
||||
+#endif
|
||||
}
|
||||
|
||||
intptr_t* os::Linux::ucontext_get_sp(const ucontext_t * uc) {
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
return (intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/];
|
||||
+#else // Musl
|
||||
+ return (intptr_t*)uc->uc_mcontext.gp_regs[1/*REG_SP*/];
|
||||
+#endif
|
||||
}
|
||||
|
||||
intptr_t* os::Linux::ucontext_get_fp(const ucontext_t * uc) {
|
||||
@@ -133,7 +151,11 @@
|
||||
}
|
||||
|
||||
static unsigned long ucontext_get_trap(const ucontext_t * uc) {
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
return uc->uc_mcontext.regs->trap;
|
||||
+#else // Musl
|
||||
+ return uc->uc_mcontext.gp_regs[40];
|
||||
+#endif
|
||||
}
|
||||
|
||||
ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
|
||||
@@ -259,7 +281,13 @@
|
||||
// 3.2.1 "Machine State Register"), however note that ISA notation for bit
|
||||
// numbering is MSB 0, so for normal bit numbering (LSB 0) they come to be
|
||||
// bits 33 and 34. It's not related to endianness, just a notation matter.
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
if (second_uc->uc_mcontext.regs->msr & 0x600000000) {
|
||||
+#else // Musl
|
||||
+ // why 33?
|
||||
+ // see comment for glibc NGREG: "r0-r31, nip, msr, lr, etc."
|
||||
+ if (second_uc->uc_mcontext.gp_regs[33] & 0x600000000) {
|
||||
+#endif
|
||||
if (TraceTraps) {
|
||||
tty->print_cr("caught signal in transaction, "
|
||||
"ignoring to jump to abort handler");
|
||||
@@ -586,6 +614,7 @@
|
||||
const ucontext_t* uc = (const ucontext_t*)context;
|
||||
|
||||
st->print_cr("Registers:");
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->nip);
|
||||
st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.regs->link);
|
||||
st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.regs->ctr);
|
||||
@@ -594,8 +623,18 @@
|
||||
st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.regs->gpr[i]);
|
||||
if (i % 3 == 2) st->cr();
|
||||
}
|
||||
+#else // Musl
|
||||
+ st->print("pc =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[32]);
|
||||
+ st->print("lr =" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[36]);
|
||||
+ st->print("ctr=" INTPTR_FORMAT " ", uc->uc_mcontext.gp_regs[35]);
|
||||
st->cr();
|
||||
+ for (int i = 0; i < 32; i++) {
|
||||
+ st->print("r%-2d=" INTPTR_FORMAT " ", i, uc->uc_mcontext.gp_regs[i]);
|
||||
+ if (i % 3 == 2) st->cr();
|
||||
+ }
|
||||
+#endif
|
||||
st->cr();
|
||||
+ st->cr();
|
||||
|
||||
intptr_t *sp = (intptr_t *)os::Linux::ucontext_get_sp(uc);
|
||||
st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", p2i(sp));
|
||||
@@ -618,12 +657,22 @@
|
||||
st->print_cr("Register to memory mapping:");
|
||||
st->cr();
|
||||
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
st->print("pc ="); print_location(st, (intptr_t)uc->uc_mcontext.regs->nip);
|
||||
st->print("lr ="); print_location(st, (intptr_t)uc->uc_mcontext.regs->link);
|
||||
st->print("ctr ="); print_location(st, (intptr_t)uc->uc_mcontext.regs->ctr);
|
||||
+#else // Musl
|
||||
+ st->print("pc ="); print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[32]);
|
||||
+ st->print("lr ="); print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[36]);
|
||||
+ st->print("ctr ="); print_location(st, (intptr_t)uc->uc_mcontext.gp_regs[35]);
|
||||
+#endif
|
||||
for (int i = 0; i < 32; i++) {
|
||||
st->print("r%-2d=", i);
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
print_location(st, uc->uc_mcontext.regs->gpr[i]);
|
||||
+#else // Musl
|
||||
+ print_location(st, uc->uc_mcontext.gp_regs[i]);
|
||||
+#endif
|
||||
}
|
||||
st->cr();
|
||||
}
|
||||
--- old/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
|
||||
+++ new/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
|
||||
@@ -56,8 +56,13 @@
|
||||
// if we were running Java code when SIGPROF came in.
|
||||
if (isInJava) {
|
||||
ucontext_t* uc = (ucontext_t*) ucontext;
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
frame ret_frame((intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/],
|
||||
(address)uc->uc_mcontext.regs->nip);
|
||||
+#else // Musl
|
||||
+ frame ret_frame((intptr_t*)uc->uc_mcontext.gp_regs[1/*REG_SP*/],
|
||||
+ (address)uc->uc_mcontext.gp_regs[32]);
|
||||
+#endif
|
||||
|
||||
if (ret_frame.pc() == NULL) {
|
||||
// ucontext wasn't useful
|
||||
@@ -69,7 +74,11 @@
|
||||
if (!((Method*)(istate->method))->is_metaspace_object()) {
|
||||
return false;
|
||||
}
|
||||
+#if defined(__GLIBC__) || defined(__UCLIBC__)
|
||||
uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/];
|
||||
+#else // Musl
|
||||
+ uint64_t reg_bcp = uc->uc_mcontext.gp_regs[14/*R14_bcp*/];
|
||||
+#endif
|
||||
uint64_t istate_bcp = istate->bcp;
|
||||
uint64_t code_start = (uint64_t)(((Method*)(istate->method))->code_base());
|
||||
uint64_t code_end = (uint64_t)(((Method*)istate->method)->code_base() + ((Method*)istate->method)->code_size());
|
130
srcpkgs/openjdk11/files/musl_patches/x86.patch
Normal file
130
srcpkgs/openjdk11/files/musl_patches/x86.patch
Normal file
|
@ -0,0 +1,130 @@
|
|||
Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280
|
||||
--- old/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
|
||||
+++ new/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
|
||||
@@ -90,6 +90,126 @@
|
||||
#define SPELL_REG_FP "ebp"
|
||||
#endif // AMD64
|
||||
|
||||
+// ==============================================================================
|
||||
+// Taken from glibc 2.28
|
||||
+// source: https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/x86/fpu_control.h;h=4cb98c5679b2897ff4e5826d228cba6be589e24d;hb=3c03baca37fdcb52c3881e653ca392bba7a99c2b
|
||||
+// ==============================================================================
|
||||
+#ifndef AMD64
|
||||
+/* FPU control word bits. x86 version.
|
||||
+ Copyright (C) 1993-2018 Free Software Foundation, Inc.
|
||||
+ This file is part of the GNU C Library.
|
||||
+ Contributed by Olaf Flebbe.
|
||||
+
|
||||
+ The GNU C Library is free software; you can redistribute it and/or
|
||||
+ modify it under the terms of the GNU Lesser General Public
|
||||
+ License as published by the Free Software Foundation; either
|
||||
+ version 2.1 of the License, or (at your option) any later version.
|
||||
+
|
||||
+ The GNU C Library is distributed in the hope that it will be useful,
|
||||
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+ Lesser General Public License for more details.
|
||||
+
|
||||
+ You should have received a copy of the GNU Lesser General Public
|
||||
+ License along with the GNU C Library; if not, see
|
||||
+ <http://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+#ifndef _FPU_CONTROL_H
|
||||
+#define _FPU_CONTROL_H 1
|
||||
+
|
||||
+/* Note that this file sets on x86-64 only the x87 FPU, it does not
|
||||
+ touch the SSE unit. */
|
||||
+
|
||||
+/* Here is the dirty part. Set up your 387 through the control word
|
||||
+ * (cw) register.
|
||||
+ *
|
||||
+ * 15-13 12 11-10 9-8 7-6 5 4 3 2 1 0
|
||||
+ * | reserved | IC | RC | PC | reserved | PM | UM | OM | ZM | DM | IM
|
||||
+ *
|
||||
+ * IM: Invalid operation mask
|
||||
+ * DM: Denormalized operand mask
|
||||
+ * ZM: Zero-divide mask
|
||||
+ * OM: Overflow mask
|
||||
+ * UM: Underflow mask
|
||||
+ * PM: Precision (inexact result) mask
|
||||
+ *
|
||||
+ * Mask bit is 1 means no interrupt.
|
||||
+ *
|
||||
+ * PC: Precision control
|
||||
+ * 11 - round to extended precision
|
||||
+ * 10 - round to double precision
|
||||
+ * 00 - round to single precision
|
||||
+ *
|
||||
+ * RC: Rounding control
|
||||
+ * 00 - rounding to nearest
|
||||
+ * 01 - rounding down (toward - infinity)
|
||||
+ * 10 - rounding up (toward + infinity)
|
||||
+ * 11 - rounding toward zero
|
||||
+ *
|
||||
+ * IC: Infinity control
|
||||
+ * That is for 8087 and 80287 only.
|
||||
+ *
|
||||
+ * The hardware default is 0x037f which we use.
|
||||
+ */
|
||||
+
|
||||
+#include <features.h>
|
||||
+
|
||||
+/* masking of interrupts */
|
||||
+#define _FPU_MASK_IM 0x01
|
||||
+#define _FPU_MASK_DM 0x02
|
||||
+#define _FPU_MASK_ZM 0x04
|
||||
+#define _FPU_MASK_OM 0x08
|
||||
+#define _FPU_MASK_UM 0x10
|
||||
+#define _FPU_MASK_PM 0x20
|
||||
+
|
||||
+/* precision control */
|
||||
+#define _FPU_EXTENDED 0x300 /* libm requires double extended precision. */
|
||||
+#define _FPU_DOUBLE 0x200
|
||||
+#define _FPU_SINGLE 0x0
|
||||
+
|
||||
+/* rounding control */
|
||||
+#define _FPU_RC_NEAREST 0x0 /* RECOMMENDED */
|
||||
+#define _FPU_RC_DOWN 0x400
|
||||
+#define _FPU_RC_UP 0x800
|
||||
+#define _FPU_RC_ZERO 0xC00
|
||||
+
|
||||
+#define _FPU_RESERVED 0xF0C0 /* Reserved bits in cw */
|
||||
+
|
||||
+
|
||||
+/* The fdlibm code requires strict IEEE double precision arithmetic,
|
||||
+ and no interrupts for exceptions, rounding to nearest. */
|
||||
+
|
||||
+#define _FPU_DEFAULT 0x037f
|
||||
+
|
||||
+/* IEEE: same as above. */
|
||||
+#define _FPU_IEEE 0x037f
|
||||
+
|
||||
+/* Type of the control word. */
|
||||
+typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__)));
|
||||
+
|
||||
+/* Macros for accessing the hardware control word. "*&" is used to
|
||||
+ work around a bug in older versions of GCC. __volatile__ is used
|
||||
+ to support combination of writing the control register and reading
|
||||
+ it back. Without __volatile__, the old value may be used for reading
|
||||
+ back under compiler optimization.
|
||||
+
|
||||
+ Note that the use of these macros is not sufficient anymore with
|
||||
+ recent hardware nor on x86-64. Some floating point operations are
|
||||
+ executed in the SSE/SSE2 engines which have their own control and
|
||||
+ status register. */
|
||||
+#define _FPU_GETCW(cw) __asm__ __volatile__ ("fnstcw %0" : "=m" (*&cw))
|
||||
+#define _FPU_SETCW(cw) __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw))
|
||||
+
|
||||
+/* Default control word set at startup. */
|
||||
+extern fpu_control_t __fpu_control;
|
||||
+
|
||||
+#endif /* fpu_control.h */
|
||||
+
|
||||
+#endif // AMD64
|
||||
+// ==============================================================================
|
||||
+// ==============================================================================
|
||||
+// ==============================================================================
|
||||
+
|
||||
address os::current_stack_pointer() {
|
||||
#ifdef SPARC_WORKS
|
||||
register void *esp;
|
183
srcpkgs/openjdk11/template
Normal file
183
srcpkgs/openjdk11/template
Normal file
|
@ -0,0 +1,183 @@
|
|||
# Template file for 'openjdk11'
|
||||
_java_ver=11
|
||||
_java_min_ver=0
|
||||
_java_sec_ver=5
|
||||
_jdk_update=10
|
||||
_openjdk_version="openjdk-${_java_ver}"
|
||||
|
||||
|
||||
pkgname=openjdk11
|
||||
version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}+${_jdk_update}"
|
||||
revision=1
|
||||
wrksrc="jdk${_java_ver}u-jdk-${version}"
|
||||
build_style=gnu-configure
|
||||
configure_args="
|
||||
--disable-warnings-as-errors
|
||||
--prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
|
||||
--enable-unlimited-crypto
|
||||
--with-zlib=system
|
||||
--with-libjpeg=system
|
||||
--with-giflib=system
|
||||
--with-libpng=system
|
||||
--with-lcms=system
|
||||
--with-jtreg=no
|
||||
--with-version-build=${version}
|
||||
--with-vendor-name="Void"
|
||||
--with-vendor-url="https://voidlinux.org/"
|
||||
--with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
|
||||
--with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues"
|
||||
--with-boot-jdk=/usr/lib/jvm/openjdk11-bin"
|
||||
|
||||
make_build_args="images $(vopt_if docs docs)"
|
||||
make_check_target="test-hotspot-gtest"
|
||||
hostmakedepends="pkg-config automake autoconf cpio unzip zip ca-certificates
|
||||
libressl zlib-devel make-ca"
|
||||
makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
|
||||
giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
|
||||
fontconfig-devel zlib-devel lcms2-devel"
|
||||
provides="java-environment-${version}_1 java-runtime-${version}_1"
|
||||
short_desc="OpenJDK Java Development Kit"
|
||||
maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
|
||||
license="GPL-2.0-or-later"
|
||||
homepage="http://openjdk.java.net/"
|
||||
distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
|
||||
checksum=a3bc19d278f68660f02610cbe1ce6c110a39a1aa53aeb90c6133a1cebf948462
|
||||
shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
|
||||
|
||||
# Build is still parallel, but don't use -jN.
|
||||
disable_parallel_build=yes
|
||||
build_options="docs"
|
||||
|
||||
case "$XBPS_TARGET_LIBC" in
|
||||
glibc) build_options_default+=" docs";;
|
||||
esac
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
hostmakedepends+=" openjdk11"
|
||||
configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
|
||||
else
|
||||
hostmakedepends+=" openjdk11-bin"
|
||||
configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11-bin"
|
||||
fi
|
||||
|
||||
alternatives="
|
||||
java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
|
||||
java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
|
||||
java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
|
||||
java:/usr/bin/orbd:/usr/lib/jvm/openjdk11/bin/orbd
|
||||
java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
|
||||
java:/usr/bin/policytool:/usr/lib/jvm/openjdk11/bin/policytool
|
||||
java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
|
||||
java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
|
||||
java:/usr/bin/servertool:/usr/lib/jvm/openjdk11/bin/servertool
|
||||
java:/usr/bin/tnameserv:/usr/lib/jvm/openjdk11/bin/tnameserv
|
||||
java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
|
||||
|
||||
jdk:/usr/bin/appletviewer:/usr/lib/jvm/openjdk11/bin/appletviewer
|
||||
jdk:/usr/bin/extcheck:/usr/lib/jvm/openjdk11/bin/extcheck
|
||||
jdk:/usr/bin/idlj:/usr/lib/jvm/openjdk11/bin/idlj
|
||||
jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
|
||||
jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
|
||||
jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
|
||||
jdk:/usr/bin/java-rmi.cgi:/usr/lib/jvm/openjdk11/bin/java-rmi.cgi
|
||||
jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
|
||||
jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
|
||||
jdk:/usr/bin/javah:/usr/lib/jvm/openjdk11/bin/javah
|
||||
jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
|
||||
jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
|
||||
jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
|
||||
jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
|
||||
jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
|
||||
jdk:/usr/bin/jhat:/usr/lib/jvm/openjdk11/bin/jhat
|
||||
jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
|
||||
jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
|
||||
jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
|
||||
jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
|
||||
jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
|
||||
jdk:/usr/bin/jsadebugd:/usr/lib/jvm/openjdk11/bin/jsadebugd
|
||||
jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
|
||||
jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
|
||||
jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
|
||||
jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
|
||||
jdk:/usr/bin/native2ascii:/usr/lib/jvm/openjdk11/bin/native2ascii
|
||||
jdk:/usr/bin/orbd:/usr/lib/jvm/openjdk11/bin/orbd
|
||||
jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
|
||||
jdk:/usr/bin/policytool:/usr/lib/jvm/openjdk11/bin/policytool
|
||||
jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
|
||||
jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
|
||||
jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
|
||||
jdk:/usr/bin/schemagen:/usr/lib/jvm/openjdk11/bin/schemagen
|
||||
jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
|
||||
jdk:/usr/bin/servertool:/usr/lib/jvm/openjdk11/bin/servertool
|
||||
jdk:/usr/bin/tnameserv:/usr/lib/jvm/openjdk11/bin/tnameserv
|
||||
jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
|
||||
jdk:/usr/bin/wsgen:/usr/lib/jvm/openjdk11/bin/wsgen
|
||||
jdk:/usr/bin/wsimport:/usr/lib/jvm/openjdk11/bin/wsimport
|
||||
jdk:/usr/bin/xjc:/usr/lib/jvm/openjdk11/bin/xjc
|
||||
"
|
||||
|
||||
post_extract() {
|
||||
chmod +x configure
|
||||
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
|
||||
rm -r src/jdk.hotspot.agent
|
||||
fi
|
||||
}
|
||||
|
||||
post_patch() {
|
||||
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
|
||||
for f in "${FILESDIR}"/musl_patches/*.patch; do
|
||||
echo "Applying $f"
|
||||
patch -Np1 -i "$f"
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
|
||||
CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}
|
||||
configure_args=${configure_args/--with-libtool-sysroot=\/usr\/[a-z0-9]*-linux-[a-z]*/}
|
||||
if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
|
||||
configure_args+=" --enable-ccache"
|
||||
CC="/usr/bin/cc"
|
||||
CXX="/usr/bin/c++"
|
||||
fi
|
||||
./configure ${configure_args} --with-extra-cflags="$CFLAGS" --with-extra-cxxflags="$CXXFLAGS" --with-extra-ldflags="$LDFLAGS"
|
||||
}
|
||||
|
||||
post_install() {
|
||||
vmkdir /usr/lib/jvm
|
||||
mv ${DESTDIR}/usr/lib/jvm/openjdk-${_java_ver}.${_java_min_ver}.${_java_sec_ver}-internal ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}
|
||||
rm -rf ${DESTDIR}/usr/lib/bin
|
||||
vmkdir usr/lib/jvm/$_openjdk_version/lib/security
|
||||
make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/$_openjdk_version/bin/keytool"
|
||||
mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/$_openjdk_version/lib/security/
|
||||
chmod -R ugo+rw ./ca
|
||||
rm -Rf ./ca
|
||||
vlicense ASSEMBLY_EXCEPTION
|
||||
vlicense LICENSE
|
||||
}
|
||||
|
||||
openjdk11-doc_package() {
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
noshlibprovides=yes
|
||||
short_desc+=" -- documentation"
|
||||
pkg_install() {
|
||||
cd ${wrksrc}
|
||||
if [ "$build_option_docs" ]; then
|
||||
vmkdir usr/share/doc/openjdk11
|
||||
cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
|
||||
fi
|
||||
vmove usr/lib/jvm/openjdk11/man/man1/
|
||||
}
|
||||
}
|
||||
|
||||
openjdk11-src_package() {
|
||||
nostrip=yes
|
||||
noverifyrdeps=yes
|
||||
noshlibprovides=yes
|
||||
short_desc+=" -- sources"
|
||||
pkg_install() {
|
||||
vmove "usr/lib/jvm/openjdk11/lib/src.zip"
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue