Remove patches. Not required.HEADmaster

We don't need these patches. We don't build the client build.

3 files changed, 0 insertions, 126 deletions

diff --git a/build_client.patch b/build_client.patch
deleted file mode 100644
index db7c7d7..0000000
--- a/build_client.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -r ed73b014b78b common/autoconf/generated-configure.sh
---- a/common/autoconf/generated-configure.sh	Wed Mar 23 17:20:03 2016 +0000
-+++ b/common/autoconf/generated-configure.sh	Wed May 11 09:36:27 2016 +0000
-@@ -7943,11 +7943,11 @@
-   JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
-   JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
- 
--  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
--    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
--      as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5
--    fi
--  fi
-+#  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
-+#    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-+#      as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5
-+#    fi
-+#  fi
-   if test "x$JVM_VARIANT_KERNEL" = xtrue; then
-     if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-       as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5
-diff -r ed73b014b78b common/autoconf/jdk-options.m4
---- a/common/autoconf/jdk-options.m4	Wed Mar 23 17:20:03 2016 +0000
-+++ b/common/autoconf/jdk-options.m4	Wed May 11 09:36:27 2016 +0000
-@@ -117,11 +117,11 @@
-   JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
-   JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
- 
--  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
--    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
--      AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
--    fi
--  fi
-+#  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
-+#    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-+#      AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
-+#    fi
-+#  fi
-   if test "x$JVM_VARIANT_KERNEL" = xtrue; then
-     if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-       AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
diff --git a/hotspot/hotspot_client.patch b/hotspot/hotspot_client.patch
deleted file mode 100644
index 5073e7f..0000000
--- a/hotspot/hotspot_client.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -r 1610e00126d5 make/Makefile
---- a/make/Makefile	Wed Apr 06 19:33:23 2016 +0000
-+++ b/make/Makefile	Wed May 11 10:33:51 2016 +0000
-@@ -216,13 +216,13 @@
- 	@$(ECHO) "No compiler1 ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
-   endif
- else
--  ifeq ($(ARCH_DATA_MODEL), 32)
-+#  ifeq ($(ARCH_DATA_MODEL), 32)
- 	$(CD) $(OUTPUTDIR); \
- 	    $(MAKE) -f $(ABS_OS_MAKEFILE) \
- 		      $(MAKE_ARGS) $(VM_TARGET)
--  else
--	@$(ECHO) "No compiler1 ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
--  endif
-+#  else
-+#	@$(ECHO) "No compiler1 ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
-+#  endif
- endif
- 
- # Build compiler2 (server) rule, different for platforms
-diff -r 789ee8b7b92a src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
---- a/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	Tue Aug 02 16:52:03 2016 +0100
-+++ b/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp	Thu Sep 01 14:52:55 2016 +0000
-@@ -4248,6 +4248,7 @@
-     // arraycopy stubs used by compilers
-     generate_arraycopy_stubs();
- 
-+#ifdef COMPILER2
-     if (UseMultiplyToLenIntrinsic) {
-       StubRoutines::_multiplyToLen = generate_multiplyToLen();
-     }
-@@ -4265,6 +4266,7 @@
-       // because it's faster for the sizes of modulus we care about.
-       StubRoutines::_montgomerySquare = g.generate_multiply();
-     }
-+#endif
- 
- #ifndef BUILTIN_SIM
-     if (UseAESIntrinsics) {
-diff -r 789ee8b7b92a src/cpu/aarch64/vm/vm_version_aarch64.cpp
---- a/src/cpu/aarch64/vm/vm_version_aarch64.cpp	Tue Aug 02 16:52:03 2016 +0100
-+++ b/src/cpu/aarch64/vm/vm_version_aarch64.cpp	Thu Sep 01 14:52:55 2016 +0000
-@@ -284,9 +284,17 @@
-     FLAG_SET_DEFAULT(UseBlockZeroing, false);
-   }
- 
-+#ifdef COMPILER2
-   if (FLAG_IS_DEFAULT(UseMultiplyToLenIntrinsic)) {
-     UseMultiplyToLenIntrinsic = true;
-   }
-+  if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
-+    UseMontgomeryMultiplyIntrinsic = true;
-+  }
-+  if (FLAG_IS_DEFAULT(UseMontgomerySquareIntrinsic)) {
-+    UseMontgomerySquareIntrinsic = true;
-+  }
-+#endif
- 
-   if (FLAG_IS_DEFAULT(UseBarriersForVolatile)) {
-     UseBarriersForVolatile = (_cpuFeatures & CPU_DMB_ATOMICS) != 0;
-@@ -296,13 +304,6 @@
-     UsePopCountInstruction = true;
-   }
- 
--  if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
--    UseMontgomeryMultiplyIntrinsic = true;
--  }
--  if (FLAG_IS_DEFAULT(UseMontgomerySquareIntrinsic)) {
--    UseMontgomerySquareIntrinsic = true;
--  }
--
- #ifdef COMPILER2
-   if (FLAG_IS_DEFAULT(OptoScheduling)) {
-     OptoScheduling = true;
diff --git a/jdk/jdk_jvmcfg.patch b/jdk/jdk_jvmcfg.patch
deleted file mode 100644
index d2b1c11..0000000
--- a/jdk/jdk_jvmcfg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 0e757f8bf24c src/solaris/bin/aarch64/jvm.cfg
---- a/src/solaris/bin/aarch64/jvm.cfg	Sun Apr 10 22:47:29 2016 +0100
-+++ b/src/solaris/bin/aarch64/jvm.cfg	Wed May 18 18:20:54 2016 +0100
-@@ -31,5 +31,5 @@
- # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
- # and may not be available in a future release.
- #
---server KNOWN
---client IGNORE
-+-client KNOWN
-+-server IGNORE