[patch] Regenerate main JDK patches

Author: JakubVanek

scripts/jdk10.patch

@@ -1,6 +1,6 @@
-diff -r b09e56145e11 make/autoconf/flags.m4
---- a/make/autoconf/flags.m4	Thu Mar 08 04:23:31 2018 +0000
-+++ b/make/autoconf/flags.m4	Mon Jun 25 09:43:55 2018 +0200
+diff -Naur a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
+--- a/make/autoconf/flags.m4	2018-07-17 20:20:05.000000000 +0200
++++ b/make/autoconf/flags.m4	2018-10-29 02:32:53.052227324 +0100
 @@ -30,7 +30,7 @@
  AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
  [
@@ -10,7 +10,7 @@ diff -r b09e56145e11 make/autoconf/flags.m4
 
    if test "x$with_abi_profile" != x; then
      if test "x$OPENJDK_TARGET_CPU" != xarm && \
-@@ -51,6 +51,18 @@
+@@ -51,6 +51,9 @@
      elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
        ARM_FLOAT_TYPE=sflt
        ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
@@ -20,7 +20,7 @@ diff -r b09e56145e11 make/autoconf/flags.m4
      elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then
        ARM_FLOAT_TYPE=vfp-sflt
        ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
-@@ -1378,6 +1390,14 @@
+@@ -1378,6 +1381,8 @@
    if test "x$OPENJDK_$1_OS" = xlinux; then
      if test "x$OPENJDK_$1_CPU" = xx86; then
        $2JVM_ASFLAGS="[$]$2JVM_ASFLAGS -march=i586"
@@ -29,9 +29,42 @@ diff -r b09e56145e11 make/autoconf/flags.m4
      fi
    elif test "x$OPENJDK_$1_OS" = xmacosx; then
      $2JVM_ASFLAGS="[$]$2JVM_ASFLAGS -x assembler-with-cpp -mno-omit-leaf-frame-pointer -mstack-alignment=16"
-diff -r b09e56145e11 make/autoconf/lib-softfloat.m4
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/make/autoconf/lib-softfloat.m4	Mon Jun 25 09:43:55 2018 +0200
+diff -Naur a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
+--- a/make/autoconf/libraries.m4	2018-07-17 20:20:05.000000000 +0200
++++ b/make/autoconf/libraries.m4	2018-10-29 02:32:53.056227433 +0100
+@@ -32,6 +32,7 @@
+ m4_include([lib-std.m4])
+ m4_include([lib-x11.m4])
+ m4_include([lib-fontconfig.m4])
++m4_include([lib-softfloat.m4])
+ 
+ ################################################################################
+ # Determine which libraries are needed for this configuration
+@@ -78,6 +79,13 @@
+     NEEDS_LIB_ALSA=false
+   fi
+ 
++  if (test "x$OPENJDK_TARGET_CPU" == xarm &&
++      test "x$ARM_FLOAT_TYPE" = xsflt); then
++    NEEDS_LIB_SOFTFLOAT=true
++  else
++    NEEDS_LIB_SOFTFLOAT=false
++  fi
++
+   # Check if ffi is needed
+   if HOTSPOT_CHECK_JVM_VARIANT(zero); then
+     NEEDS_LIB_FFI=true
+@@ -97,6 +105,7 @@
+   LIB_SETUP_FONTCONFIG
+   LIB_SETUP_FREETYPE
+   LIB_SETUP_ALSA
++  LIB_SETUP_SOFTFLOAT
+   LIB_SETUP_LIBFFI
+   LIB_SETUP_BUNDLED_LIBS
+   LIB_SETUP_MISC_LIBS
+diff -Naur a/make/autoconf/lib-softfloat.m4 b/make/autoconf/lib-softfloat.m4
+--- a/make/autoconf/lib-softfloat.m4	1970-01-01 01:00:00.000000000 +0100
++++ b/make/autoconf/lib-softfloat.m4	2018-10-29 02:32:53.052227324 +0100
 @@ -0,0 +1,57 @@
 +#
 +# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
@@ -90,42 +123,9 @@ diff -r b09e56145e11 make/autoconf/lib-softfloat.m4
 +
 +  AC_SUBST(SOFTFLOAT_LIBS)
 +])
-diff -r b09e56145e11 make/autoconf/libraries.m4
---- a/make/autoconf/libraries.m4	Thu Mar 08 04:23:31 2018 +0000
-+++ b/make/autoconf/libraries.m4	Mon Jun 25 09:43:55 2018 +0200
-@@ -32,6 +32,7 @@
- m4_include([lib-std.m4])
- m4_include([lib-x11.m4])
- m4_include([lib-fontconfig.m4])
-+m4_include([lib-softfloat.m4])
- 
- ################################################################################
- # Determine which libraries are needed for this configuration
-@@ -78,6 +79,13 @@
-     NEEDS_LIB_ALSA=false
-   fi
- 
-+  if (test "x$OPENJDK_TARGET_CPU" == xarm &&
-+      test "x$ARM_FLOAT_TYPE" = xsflt); then
-+    NEEDS_LIB_SOFTFLOAT=true
-+  else
-+    NEEDS_LIB_SOFTFLOAT=false
-+  fi
-+
-   # Check if ffi is needed
-   if HOTSPOT_CHECK_JVM_VARIANT(zero); then
-     NEEDS_LIB_FFI=true
-@@ -97,6 +105,7 @@
-   LIB_SETUP_FONTCONFIG
-   LIB_SETUP_FREETYPE
-   LIB_SETUP_ALSA
-+  LIB_SETUP_SOFTFLOAT
-   LIB_SETUP_LIBFFI
-   LIB_SETUP_BUNDLED_LIBS
-   LIB_SETUP_MISC_LIBS
-diff -r b09e56145e11 make/autoconf/spec.gmk.in
---- a/make/autoconf/spec.gmk.in	Thu Mar 08 04:23:31 2018 +0000
-+++ b/make/autoconf/spec.gmk.in	Mon Jun 25 09:43:55 2018 +0200
+diff -Naur a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
+--- a/make/autoconf/spec.gmk.in	2018-07-17 20:20:05.000000000 +0200
++++ b/make/autoconf/spec.gmk.in	2018-10-29 02:32:53.060227543 +0100
 @@ -331,6 +331,7 @@
  CUPS_CFLAGS:=@CUPS_CFLAGS@
  ALSA_LIBS:=@ALSA_LIBS@
@@ -134,9 +134,9 @@ diff -r b09e56145e11 make/autoconf/spec.gmk.in
  LIBFFI_LIBS:=@LIBFFI_LIBS@
  LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
  ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
-diff -r b09e56145e11 make/hotspot/lib/CompileJvm.gmk
---- a/make/hotspot/lib/CompileJvm.gmk	Thu Mar 08 04:23:31 2018 +0000
-+++ b/make/hotspot/lib/CompileJvm.gmk	Mon Jun 25 09:43:55 2018 +0200
+diff -Naur a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
+--- a/make/hotspot/lib/CompileJvm.gmk	2018-07-17 20:20:05.000000000 +0200
++++ b/make/hotspot/lib/CompileJvm.gmk	2018-10-29 02:32:53.060227543 +0100
 @@ -112,6 +112,7 @@
 
  JVM_LIBS += \
@@ -145,9 +145,9 @@ diff -r b09e56145e11 make/hotspot/lib/CompileJvm.gmk
      #
 
  # These files and directories are always excluded
-diff -r b09e56145e11 src/hotspot/cpu/arm/assembler_arm_32.hpp
---- a/src/hotspot/cpu/arm/assembler_arm_32.hpp	Thu Mar 08 04:23:31 2018 +0000
-+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp	Mon Jun 25 09:43:55 2018 +0200
+diff -Naur a/src/hotspot/cpu/arm/assembler_arm_32.hpp b/src/hotspot/cpu/arm/assembler_arm_32.hpp
+--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp	2018-07-17 20:20:05.000000000 +0200
++++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp	2018-10-29 02:32:53.064227653 +0100
 @@ -498,7 +498,7 @@
    void dmb(DMB_Opt opt, Register reg) {
      if (VM_Version::arm_arch() >= 7) {
@@ -171,9 +171,9 @@ diff -r b09e56145e11 src/hotspot/cpu/arm/assembler_arm_32.hpp
  };
  #endif // __SOFTFP__
 
-diff -r b09e56145e11 src/hotspot/cpu/arm/vm_version_arm_32.cpp
---- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp	Thu Mar 08 04:23:31 2018 +0000
-+++ b/src/hotspot/cpu/arm/vm_version_arm_32.cpp	Mon Jun 25 09:43:55 2018 +0200
+diff -Naur a/src/hotspot/cpu/arm/vm_version_arm_32.cpp b/src/hotspot/cpu/arm/vm_version_arm_32.cpp
+--- a/src/hotspot/cpu/arm/vm_version_arm_32.cpp	2018-07-17 20:20:05.000000000 +0200
++++ b/src/hotspot/cpu/arm/vm_version_arm_32.cpp	2018-10-29 02:32:53.064227653 +0100
 @@ -298,6 +298,15 @@
      FLAG_SET_DEFAULT(UseUnalignedAccesses, false);
    }
@@ -190,9 +190,9 @@ diff -r b09e56145e11 src/hotspot/cpu/arm/vm_version_arm_32.cpp
    _is_initialized = true;
  }
 
-diff -r b09e56145e11 src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp
---- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp	Thu Mar 08 04:23:31 2018 +0000
-+++ b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp	Mon Jun 25 09:43:55 2018 +0200
+diff -Naur a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp
+--- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp	2018-07-17 20:20:05.000000000 +0200
++++ b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.inline.hpp	2018-10-29 02:32:53.068227762 +0100
 @@ -71,7 +71,7 @@
       __asm__ volatile (
       ".word 0xF57FF050 | 0xf" : : : "memory");