diff options
Diffstat (limited to 'main/openjdk7/icedtea-hotspot-noagent-musl.patch')
| -rw-r--r-- | main/openjdk7/icedtea-hotspot-noagent-musl.patch | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/main/openjdk7/icedtea-hotspot-noagent-musl.patch b/main/openjdk7/icedtea-hotspot-noagent-musl.patch index 176b99311..627149fd4 100644 --- a/main/openjdk7/icedtea-hotspot-noagent-musl.patch +++ b/main/openjdk7/icedtea-hotspot-noagent-musl.patch @@ -1,6 +1,7 @@ ---- openjdk.orig/hotspot/make/linux/makefiles/defs.make -+++ openjdk/hotspot/make/linux/makefiles/defs.make -@@ -285,6 +285,9 @@ +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 @@ -10,19 +11,20 @@ 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) \ -@@ -301,6 +304,10 @@ - endif +@@ -323,6 +326,10 @@ 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 = ---- openjdk.orig/hotspot/make/linux/makefiles/sa.make -+++ openjdk/hotspot/make/linux/makefiles/sa.make +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 @@ -36,9 +38,10 @@ -a "$(SRCARCH)" != "zero" ] ; then \ $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ fi ---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make -+++ openjdk/hotspot/make/linux/makefiles/saproc.make -@@ -65,10 +65,13 @@ +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. @@ -48,7 +51,9 @@ ifneq ($(wildcard $(AGENT_DIR)),) ifneq ($(filter-out ia64 zero,$(SRCARCH)),) BUILDLIBSAPROC = $(LIBSAPROC) -+endif endif endif ++endif + ifneq ($(ALT_SASRCDIR),) + ALT_SAINCDIR=-I$(ALT_SASRCDIR) |