mirror of
https://github.com/netbirdio/FreeBSD-ports.git
synced 2026-05-22 18:42:42 -07:00
. Update to 8u51.
This commit is contained in:
glewis
@@ -2,7 +2,6 @@
|
||||
|
||||
PORTNAME= openjdk
|
||||
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
|
||||
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
|
||||
@@ -94,8 +93,8 @@ NO_CCACHE= yes
|
||||
NOPRECIOUSMAKEVARS= yes
|
||||
|
||||
JDK_MAJOR_VERSION= 8
|
||||
JDK_UPDATE_VERSION= 45
|
||||
JDK_BUILD_NUMBER= 14
|
||||
JDK_UPDATE_VERSION= 51
|
||||
JDK_BUILD_NUMBER= 16
|
||||
DIST_BUILD_NUMBER= 132
|
||||
JTREG_VERSION= 4.1
|
||||
JTREG_BUILD_NUMBER= b08
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+1396
-438
File diff suppressed because it is too large
Load Diff
+249
-235
File diff suppressed because it is too large
Load Diff
@@ -1,31 +0,0 @@
|
||||
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig
|
||||
+++ hotspot/src/os/bsd/vm/os_bsd.cpp
|
||||
@@ -1234,14 +1234,14 @@
|
||||
pid_t os::Bsd::gettid() {
|
||||
int retval = -1;
|
||||
|
||||
-#ifdef __APPLE__ //XNU kernel
|
||||
+#if defined(__APPLE__) //XNU kernel
|
||||
// despite the fact mach port is actually not a thread id use it
|
||||
// instead of syscall(SYS_thread_selfid) as it certainly fits to u4
|
||||
retval = ::pthread_mach_thread_np(::pthread_self());
|
||||
guarantee(retval != 0, "just checking");
|
||||
return retval;
|
||||
|
||||
-#elifdef __FreeBSD__
|
||||
+#elif defined(__FreeBSD__)
|
||||
#if __FreeBSD_version > 900030
|
||||
return ::pthread_getthreadid_np();
|
||||
#else
|
||||
@@ -1249,9 +1249,9 @@
|
||||
thr_self(&tid);
|
||||
return (pid_t)tid;
|
||||
#endif
|
||||
-#elifdef __OpenBSD__
|
||||
+#elif defined(__OpenBSD__)
|
||||
retval = syscall(SYS_getthrid);
|
||||
-#elifdef __NetBSD__
|
||||
+#elif defined(__NetBSD__)
|
||||
retval = (pid_t) _lwp_self();
|
||||
#endif
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
--- hotspot/src/os/bsd/vm/vmError_bsd.cpp.orig
|
||||
+++ hotspot/src/os/bsd/vm/vmError_bsd.cpp
|
||||
@@ -33,30 +33,50 @@
|
||||
#include <sys/syscall.h>
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
+#ifdef __FreeBSD__
|
||||
+#include <limits.h>
|
||||
+#include <sys/sysctl.h>
|
||||
+#endif
|
||||
+
|
||||
+#define GDB_CMD "gdb"
|
||||
+
|
||||
+static void set_debugger(char *buf, int buflen) {
|
||||
+ int pid = os::current_process_id();
|
||||
+#ifdef __FreeBSD__
|
||||
+ char cmd[PATH_MAX+1];
|
||||
+ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid };
|
||||
+ size_t len = sizeof(cmd);
|
||||
+ if (sysctl(name, 4, cmd, &len, NULL, 0) == 0 && len > 0) {
|
||||
+ cmd[len] = '\0';
|
||||
+ jio_snprintf(buf, buflen, "%s %s %d", GDB_CMD, cmd, pid);
|
||||
+ } else
|
||||
+#endif
|
||||
+ jio_snprintf(buf, buflen, "%s /proc/%d/file %d", GDB_CMD, pid, pid);
|
||||
+}
|
||||
|
||||
void VMError::show_message_box(char *buf, int buflen) {
|
||||
bool yes;
|
||||
do {
|
||||
- error_string(buf, buflen);
|
||||
- int len = (int)strlen(buf);
|
||||
+ intx tid = os::current_thread_id();
|
||||
+ set_debugger(buf, buflen);
|
||||
+ int len = (int)strlen(buf) + 1;
|
||||
+ char *msg = &buf[len];
|
||||
+ error_string(msg, buflen - len);
|
||||
+ len += (int)strlen(msg);
|
||||
char *p = &buf[len];
|
||||
|
||||
jio_snprintf(p, buflen - len,
|
||||
"\n\n"
|
||||
"Do you want to debug the problem?\n\n"
|
||||
- "To debug, run 'gdb /proc/%d/file %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n"
|
||||
- "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n"
|
||||
+ "To debug, run '%s'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n"
|
||||
+ "Enter 'yes' to launch " GDB_CMD " automatically (PATH must include " GDB_CMD ")\n"
|
||||
"Otherwise, press RETURN to abort...",
|
||||
- os::current_process_id(), os::current_process_id(),
|
||||
- os::current_thread_id(), os::current_thread_id());
|
||||
+ buf, tid, tid);
|
||||
|
||||
- yes = os::message_box("Unexpected Error", buf);
|
||||
+ yes = os::message_box("Unexpected Error", msg);
|
||||
|
||||
if (yes) {
|
||||
// yes, user asked VM to launch debugger
|
||||
- jio_snprintf(buf, buflen, "gdb /proc/%d/file %d",
|
||||
- os::current_process_id(), os::current_process_id());
|
||||
-
|
||||
os::fork_and_exec(buf);
|
||||
yes = false;
|
||||
}
|
||||
@@ -1,28 +1,20 @@
|
||||
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-03-25 15:50:52.527704000 -0400
|
||||
+++ jdk/make/lib/Awt2dLibraries.gmk 2015-03-25 17:59:54.197133000 -0400
|
||||
@@ -664,6 +664,7 @@
|
||||
-R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN,/..), \
|
||||
+ LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
|
||||
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
|
||||
RC_FLAGS := $(RC_FLAGS) \
|
||||
@@ -1257,7 +1258,7 @@
|
||||
else ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
|
||||
else ifeq ($(OPENJDK_TARGET_OS), bsd)
|
||||
- LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -DLIBICONV_PLUG
|
||||
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) %%ICONV_CPPFLAGS%%
|
||||
--- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-07-18 14:30:01.000000000 -0700
|
||||
+++ jdk/make/lib/Awt2dLibraries.gmk 2015-07-18 14:30:08.000000000 -0700
|
||||
@@ -1260,6 +1260,8 @@
|
||||
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include
|
||||
ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
|
||||
LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG
|
||||
+ else
|
||||
+ LIBSPLASHSCREEN_CFLAGS += %%ICONV_CPPFLAGS%%
|
||||
endif
|
||||
else
|
||||
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
|
||||
endif
|
||||
@@ -1282,7 +1283,7 @@
|
||||
@@ -1285,7 +1287,7 @@
|
||||
# Solaris still uses OPENWIN_LIB ..
|
||||
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
|
||||
else ifeq ($(OPENJDK_TARGET_OS), bsd)
|
||||
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -liconv -pthread
|
||||
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread
|
||||
- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread
|
||||
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib %%ICONV_LDFLAGS%% -pthread
|
||||
else # .. all other Unixes can use X_LIBS
|
||||
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
|
||||
endif
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
--- jdk/make/lib/CoreLibraries.gmk.orig 2014-11-08 19:58:00.000000000 -0800
|
||||
+++ jdk/make/lib/CoreLibraries.gmk 2014-11-08 19:58:38.000000000 -0800
|
||||
@@ -516,11 +516,11 @@
|
||||
--- jdk/make/lib/CoreLibraries.gmk.orig 2015-07-18 14:40:01.000000000 -0700
|
||||
+++ jdk/make/lib/CoreLibraries.gmk 2015-07-18 14:40:47.000000000 -0700
|
||||
@@ -523,11 +523,11 @@
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
-I$(JDK_TOPDIR)/src/share/npt \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
|
||||
- CFLAGS_bsd := -DLIBICONV_PLUG, \
|
||||
- CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \
|
||||
+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
- LDFLAGS_bsd := -liconv, \
|
||||
- LDFLAGS_bsd := -L$(PACKAGE_PATH)/lib -liconv, \
|
||||
+ LDFLAGS_bsd := %%ICONV_LDFLAGS%%, \
|
||||
LDFLAGS_macosx := -liconv, \
|
||||
LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
--- jdk/make/lib/ServiceabilityLibraries.gmk 2014-11-25 21:11:53 UTC
|
||||
+++ jdk/make/lib/ServiceabilityLibraries.gmk
|
||||
@@ -252,7 +252,7 @@
|
||||
--- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2015-07-18 14:43:00.000000000 -0700
|
||||
+++ jdk/make/lib/ServiceabilityLibraries.gmk 2015-07-18 14:44:25.000000000 -0700
|
||||
@@ -269,7 +269,7 @@
|
||||
CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
|
||||
CFLAGS_debug := -DJPLIS_LOGGING, \
|
||||
CFLAGS_release := -DNO_JPLIS_LOGGING, \
|
||||
- CFLAGS_bsd := -DLIBICONV_PLUG, \
|
||||
- CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \
|
||||
+ CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN) \
|
||||
@@ -268,7 +268,7 @@
|
||||
@@ -283,7 +283,7 @@
|
||||
LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
|
||||
LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
|
||||
LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\
|
||||
- LDFLAGS_SUFFIX_bsd := -liconv $(LIBZ), \
|
||||
- LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \
|
||||
+ LDFLAGS_SUFFIX_bsd := %%ICONV_LDFLAGS%% $(LIBZ), \
|
||||
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
|
||||
RC_FLAGS := $(RC_FLAGS) \
|
||||
|
||||
@@ -1,34 +1,11 @@
|
||||
--- jdk/src/share/classes/sun/print/PSPrinterJob.java
|
||||
+++ jdk/src/share/classes/sun/print/PSPrinterJob.java
|
||||
@@ -1588,8 +1588,30 @@
|
||||
|
||||
String osname = System.getProperty("os.name");
|
||||
if (osname.equals("Linux") || osname.endsWith("BSD") || osname.contains("OS X")) {
|
||||
+ String lprPath = "/usr/bin/lpr";
|
||||
+ if (osname.endsWith("BSD")) {
|
||||
+ final PrintService pservice = getPrintService();
|
||||
+ Boolean isIPPPrinter =
|
||||
+ (Boolean)java.security.AccessController.doPrivileged(
|
||||
+ new java.security.PrivilegedAction() {
|
||||
+ public Object run() {
|
||||
+ try {
|
||||
+ Class psClass =
|
||||
+ Class.forName("sun.print.IPPPrintService");
|
||||
+ if (psClass.isInstance(pservice)) {
|
||||
+ return Boolean.TRUE;
|
||||
+ }
|
||||
+ } catch (Throwable t) {
|
||||
+ }
|
||||
+ return Boolean.FALSE;
|
||||
+ }
|
||||
+ });
|
||||
+ if (isIPPPrinter) {
|
||||
--- .jdk/src/share/classes/sun/print/PSPrinterJob.java.orig 2015-07-18 14:45:27.000000000 -0700
|
||||
+++ jdk/src/share/classes/sun/print/PSPrinterJob.java 2015-07-18 14:50:32.000000000 -0700
|
||||
@@ -1607,7 +1607,7 @@
|
||||
}
|
||||
});
|
||||
if (isIPPPrinter) {
|
||||
- lprPath = "/usr/local/bin/lpr";
|
||||
+ lprPath = "%%LOCALBASE%%/bin/lpr";
|
||||
+ }
|
||||
+ }
|
||||
execCmd = new String[ncomps];
|
||||
- execCmd[n++] = "/usr/bin/lpr";
|
||||
+ execCmd[n++] = lprPath;
|
||||
if ((pFlags & PRINTER) != 0) {
|
||||
execCmd[n++] = "-P" + printer;
|
||||
}
|
||||
}
|
||||
execCmd = new String[ncomps];
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
--- jdk/src/solaris/bin/java_md_solinux.c.orig
|
||||
+++ jdk/src/solaris/bin/java_md_solinux.c
|
||||
@@ -35,6 +35,9 @@
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
+#ifdef __FreeBSD__
|
||||
+#include <sys/sysctl.h>
|
||||
+#endif
|
||||
#include "manifest_info.h"
|
||||
#include "version_comp.h"
|
||||
|
||||
@@ -925,7 +928,7 @@
|
||||
* onwards the filename returned in DL_info structure from dladdr is
|
||||
* an absolute pathname so technically realpath isn't required.
|
||||
* On Linux we read the executable name from /proc/self/exe.
|
||||
- * On FreeBSD we read the executable name from /proc/curproc/file.
|
||||
+ * On FreeBSD, we get the executable name via sysctl(3).
|
||||
* As a fallback, and for platforms other than Solaris, Linux, and
|
||||
* FreeBSD, we use FindExecName to compute the executable name.
|
||||
*/
|
||||
@@ -954,13 +957,9 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
-#elif defined(__linux__) || defined(__FreeBSD__)
|
||||
+#elif defined(__linux__)
|
||||
{
|
||||
-#if defined(__FreeBSD__)
|
||||
- const char* self = "/proc/curproc/file";
|
||||
-#else
|
||||
const char* self = "/proc/self/exe";
|
||||
-#endif
|
||||
char buf[PATH_MAX+1];
|
||||
int len = readlink(self, buf, PATH_MAX);
|
||||
if (len >= 0) {
|
||||
@@ -968,6 +967,16 @@
|
||||
exec_path = JLI_StringDup(buf);
|
||||
}
|
||||
}
|
||||
+#elif defined(__FreeBSD__)
|
||||
+ {
|
||||
+ char buf[PATH_MAX+1];
|
||||
+ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
|
||||
+ size_t len = sizeof(buf);
|
||||
+ if (sysctl(name, 4, buf, &len, NULL, 0) == 0 && len > 0) {
|
||||
+ buf[len] = '\0';
|
||||
+ exec_path = JLI_StringDup(buf);
|
||||
+ }
|
||||
+ }
|
||||
#else /* !__solaris__ && !__linux__ && !__FreeBSD__ */
|
||||
{
|
||||
/* Not implemented */
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
--- jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.orig 2014-03-04 02:59:38 UTC
|
||||
+++ jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
|
||||
@@ -318,7 +318,11 @@ SplashDecodeGif(Splash * splash, GifFile
|
||||
int
|
||||
SplashDecodeGifStream(Splash * splash, SplashStream * stream)
|
||||
{
|
||||
+#if GIFLIB_MAJOR >= 5
|
||||
+ GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc, NULL);
|
||||
+#else
|
||||
GifFileType *gif = DGifOpen((void *) stream, SplashStreamGifInputFunc);
|
||||
+#endif
|
||||
|
||||
if (!gif)
|
||||
return 0;
|
||||
@@ -1,11 +0,0 @@
|
||||
--- langtools/test/Makefile Tue May 05 18:06:51 2015 -0700
|
||||
+++ langtools/test/Makefile Sat Jul 04 15:31:54 2015 -0700
|
||||
@@ -36,7 +36,7 @@
|
||||
ARCH=i586
|
||||
endif
|
||||
endif
|
||||
-ifneq ($(findstring $(OSNAME), BSD), )
|
||||
+ifneq ($(findstring BSD, $(OSNAME)), )
|
||||
PLATFORM = bsd
|
||||
JT_PLATFORM = linux
|
||||
ARCH = $(shell uname -p)
|
||||
@@ -1,121 +0,0 @@
|
||||
--- common/autoconf/jdk-options.m4
|
||||
+++ common/autoconf/jdk-options.m4
|
||||
@@ -407,6 +407,20 @@
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
+ # Enable or disable static linking of libjli on bsd only
|
||||
+ #
|
||||
+ AC_ARG_ENABLE(static-libjli, [AS_HELP_STRING([--enable-static-libjli],
|
||||
+ [Enable staticly linking libjli on bsd @<:@disabled@:>@])],,
|
||||
+ [enable_static_libjli=no])
|
||||
+ if test "x$OPENJDK_TARGET_OS" = "xbsd" && test "x$enable_static_libjli" = "xyes"; then
|
||||
+ BSD_STATIC_LIBJLI=bsd
|
||||
+ else
|
||||
+ BSD_STATIC_LIBJLI=
|
||||
+ fi
|
||||
+ AC_SUBST(BSD_STATIC_LIBJLI)
|
||||
+
|
||||
+ ###############################################################################
|
||||
+ #
|
||||
# Enable or disable the elliptic curve crypto implementation
|
||||
#
|
||||
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
|
||||
--- common/autoconf/spec.gmk.in
|
||||
+++ common/autoconf/spec.gmk.in
|
||||
@@ -283,6 +283,9 @@
|
||||
# Enable unlimited crypto policy
|
||||
UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
|
||||
|
||||
+# Build static libjli on bsd
|
||||
+BSD_STATIC_LIBJLI=@BSD_STATIC_LIBJLI@
|
||||
+
|
||||
# Necessary additional compiler flags to compile X11
|
||||
X_CFLAGS:=@X_CFLAGS@
|
||||
X_LIBS:=@X_LIBS@
|
||||
--- jdk/make/CompileLaunchers.gmk
|
||||
+++ jdk/make/CompileLaunchers.gmk
|
||||
@@ -49,7 +49,7 @@
|
||||
ORIGIN_ROOT := /..
|
||||
endif
|
||||
|
||||
-ifneq ($(findstring $(OPENJDK_TARGET_OS), bsd macosx), )
|
||||
+ifneq ($(findstring $(OPENJDK_TARGET_OS), $(BSD_STATIC_LIBJLI) macosx), )
|
||||
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
|
||||
else
|
||||
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
|
||||
@@ -90,9 +90,15 @@
|
||||
$1_LDFLAGS := $3
|
||||
$1_LDFLAGS_SUFFIX :=
|
||||
ifeq ($(OPENJDK_TARGET_OS), bsd)
|
||||
- $1_LDFLAGS += -Wl,--whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
|
||||
- -Wl,--no-whole-archive
|
||||
- $1_LDFLAGS_SUFFIX += -pthread
|
||||
+ ifeq ($(BSD_STATIC_LIBJLI), bsd)
|
||||
+ $1_LDFLAGS += -Wl,--whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
|
||||
+ -Wl,--no-whole-archive
|
||||
+ $1_LDFLAGS_SUFFIX += -pthread
|
||||
+ else
|
||||
+ $1_LDFLAGS += \
|
||||
+ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX))
|
||||
+ $1_LDFLAGS_SUFFIX += -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -pthread
|
||||
+ endif
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
@@ -203,7 +209,7 @@
|
||||
|
||||
BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
|
||||
|
||||
- ifneq (,$(filter $(OPENJDK_TARGET_OS), bsd macosx aix))
|
||||
+ ifneq (,$(filter $(OPENJDK_TARGET_OS), $(BSD_STATIC_LIBJLI) macosx aix))
|
||||
$$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a
|
||||
endif
|
||||
|
||||
--- jdk/make/lib/CoreLibraries.gmk
|
||||
+++ jdk/make/lib/CoreLibraries.gmk
|
||||
@@ -466,7 +466,7 @@
|
||||
|
||||
BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
|
||||
|
||||
-else ifneq ($(findstring $(OPENJDK_TARGET_OS), bsd macosx), )
|
||||
+else ifneq ($(findstring $(OPENJDK_TARGET_OS), $(BSD_STATIC_LIBJLI) macosx), )
|
||||
#
|
||||
# On BSD they do partial (incremental) linking of libjli_static.a
|
||||
# code it here...rather than add support to NativeCompilation
|
||||
--- jdk/make/lib/ServiceabilityLibraries.gmk
|
||||
+++ jdk/make/lib/ServiceabilityLibraries.gmk
|
||||
@@ -246,6 +246,15 @@
|
||||
LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
|
||||
endif
|
||||
|
||||
+ifeq ($(OPENJDK_TARGET_OS), bsd)
|
||||
+ ifeq ($(BSD_STATIC_LIBJLI), bsd)
|
||||
+ LIBINSTRUMENT_LDFLAGS += -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
|
||||
+ -Xlinker --no-whole-archive
|
||||
+ else
|
||||
+ LIBINSTRUMENT_LDFLAGS += $(call SET_SHARED_LIBRARY_ORIGIN,/jli)
|
||||
+ endif
|
||||
+endif
|
||||
+
|
||||
$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \
|
||||
LIBRARY := instrument, \
|
||||
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
|
||||
@@ -263,8 +272,6 @@
|
||||
$(LIBINSTRUMENT_LDFLAGS), \
|
||||
LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
|
||||
LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
|
||||
- LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
|
||||
- -Xlinker --no-whole-archive, \
|
||||
LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
|
||||
-framework Cocoa -framework Security -framework ApplicationServices, \
|
||||
LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \
|
||||
@@ -281,7 +288,7 @@
|
||||
OBJECT_DIR := $(LIBINSTRUMENT_DIR), \
|
||||
DEBUG_SYMBOLS := true))
|
||||
|
||||
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), bsd macosx windows aix))
|
||||
+ifneq (, $(findstring $(OPENJDK_TARGET_OS), $(BSD_STATIC_LIBJLI) macosx windows aix))
|
||||
$(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
|
||||
else
|
||||
$(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX)
|
||||
Reference in New Issue
Block a user