diff options
Diffstat (limited to 'main/openjdk7/icedtea-hotspot-noagent-musl.patch')
| -rw-r--r-- | main/openjdk7/icedtea-hotspot-noagent-musl.patch | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/main/openjdk7/icedtea-hotspot-noagent-musl.patch b/main/openjdk7/icedtea-hotspot-noagent-musl.patch index 627149fd46..37604acca0 100644 --- a/main/openjdk7/icedtea-hotspot-noagent-musl.patch +++ b/main/openjdk7/icedtea-hotspot-noagent-musl.patch @@ -1,7 +1,6 @@ -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 @@ +--- 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 @@ -11,20 +10,19 @@ diff -ru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/mak 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 @@ +@@ -343,6 +346,10 @@ + endif endif endif - endif ++endif +else +ADD_SA_BINARIES/x86 = +ADD_SA_BINARIES/sparc = -+endif + 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 +--- 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 @@ -35,13 +33,12 @@ diff -ru openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/ - 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 \ + -a "$(SRCARCH)" != "zero" \ + -a "$(SRCARCH)" != "aarch64" ] ; 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 @@ +--- 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. @@ -49,11 +46,9 @@ diff -ru openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/m +ifneq ($(wildcard /usr/include/thread_db.h),) ifneq ($(wildcard $(AGENT_DIR)),) - ifneq ($(filter-out ia64 zero,$(SRCARCH)),) + ifneq ($(filter-out ia64 zero aarch64,$(SRCARCH)),) BUILDLIBSAPROC = $(LIBSAPROC) ++endif endif endif -+endif - ifneq ($(ALT_SASRCDIR),) - ALT_SAINCDIR=-I$(ALT_SASRCDIR) |