diff -ru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make --- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2014-06-05 21:19:11.000000000 +0000 +++ openjdk/hotspot/make/linux/makefiles/defs.make 2014-07-15 07:16:37.789777380 +0000 @@ -306,6 +306,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) \ @@ -323,6 +326,10 @@ endif endif endif +else +ADD_SA_BINARIES/x86 = +ADD_SA_BINARIES/sparc = +endif ADD_SA_BINARIES/ppc = ADD_SA_BINARIES/ppc64 = ADD_SA_BINARIES/ia64 = diff -ru openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make --- openjdk.orig/hotspot/make/linux/makefiles/sa.make 2014-06-05 21:19:11.000000000 +0000 +++ openjdk/hotspot/make/linux/makefiles/sa.make 2014-07-15 07:16:37.789777380 +0000 @@ -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" ] ; then \ $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ fi diff -ru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make --- openjdk.orig/hotspot/make/linux/makefiles/saproc.make 2014-06-05 21:19:11.000000000 +0000 +++ openjdk/hotspot/make/linux/makefiles/saproc.make 2014-07-15 07:16:37.789777380 +0000 @@ -65,12 +65,15 @@ # 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,$(SRCARCH)),) BUILDLIBSAPROC = $(LIBSAPROC) endif endif +endif ifneq ($(ALT_SASRCDIR),) ALT_SAINCDIR=-I$(ALT_SASRCDIR)