90a7924359
This is a new toolchain used to bootstrap OpenJDK 8. It is itself bootstrapped using gcj-6, which lets us compile the whole chain from source without fetching foreign binaries. [ci skip]
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
--- openjdk.orig/hotspot/make/linux/makefiles/defs.make
|
|
+++ openjdk/hotspot/make/linux/makefiles/defs.make
|
|
@@ -327,6 +327,9 @@
|
|
|
|
# Serviceability Binaries
|
|
# No SA Support for PPC, IA64, ARM or zero
|
|
+# or if thread_db.h missing (musl)
|
|
+
|
|
+ifneq ($(wildcard /usr/include/thread_db.h),)
|
|
ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
|
|
$(EXPORT_LIB_DIR)/sa-jdi.jar
|
|
ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
|
|
@@ -343,6 +346,10 @@
|
|
endif
|
|
endif
|
|
endif
|
|
+endif
|
|
+else
|
|
+ADD_SA_BINARIES/x86 =
|
|
+ADD_SA_BINARIES/sparc =
|
|
endif
|
|
ADD_SA_BINARIES/ppc =
|
|
ADD_SA_BINARIES/ppc64 =
|
|
--- openjdk.orig/hotspot/make/linux/makefiles/sa.make
|
|
+++ openjdk/hotspot/make/linux/makefiles/sa.make
|
|
@@ -59,9 +59,11 @@
|
|
|
|
# if $(AGENT_DIR) does not exist, we don't build SA
|
|
# also, we don't build SA on Itanium or zero.
|
|
+# check for thread_db.h too (musl does not have it).
|
|
|
|
all:
|
|
- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
|
|
+ if [ -d $(AGENT_DIR) -a -f /usr/include/thread_db.h \
|
|
+ -a "$(SRCARCH)" != "ia64" \
|
|
-a "$(SRCARCH)" != "zero" \
|
|
-a "$(SRCARCH)" != "aarch64" ] ; then \
|
|
$(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
|
|
--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
|
|
+++ openjdk/hotspot/make/linux/makefiles/saproc.make
|
|
@@ -65,10 +65,13 @@
|
|
|
|
# if $(AGENT_DIR) does not exist, we don't build SA
|
|
# also, we don't build SA on Itanium or zero.
|
|
+# check for thread_db.h too (musl does not have it).
|
|
|
|
+ifneq ($(wildcard /usr/include/thread_db.h),)
|
|
ifneq ($(wildcard $(AGENT_DIR)),)
|
|
ifneq ($(filter-out ia64 zero aarch64,$(SRCARCH)),)
|
|
BUILDLIBSAPROC = $(LIBSAPROC)
|
|
+endif
|
|
endif
|
|
endif
|
|
|