Merge ~vpa1977/ubuntu/+source/openjdk-lts:sr-20230117 into ubuntu/+source/openjdk-lts:ubuntu/devel

[Vladimir Petko]

openjdk-lts (11.0.18+10-0ubuntu1) lunar; urgency=medium

  * OpenJDK 11.0.18 release build 10
    - CVE-2023-21835, CVE-2023-21843
    - Release notes:
      https://www.oracle.com/java/technologies/javase/11-0-18-relnotes.html
  * debian/patches/*: Refreshed patches for the new release and dropped
    unused patches
  * debian/watch: use jdk11u repository as upstream

PPA: https://launchpad.net/~vpa1977/+archive/ubuntu/jdk-security-release2

43bd753... by Vladimir Petko on 2023-01-19

New upstream version 11.0.18+10

01a09fd... by Vladimir Petko on 2023-01-19

Update upstream source from tag 'upstream/11.0.18+10'

Update to upstream version '11.0.18+10'
with Debian dir affaba5700028462a539bec25513e120928f2868

0d18cad... by Vladimir Petko on 2023-01-19

drop bootcycle patch (fixed upstream)

6737fed... by Vladimir Petko on 2023-01-19

changelog

diff --git a/.gitignore b/.gitignore
 deleted file mode 100644
index 608a4f6..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-/build/
-/dist/
-/.idea/
-nbproject/private/
-/webrev
-/.src-rev
-/.jib/
-.DS_Store
-.metadata/
-.recommenders/
-test/nashorn/script/external
-test/nashorn/lib
-NashornProfile.txt
-**/JTreport/**
-**/JTwork/**
diff --git a/.jcheck/conf b/.jcheck/conf
 deleted file mode 100644
index d8163f5..0000000
--- a/.jcheck/conf
+++ /dev/null
@@ -1,31 +0,0 @@
-[general]
-project=jdk-updates
-jbs=JDK
-version=11.0.17
-
-[checks]
-error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace
-
-[repository]
-tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)
-branches=
-
-[census]
-version=0
-domain=openjdk.org
-
-[checks "whitespace"]
-files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java
-
-[checks "merge"]
-message=Merge
-
-[checks "reviewers"]
-reviewers=1
-ignore=duke
-
-[checks "committer"]
-role=committer
-
-[checks "issues"]
-pattern=^([124-8][0-9]{6}): (\S.*)$
diff --git a/debian/changelog b/debian/changelog
index 2d94c5a..2097efa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+openjdk-lts (11.0.18+10-0ubuntu1) lunar; urgency=medium
+
+  * OpenJDK 11.0.18 release, build 10.
+    - CVE-2023-21835, CVE-2023-21843
+    - Release notes:
+      https://www.oracle.com/java/technologies/javase/11-0-18-relnotes.html
+  * debian/patches/*: Refreshed patches for the new release and dropped unused
+    patches.
+  * debian/watch: use jdk11u repository as upstream.
+  * debian/rules: add lunar to jtreg version selection.
+
+ -- Vladimir Petko <[e-mail]>  Thu, 19 Jan 2023 21:24:22 +1300 
+
 openjdk-lts (11.0.17+8-1ubuntu2) kinetic-security; urgency=medium
 
   * OpenJDK 11.0.17 release, build 8.
diff --git a/debian/patches/accessible-toolkit.diff b/debian/patches/accessible-toolkit.diff
 deleted file mode 100644
index b337a9c..0000000
--- a/debian/patches/accessible-toolkit.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/jdk/src/share/classes/java/awt/Toolkit.java
-+++ b/jdk/src/share/classes/java/awt/Toolkit.java
-@@ -894,7 +894,11 @@
-                         return null;
-                     }
-                 });
--                loadAssistiveTechnologies();
-+                try {
-+                    loadAssistiveTechnologies();
-+                } catch ( AWTError error) {
-+                    // ignore silently
-+                }
-             } finally {
-                 // Make sure to always re-enable the JIT.
-                 java.lang.Compiler.enable();
diff --git a/debian/patches/adlc-parser.diff b/debian/patches/adlc-parser.diff
index a337b8e..48c64b6 100644
--- a/debian/patches/adlc-parser.diff
+++ b/debian/patches/adlc-parser.diff
@@ -1,13 +1,23 @@
 # DP: fixes an uninitialized memory issue in adlc
-Index: b/src/hotspot/share/adlc/formsopt.cpp
-===================================================================
 --- a/src/hotspot/share/adlc/formsopt.cpp
 +++ b/src/hotspot/share/adlc/formsopt.cpp
-@@ -439,6 +439,7 @@ FrameForm::FrameForm() {
+@@ -427,6 +427,11 @@
+ //==============================Frame Handling=================================
+ //------------------------------FrameForm--------------------------------------
+ FrameForm::FrameForm() {
++  _sync_stack_slots = NULL;
++  _inline_cache_reg = NULL;
++  _interpreter_method_oop_reg = NULL;
++  _interpreter_frame_pointer_reg = NULL;
++  _cisc_spilling_operand_name = NULL;
+   _frame_pointer = NULL;
+   _c_frame_pointer = NULL;
+   _alignment = NULL;
+@@ -438,7 +443,6 @@
+   _c_calling_convention = NULL;
    _return_value = NULL;
    _c_return_value = NULL;
-   _interpreter_frame_pointer_reg = NULL;
-+  _cisc_spilling_operand_name = NULL;
+-  _interpreter_frame_pointer_reg = NULL;
  }
  
  FrameForm::~FrameForm() {
diff --git a/debian/patches/alpha-float-const.diff b/debian/patches/alpha-float-const.diff
 deleted file mode 100644
index e3b6e08..0000000
--- a/debian/patches/alpha-float-const.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/java.base/share/classes/java/lang/Float.java	2017-11-16 00:58:50.000000000 +0100
-+++ b/src/java.base/share/classes/java/lang/Float.java	2017-12-22 22:56:30.771249660 +0100
-@@ -84,7 +84,9 @@
-      *
-      * @since 1.6
-      */
--    public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
-+     // FIXME: still required on alpha?
-+     // public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
-+     public static final float MIN_NORMAL = Float.intBitsToFloat(0x00800000);
- 
-     /**
-      * A constant holding the smallest positive nonzero value of type
diff --git a/debian/patches/dont-strip-images.diff b/debian/patches/dont-strip-images.diff
 deleted file mode 100644
index e7817cf..0000000
--- a/debian/patches/dont-strip-images.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/common/autoconf/flags.m4
-+++ b/src/common/autoconf/flags.m4
-@@ -61,7 +61,9 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
-   fi
- 
-   if test "x$OPENJDK_TARGET_OS" != xwindows; then
--    POST_STRIP_CMD="$STRIP $STRIPFLAGS"
-+    if test -z "$POST_STRIP_CMD" ; then
-+      POST_STRIP_CMD="$STRIP $STRIPFLAGS"
-+    fi
-   fi
-   AC_SUBST(POST_STRIP_CMD)
- 
diff --git a/debian/patches/enumipv6-fix.diff b/debian/patches/enumipv6-fix.diff
 deleted file mode 100644
index 82f73c5..0000000
--- a/debian/patches/enumipv6-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c~	2012-02-15 09:26:50.000000000 +0100
-+++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c	2012-02-26 14:13:22.602107361 +0100
-@@ -1105,7 +1105,7 @@
-     uint8_t ipv6addr[16];
- 
-     if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
--        while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
-+        while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %x %x %x %x %20s\n",
-                          addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[4], addr6p[5], addr6p[6], addr6p[7],
-                          &if_idx, &plen, &scope, &dad_status, devname) != EOF) {
- 
diff --git a/debian/patches/generated-headers.patch b/debian/patches/generated-headers.patch
index ca73f87..f9aa947 100644
--- a/debian/patches/generated-headers.patch
+++ b/debian/patches/generated-headers.patch
@@ -1,6 +1,6 @@
 --- a/make/lib/Awt2dLibraries.gmk
 +++ b/make/lib/Awt2dLibraries.gmk
-@@ -382,7 +382,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB
+@@ -383,7 +383,7 @@
      INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \
      OPTIMIZATION := HIGHEST, \
      CFLAGS := $(LCMS_CFLAGS_JDKLIB) \
@@ -9,7 +9,7 @@
      CFLAGS_solaris := -xc99=no_lib, \
      CFLAGS_windows := -DCMS_IS_WINDOWS_, \
      EXTRA_HEADER_DIRS := \
-@@ -431,7 +431,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIB
+@@ -432,7 +432,7 @@
      NAME := javajpeg, \
      INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
      OPTIMIZATION := HIGHEST, \
diff --git a/debian/patches/hotspot-disable-exec-shield-workaround.diff b/debian/patches/hotspot-disable-exec-shield-workaround.diff
index 447f09d..34c6e14 100644
--- a/debian/patches/hotspot-disable-exec-shield-workaround.diff
+++ b/debian/patches/hotspot-disable-exec-shield-workaround.diff
@@ -1,6 +1,6 @@
 --- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
 +++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
-@@ -863,7 +863,7 @@ void os::verify_stack_alignment() {
+@@ -874,7 +874,7 @@
   * updates (JDK-8023956).
   */
  void os::workaround_expand_exec_shield_cs_limit() {
diff --git a/debian/patches/hotspot-disable-werror.diff b/debian/patches/hotspot-disable-werror.diff
 deleted file mode 100644
index 0ec8583..0000000
--- a/debian/patches/hotspot-disable-werror.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/hotspot/make/linux/makefiles/gcc.make
-+++ b/src/hotspot/make/linux/makefiles/gcc.make
-@@ -203,7 +203,7 @@ else
- endif
- 
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS ?= -Werror -Wno-error=format
-+WARNINGS_ARE_ERRORS ?=
- 
- ifeq ($(USE_CLANG), true)
-   # However we need to clean the code up before we can unrestrictedly enable this option with Clang
diff --git a/debian/patches/hotspot-libpath.diff b/debian/patches/hotspot-libpath.diff
index 469c698..caf7616 100644
--- a/debian/patches/hotspot-libpath.diff
+++ b/debian/patches/hotspot-libpath.diff
@@ -1,6 +1,6 @@
 --- a/src/hotspot/os/linux/os_linux.cpp
 +++ b/src/hotspot/os/linux/os_linux.cpp
-@@ -427,18 +427,22 @@ void os::init_system_properties_values()
+@@ -430,18 +430,22 @@
    //        1: ...
    //        ...
    //        7: The default directories, normally /lib and /usr/lib.
@@ -28,7 +28,7 @@
  #define SYS_EXT_DIR     "/usr/java/packages"
 --- a/make/hotspot/lib/CompileJvm.gmk
 +++ b/make/hotspot/lib/CompileJvm.gmk
-@@ -131,6 +131,11 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TAR
+@@ -131,6 +131,11 @@
    endif
  endif
  
diff --git a/debian/patches/hotspot-mips-align.diff b/debian/patches/hotspot-mips-align.diff
index fb397fc..4ffd7f1 100644
--- a/debian/patches/hotspot-mips-align.diff
+++ b/debian/patches/hotspot-mips-align.diff
@@ -1,8 +1,6 @@
-Index: b/src/hotspot/cpu/zero/cppInterpreter_zero.cpp
-===================================================================
 --- a/src/hotspot/cpu/zero/cppInterpreter_zero.cpp
 +++ b/src/hotspot/cpu/zero/cppInterpreter_zero.cpp
-@@ -367,7 +367,7 @@ int CppInterpreter::native_entry(Method*
+@@ -369,7 +369,7 @@
    ThreadStateTransition::transition_from_java(thread, _thread_in_native);
  
    // Make the call
diff --git a/debian/patches/hotspot-set-compiler.diff b/debian/patches/hotspot-set-compiler.diff
 deleted file mode 100644
index 181b71c..0000000
--- a/debian/patches/hotspot-set-compiler.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/hotspot/make/linux/makefiles/gcc.make
-+++ b/src/hotspot/make/linux/makefiles/gcc.make
-@@ -39,7 +39,7 @@
-     ifeq ($(USE_CLANG), true)
-       CXX = clang++
-       CC  = clang
--    else
-+    else ifeq ($(CXX),)
-       CXX = g++
-       CC  = gcc
-     endif
diff --git a/debian/patches/hotspot-test-fix-npe-on-missing-file.patch b/debian/patches/hotspot-test-fix-npe-on-missing-file.patch
index 84781fd..afab6bd 100644
--- a/debian/patches/hotspot-test-fix-npe-on-missing-file.patch
+++ b/debian/patches/hotspot-test-fix-npe-on-missing-file.patch
@@ -11,7 +11,7 @@ Last-Update: 2020-11-09
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java
 +++ b/test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java
-@@ -139,7 +139,7 @@ public class MoveJDKTest {
+@@ -137,7 +137,7 @@
                      Files.createSymbolicLink(child_dst.toPath(),  /* link to -> */ child_src.toPath());
                  }
              } else {
diff --git a/debian/patches/hotspot-warn-no-errformat.diff b/debian/patches/hotspot-warn-no-errformat.diff
 deleted file mode 100644
index 0628b89..0000000
--- a/debian/patches/hotspot-warn-no-errformat.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/hotspot/make/solaris/makefiles/gcc.make
-+++ b/src/hotspot/make/solaris/makefiles/gcc.make
-@@ -117,7 +117,7 @@ endif
- 
- 
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS ?= -Werror
-+WARNINGS_ARE_ERRORS ?= -Werror -Wno-error=format
- 
- # Enable these warnings. See 'info gcc' about details on these options
- WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef -Wformat=2
---- a/src/hotspot/make/linux/makefiles/gcc.make
-+++ b/src/hotspot/make/linux/makefiles/gcc.make
-@@ -203,7 +203,7 @@ else
- endif
- 
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS ?= -Werror
-+WARNINGS_ARE_ERRORS ?= -Werror -Wno-error=format
- 
- ifeq ($(USE_CLANG), true)
-   # However we need to clean the code up before we can unrestrictedly enable this option with Clang
diff --git a/debian/patches/icedtea-sound.diff b/debian/patches/icedtea-sound.diff
 deleted file mode 100644
index 3e76219..0000000
--- a/debian/patches/icedtea-sound.diff
+++ /dev/null
@@ -1,158 +0,0 @@
---- a/src/icedtea-sound/acinclude.m4
-+++ b/src/icedtea-sound/acinclude.m4
-@@ -24,12 +24,14 @@
-       BUILD_ARCH_DIR=amd64
-       INSTALL_ARCH_DIR=amd64
-       JRE_ARCH_DIR=amd64
-+      ARCHFLAG="-m64"
-       ;;
-     i?86)
-       BUILD_ARCH_DIR=i586
-       INSTALL_ARCH_DIR=i386
-       JRE_ARCH_DIR=i386
-       ARCH_PREFIX=${LINUX32}
-+      ARCHFLAG="-m32"
-       ;;
-     alpha*)
-       BUILD_ARCH_DIR=alpha
-@@ -40,11 +42,13 @@
-       BUILD_ARCH_DIR=arm
-       INSTALL_ARCH_DIR=arm
-       JRE_ARCH_DIR=arm
-+      ARCHFLAG="-D_LITTLE_ENDIAN"
-       ;;
-     arm64|aarch64)
-       BUILD_ARCH_DIR=aarch64
-       INSTALL_ARCH_DIR=aarch64
-       JRE_ARCH_DIR=aarch64
-+      ARCHFLAG="-D_LITTLE_ENDIAN"
-       ;;
-     mips)
-       BUILD_ARCH_DIR=mips
-@@ -61,16 +65,19 @@
-       INSTALL_ARCH_DIR=ppc
-       JRE_ARCH_DIR=ppc
-       ARCH_PREFIX=${LINUX32}
-+      ARCHFLAG="-m32"
-       ;;
-     powerpc64)
-       BUILD_ARCH_DIR=ppc64
-       INSTALL_ARCH_DIR=ppc64
-       JRE_ARCH_DIR=ppc64
-+      ARCHFLAG="-m64"
-        ;;
-     powerpc64le)
-       BUILD_ARCH_DIR=ppc64
-       INSTALL_ARCH_DIR=ppc64
-       JRE_ARCH_DIR=ppc64
-+      ARCHFLAG="-m64"
-        ;;
-     sparc)
-       BUILD_ARCH_DIR=sparc
-@@ -78,23 +85,27 @@
-       JRE_ARCH_DIR=sparc
-       CROSS_TARGET_ARCH=sparc
-       ARCH_PREFIX=${LINUX32}
-+      ARCHFLAG="-m32"
-        ;;
-     sparc64)
-       BUILD_ARCH_DIR=sparcv9
-       INSTALL_ARCH_DIR=sparcv9
-       JRE_ARCH_DIR=sparc64
-+      ARCHFLAG="-m64"
-        ;;
-     s390)
-       BUILD_ARCH_DIR=s390
-       INSTALL_ARCH_DIR=s390
-       JRE_ARCH_DIR=s390
-       ARCH_PREFIX=${LINUX32}
-+      ARCHFLAG="-m31"
-        ;;
-     s390x)
-       BUILD_ARCH_DIR=s390x
-       INSTALL_ARCH_DIR=s390x
-       JRE_ARCH_DIR=s390x
-       CROSS_TARGET_ARCH=s390x
-+      ARCHFLAG="-m64"
-       ;;
-     sh*)
-       BUILD_ARCH_DIR=sh
---- a/src/icedtea-sound/configure
-+++ b/src/icedtea-sound/configure
-@@ -3719,12 +3719,14 @@
-       BUILD_ARCH_DIR=amd64
-       INSTALL_ARCH_DIR=amd64
-       JRE_ARCH_DIR=amd64
-+      ARCHFLAG="-m64"
-       ;;
-     i?86)
-       BUILD_ARCH_DIR=i586
-       INSTALL_ARCH_DIR=i386
-       JRE_ARCH_DIR=i386
-       ARCH_PREFIX=${LINUX32}
-+      ARCHFLAG="-m32"
-       ;;
-     alpha*)
-       BUILD_ARCH_DIR=alpha
-@@ -3735,11 +3737,13 @@
-       BUILD_ARCH_DIR=arm
-       INSTALL_ARCH_DIR=arm
-       JRE_ARCH_DIR=arm
-+      ARCHFLAG="-D_LITTLE_ENDIAN"
-       ;;
-     arm64|aarch64)
-       BUILD_ARCH_DIR=aarch64
-       INSTALL_ARCH_DIR=aarch64
-       JRE_ARCH_DIR=aarch64
-+      ARCHFLAG="-D_LITTLE_ENDIAN"
-       ;;
-     mips)
-       BUILD_ARCH_DIR=mips
-@@ -3756,16 +3760,19 @@
-       INSTALL_ARCH_DIR=ppc
-       JRE_ARCH_DIR=ppc
-       ARCH_PREFIX=${LINUX32}
-+      ARCHFLAG="-m32"
-       ;;
-     powerpc64)
-       BUILD_ARCH_DIR=ppc64
-       INSTALL_ARCH_DIR=ppc64
-       JRE_ARCH_DIR=ppc64
-+      ARCHFLAG="-m64"
-        ;;
-     powerpc64le)
-       BUILD_ARCH_DIR=ppc64
-       INSTALL_ARCH_DIR=ppc64
-       JRE_ARCH_DIR=ppc64
-+      ARCHFLAG="-m64"
-        ;;
-     sparc)
-       BUILD_ARCH_DIR=sparc
-@@ -3773,23 +3780,27 @@
-       JRE_ARCH_DIR=sparc
-       CROSS_TARGET_ARCH=sparc
-       ARCH_PREFIX=${LINUX32}
-+      ARCHFLAG="-m32"
-        ;;
-     sparc64)
-       BUILD_ARCH_DIR=sparcv9
-       INSTALL_ARCH_DIR=sparcv9
-       JRE_ARCH_DIR=sparc64
-+      ARCHFLAG="-m64"
-        ;;
-     s390)
-       BUILD_ARCH_DIR=s390
-       INSTALL_ARCH_DIR=s390
-       JRE_ARCH_DIR=s390
-       ARCH_PREFIX=${LINUX32}
-+      ARCHFLAG="-m31"
-        ;;
-     s390x)
-       BUILD_ARCH_DIR=s390x
-       INSTALL_ARCH_DIR=s390x
-       JRE_ARCH_DIR=s390x
-       CROSS_TARGET_ARCH=s390x
-+      ARCHFLAG="-m64"
-       ;;
-     sh*)
-       BUILD_ARCH_DIR=sh
diff --git a/debian/patches/icedtea-sound2.diff b/debian/patches/icedtea-sound2.diff
 deleted file mode 100644
index cd01771..0000000
--- a/debian/patches/icedtea-sound2.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/icedtea-sound/acinclude.m4
-+++ b/src/icedtea-sound/acinclude.m4
-@@ -527,7 +527,7 @@
-     }
- }]
- EOF
--  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-+  if $JAVAC -cp . $JAVACFLAGS -source 6 -target 6 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
-     if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
-       it_cv_jdk_works=yes;
-     else
---- a/src/icedtea-sound/configure
-+++ b/src/icedtea-sound/configure
-@@ -4601,7 +4601,7 @@
-     }
- }
- EOF
--  if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&5 2>&1; then
-+  if $JAVAC -cp . $JAVACFLAGS -source 6 -target 6 $CLASS >&5 2>&1; then
-     if $JAVA -classpath . $BYTECODE >&5 2>&1; then
-       it_cv_jdk_works=yes;
-     else
diff --git a/debian/patches/include-all-srcs.diff b/debian/patches/include-all-srcs.diff
 deleted file mode 100644
index f73bfaf..0000000
--- a/debian/patches/include-all-srcs.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/src/jdk/make/CreateJars.gmk
-+++ b/src/jdk/make/CreateJars.gmk
-@@ -569,38 +569,12 @@
- ##########################################################################################
- 
- SRC_ZIP_INCLUDES = \
--    com/sun/corba \
--    com/sun/image/codec/jpeg \
--    com/sun/imageio \
--    com/sun/java_cup \
--    com/sun/javadoc \
--    com/sun/java/swing \
--    com/sun/jmx \
--    com/sun/naming \
--    com/sun/org/apache \
--    com/sun/security/auth \
--    com/sun/security/jgss \
--    com/sun/source \
-+    com \
-     java \
--    javax/accessibility \
--    javax/annotation \
--    javax/imageio \
--    javax/lang \
--    javax/management \
--    javax/naming \
--    javax/print \
--    javax/rmi \
--    javax/script \
--    javax/security \
--    javax/sound \
--    javax/sql \
--    javax/swing \
--    javax/tools \
--    javax/xml \
--    org/ietf \
--    org/omg \
--    org/w3c/dom \
--    org/xml/sax \
-+    javax \
-+    jdk \
-+    org \
-+    sun \
-     #
- 
- SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
-@@ -632,7 +606,6 @@
- $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
-     SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
-     INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
--    EXCLUDES := javax/swing/beaninfo, \
-     SUFFIXES := .java .c .h, \
-     ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
-     EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/debian/patches/java-access-bridge-security.diff b/debian/patches/java-access-bridge-security.diff
 deleted file mode 100644
index 2e5d0e1..0000000
--- a/debian/patches/java-access-bridge-security.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-# patch only used for builds with java-access-bridge support
-
---- openjdk/jdk/src/share/lib/security/java.security-linux
-+++ openjdk/jdk/src/share/lib/security/java.security-linux
-@@ -149,7 +149,9 @@
-                com.sun.org.apache.xml.internal.security.,\
-                com.sun.org.glassfish.,\
-                org.jcp.xml.dsig.internal.,\
--               oracle.jrockit.jfr.
-+               oracle.jrockit.jfr.,\
-+               org.GNOME.Accessibility.,\
-+               org.GNOME.Bonobo.
- #
- # List of comma-separated packages that start with or equal this string
- # will cause a security exception to be thrown when
diff --git a/debian/patches/jaw-classpath.diff b/debian/patches/jaw-classpath.diff
index 77ff42d..ab77905 100644
--- a/debian/patches/jaw-classpath.diff
+++ b/debian/patches/jaw-classpath.diff
@@ -2,7 +2,7 @@ Fix finding the Java ATK wrapper, see #900912
 
 --- a/src/hotspot/os/linux/os_linux.cpp
 +++ b/src/hotspot/os/linux/os_linux.cpp
-@@ -481,6 +481,7 @@ void os::init_system_properties_values()
+@@ -484,6 +484,7 @@
      }
      Arguments::set_java_home(buf);
      set_boot_path('/', ':');
diff --git a/debian/patches/jdk-pulseaudio.diff b/debian/patches/jdk-pulseaudio.diff
 deleted file mode 100644
index 5b75862..0000000
--- a/debian/patches/jdk-pulseaudio.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/jdk/src/java.desktop/share/conf/sound.properties
-+++ b/src/jdk/src/java.desktop/share/conf/sound.properties
-@@ -37,3 +37,13 @@
- # Specify the default Receiver by provider and name:
- # javax.sound.midi.Receiver=com.sun.media.sound.MidiProvider#SunMIDI1
- #
-+
-+javax.sound.sampled.Clip=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
-+javax.sound.sampled.Port=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
-+javax.sound.sampled.SourceDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
-+javax.sound.sampled.TargetDataLine=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
-+
-+#javax.sound.sampled.Clip=com.sun.media.sound.DirectAudioDeviceProvider
-+#javax.sound.sampled.Port=com.sun.media.sound.PortMixerProvider
-+#javax.sound.sampled.SourceDataLine=com.sun.media.sound.DirectAudioDeviceProvider
-+#javax.sound.sampled.TargetDataLine=com.sun.media.sound.DirectAudioDeviceProvider
diff --git a/debian/patches/jtreg-location.diff b/debian/patches/jtreg-location.diff
index 59361c6..86c4bdb 100644
--- a/debian/patches/jtreg-location.diff
+++ b/debian/patches/jtreg-location.diff
@@ -1,6 +1,6 @@
 --- a/make/autoconf/toolchain.m4
 +++ b/make/autoconf/toolchain.m4
-@@ -1137,7 +1137,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
+@@ -1069,7 +1069,7 @@
        AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg does not exist])
      fi
  
@@ -9,7 +9,7 @@
        AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg is not a valid jtreg home])
      fi
  
-@@ -1156,7 +1156,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
+@@ -1088,7 +1088,7 @@
          AC_MSG_WARN([Ignoring JT_HOME pointing to invalid directory: $JT_HOME])
          JT_HOME=
        else
@@ -18,7 +18,7 @@
            AC_MSG_WARN([Ignoring JT_HOME which is not a valid jtreg home: $JT_HOME])
            JT_HOME=
          elif test ! -x "$JT_HOME/bin/jtreg"; then
-@@ -1176,7 +1176,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
+@@ -1108,7 +1108,7 @@
        if test "x$JTREGEXE" != x; then
          # That's good, now try to derive JT_HOME
          JT_HOME=`(cd $($DIRNAME $JTREGEXE)/.. && pwd)`
@@ -29,7 +29,7 @@
            JTREGEXE=
 --- a/make/RunTests.gmk
 +++ b/make/RunTests.gmk
-@@ -752,7 +752,7 @@ define SetupRunJtregTestBody
+@@ -740,7 +740,7 @@
  
    $1_COMMAND_LINE := \
        $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
@@ -40,7 +40,7 @@
            -dir:$$(JTREG_TOPDIR) \
 --- a/make/test/BuildFailureHandler.gmk
 +++ b/make/test/BuildFailureHandler.gmk
-@@ -39,7 +39,7 @@ FH_BASEDIR := $(TOPDIR)/test/failure_han
+@@ -39,7 +39,7 @@
  FH_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/failure_handler
  FH_JAR := $(FH_SUPPORT)/jtregFailureHandler.jar
  
diff --git a/debian/patches/kfreebsd-support-jamvm.diff b/debian/patches/kfreebsd-support-jamvm.diff
 deleted file mode 100644
index 5e39ed2..0000000
--- a/debian/patches/kfreebsd-support-jamvm.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/jamvm/configure.ac
-+++ b/src/jamvm/configure.ac
-@@ -38,6 +38,7 @@
- i386-*-freebsd*) host_os=bsd libdl_needed=no ;;
- i386-*-solaris*) host_cpu=x86 host_os=solaris ;;
- x86_64-*-linux*) host_os=linux ;;
-+x86_64-*-kfreebsd*) host_os=linux ;;
- hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
- mips*-*-linux*) host_cpu=mips host_os=linux ;;
- x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
---- a/src/jamvm/configure
-+++ b/src/jamvm/configure
-@@ -2926,6 +2926,7 @@
- i386-*-freebsd*) host_os=bsd libdl_needed=no ;;
- i386-*-solaris*) host_cpu=x86 host_os=solaris ;;
- x86_64-*-linux*) host_os=linux ;;
-+x86_64-*-kfreebsd*) host_os=linux ;;
- hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
- mips*-*-linux*) host_cpu=mips host_os=linux ;;
- x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
---- a/src/jamvm/src/classlib/openjdk/jvm.c
-+++ b/src/jamvm/src/classlib/openjdk/jvm.c
-@@ -63,6 +63,10 @@
- #define have_monotonic_clock FALSE
- #endif
- 
-+#ifndef TIOCINQ
-+#define TIOCINQ FIONREAD
-+#endif
-+
- static Class *cloneable_class, *constant_pool_class;
- static Class *exception_class, *runtime_excp_class;
- 
diff --git a/debian/patches/m68k-support.diff b/debian/patches/m68k-support.diff
 deleted file mode 100644
index 62c2ec4..0000000
--- a/debian/patches/m68k-support.diff
+++ /dev/null
@@ -1,1149 +0,0 @@
-# HG changeset patch
-# User glaubitz
-# Date 1532184301 -7200
-#      Sat Jul 21 16:45:01 2018 +0200
-# Node ID 418a697aef91a730b942129d5d41b6c68a871cd8
-# Parent  b0fcf59be3918afcaa13d1f97343968c2c467ffe
-JDK-NNNNNNN: Zero needs alignment fixes for linux-m68k
-
---- /dev/null
-+++ b/make/data/x11wrappergen/sizes-32-linux-m68k.txt
-@@ -0,0 +1,1017 @@
-+long	4
-+int	4
-+short	2
-+ptr	4
-+Bool	4
-+Atom	4
-+Window	4
-+XExtData.number	0
-+XExtData.next	4
-+XExtData.free_private	8
-+XExtData.private_data	12
-+XExtData	16
-+XIMStringConversionCallbackStruct.position	0
-+XIMStringConversionCallbackStruct.direction	2
-+XIMStringConversionCallbackStruct.operation	6
-+XIMStringConversionCallbackStruct.factor	8
-+XIMStringConversionCallbackStruct.text	10
-+XIMStringConversionCallbackStruct	14
-+XkbNewKeyboardNotifyEvent.type	0
-+XkbNewKeyboardNotifyEvent.serial	4
-+XkbNewKeyboardNotifyEvent.send_event	8
-+XkbNewKeyboardNotifyEvent.display	12
-+XkbNewKeyboardNotifyEvent.time	16
-+XkbNewKeyboardNotifyEvent.xkb_type	20
-+XkbNewKeyboardNotifyEvent.device	24
-+XkbNewKeyboardNotifyEvent.old_device	28
-+XkbNewKeyboardNotifyEvent.min_key_code	32
-+XkbNewKeyboardNotifyEvent.max_key_code	36
-+XkbNewKeyboardNotifyEvent.old_min_key_code	40
-+XkbNewKeyboardNotifyEvent.old_max_key_code	44
-+XkbNewKeyboardNotifyEvent.changed	48
-+XkbNewKeyboardNotifyEvent.req_major	52
-+XkbNewKeyboardNotifyEvent.req_minor	53
-+XkbNewKeyboardNotifyEvent	54
-+XTimeCoord.time	0
-+XTimeCoord.x	4
-+XTimeCoord.y	6
-+XTimeCoord	8
-+XkbCompatMapNotifyEvent.type	0
-+XkbCompatMapNotifyEvent.serial	4
-+XkbCompatMapNotifyEvent.send_event	8
-+XkbCompatMapNotifyEvent.display	12
-+XkbCompatMapNotifyEvent.time	16
-+XkbCompatMapNotifyEvent.xkb_type	20
-+XkbCompatMapNotifyEvent.device	24
-+XkbCompatMapNotifyEvent.changed_groups	28
-+XkbCompatMapNotifyEvent.first_si	32
-+XkbCompatMapNotifyEvent.num_si	36
-+XkbCompatMapNotifyEvent.num_total_si	40
-+XkbCompatMapNotifyEvent	44
-+XIMStatusDrawCallbackStruct.type	0
-+XIMStatusDrawCallbackStruct.data	4
-+XIMStatusDrawCallbackStruct	8
-+XKeyboardControl.key_click_percent	0
-+XKeyboardControl.bell_percent	4
-+XKeyboardControl.bell_pitch	8
-+XKeyboardControl.bell_duration	12
-+XKeyboardControl.led	16
-+XKeyboardControl.led_mode	20
-+XKeyboardControl.key	24
-+XKeyboardControl.auto_repeat_mode	28
-+XKeyboardControl	32
-+XSelectionClearEvent.type	0
-+XSelectionClearEvent.serial	4
-+XSelectionClearEvent.send_event	8
-+XSelectionClearEvent.display	12
-+XSelectionClearEvent.window	16
-+XSelectionClearEvent.selection	20
-+XSelectionClearEvent.time	24
-+XSelectionClearEvent	28
-+XWindowChanges.x	0
-+XWindowChanges.y	4
-+XWindowChanges.width	8
-+XWindowChanges.height	12
-+XWindowChanges.border_width	16
-+XWindowChanges.sibling	20
-+XWindowChanges.stack_mode	24
-+XWindowChanges	28
-+XIMPreeditCaretCallbackStruct.position	0
-+XIMPreeditCaretCallbackStruct.direction	4
-+XIMPreeditCaretCallbackStruct.style	8
-+XIMPreeditCaretCallbackStruct	12
-+XOMCharSetList.charset_count	0
-+XOMCharSetList.charset_list	4
-+XOMCharSetList	8
-+XOMFontInfo.num_font	0
-+XOMFontInfo.font_struct_list	4
-+XOMFontInfo.font_name_list	8
-+XOMFontInfo	12
-+AwtScreenData.numConfigs	0
-+AwtScreenData.root	4
-+AwtScreenData.whitepixel	8
-+AwtScreenData.blackpixel	12
-+AwtScreenData.defaultConfig	16
-+AwtScreenData.configs	20
-+AwtScreenData	24
-+XIMHotKeyTrigger.keysym	0
-+XIMHotKeyTrigger.modifier	4
-+XIMHotKeyTrigger.modifier_mask	8
-+XIMHotKeyTrigger	12
-+XCirculateEvent.type	0
-+XCirculateEvent.serial	4
-+XCirculateEvent.send_event	8
-+XCirculateEvent.display	12
-+XCirculateEvent.event	16
-+XCirculateEvent.window	20
-+XCirculateEvent.place	24
-+XCirculateEvent	28
-+Screen.ext_data	0
-+Screen.display	4
-+Screen.root	8
-+Screen.width	12
-+Screen.height	16
-+Screen.mwidth	20
-+Screen.mheight	24
-+Screen.ndepths	28
-+Screen.depths	32
-+Screen.root_depth	36
-+Screen.root_visual	40
-+Screen.default_gc	44
-+Screen.cmap	48
-+Screen.white_pixel	52
-+Screen.black_pixel	56
-+Screen.max_maps	60
-+Screen.min_maps	64
-+Screen.backing_store	68
-+Screen.save_unders	72
-+Screen.root_input_mask	76
-+Screen	80
-+XMapRequestEvent.type	0
-+XMapRequestEvent.serial	4
-+XMapRequestEvent.send_event	8
-+XMapRequestEvent.display	12
-+XMapRequestEvent.parent	16
-+XMapRequestEvent.window	20
-+XMapRequestEvent	24
-+XIMText.length	0
-+XIMText.feedback	2
-+XIMText.encoding_is_wchar	6
-+XIMText.string	10
-+XIMText	14
-+XGraphicsExposeEvent.type	0
-+XGraphicsExposeEvent.serial	4
-+XGraphicsExposeEvent.send_event	8
-+XGraphicsExposeEvent.display	12
-+XGraphicsExposeEvent.drawable	16
-+XGraphicsExposeEvent.x	20
-+XGraphicsExposeEvent.y	24
-+XGraphicsExposeEvent.width	28
-+XGraphicsExposeEvent.height	32
-+XGraphicsExposeEvent.count	36
-+XGraphicsExposeEvent.major_code	40
-+XGraphicsExposeEvent.minor_code	44
-+XGraphicsExposeEvent	48
-+XEvent.type	0
-+XEvent.xany	0
-+XEvent.xkey	0
-+XEvent.xbutton	0
-+XEvent.xmotion	0
-+XEvent.xcrossing	0
-+XEvent.xfocus	0
-+XEvent.xexpose	0
-+XEvent.xgraphicsexpose	0
-+XEvent.xnoexpose	0
-+XEvent.xvisibility	0
-+XEvent.xcreatewindow	0
-+XEvent.xdestroywindow	0
-+XEvent.xunmap	0
-+XEvent.xmap	0
-+XEvent.xmaprequest	0
-+XEvent.xreparent	0
-+XEvent.xconfigure	0
-+XEvent.xgravity	0
-+XEvent.xresizerequest	0
-+XEvent.xconfigurerequest	0
-+XEvent.xcirculate	0
-+XEvent.xcirculaterequest	0
-+XEvent.xproperty	0
-+XEvent.xselectionclear	0
-+XEvent.xselectionrequest	0
-+XEvent.xselection	0
-+XEvent.xcolormap	0
-+XEvent.xclient	0
-+XEvent.xmapping	0
-+XEvent.xerror	0
-+XEvent.xkeymap	0
-+XEvent.pad	0
-+XEvent	96
-+XRenderDirectFormat.red	0
-+XRenderDirectFormat.redMask	2
-+XRenderDirectFormat.green	4
-+XRenderDirectFormat.greenMask	6
-+XRenderDirectFormat.blue	8
-+XRenderDirectFormat.blueMask	10
-+XRenderDirectFormat.alpha	12
-+XRenderDirectFormat.alphaMask	14
-+XRenderDirectFormat	16
-+ColorData.awt_Colors	0
-+ColorData.awt_numICMcolors	4
-+ColorData.awt_icmLUT	8
-+ColorData.awt_icmLUT2Colors	12
-+ColorData.img_grays	16
-+ColorData.img_clr_tbl	20
-+ColorData.img_oda_red	24
-+ColorData.img_oda_green	28
-+ColorData.img_oda_blue	32
-+ColorData.pGrayInverseLutData	36
-+ColorData.representsPrimaries	44
-+ColorData.screendata	40
-+ColorData	48
-+XFontStruct.ext_data	0
-+XFontStruct.fid	4
-+XFontStruct.direction	8
-+XFontStruct.min_char_or_byte2	12
-+XFontStruct.max_char_or_byte2	16
-+XFontStruct.min_byte1	20
-+XFontStruct.max_byte1	24
-+XFontStruct.all_chars_exist	28
-+XFontStruct.n_properties	36
-+XFontStruct.properties	40
-+XFontStruct.min_bounds	44
-+XFontStruct.max_bounds	56
-+XFontStruct.per_char	68
-+XFontStruct.ascent	72
-+XFontStruct.descent	76
-+XFontStruct	80
-+XExtCodes.extension	0
-+XExtCodes.major_opcode	4
-+XExtCodes.first_event	8
-+XExtCodes.first_error	12
-+XExtCodes	16
-+XFontSetExtents.max_ink_extent	0
-+XFontSetExtents.max_logical_extent	8
-+XFontSetExtents	16
-+XSelectionEvent.type	0
-+XSelectionEvent.serial	4
-+XSelectionEvent.send_event	8
-+XSelectionEvent.display	12
-+XSelectionEvent.requestor	16
-+XSelectionEvent.selection	20
-+XSelectionEvent.target	24
-+XSelectionEvent.property	28
-+XSelectionEvent.time	32
-+XSelectionEvent	36
-+XArc.x	0
-+XArc.y	2
-+XArc.width	4
-+XArc.height	6
-+XArc.angle1	8
-+XArc.angle2	10
-+XArc	12
-+XErrorEvent.type	0
-+XErrorEvent.display	4
-+XErrorEvent.resourceid	8
-+XErrorEvent.serial	12
-+XErrorEvent.error_code	16
-+XErrorEvent.request_code	17
-+XErrorEvent.minor_code	18
-+XErrorEvent	20
-+XConfigureRequestEvent.type	0
-+XConfigureRequestEvent.serial	4
-+XConfigureRequestEvent.send_event	8
-+XConfigureRequestEvent.display	12
-+XConfigureRequestEvent.parent	16
-+XConfigureRequestEvent.window	20
-+XConfigureRequestEvent.x	24
-+XConfigureRequestEvent.y	28
-+XConfigureRequestEvent.width	32
-+XConfigureRequestEvent.height	36
-+XConfigureRequestEvent.border_width	40
-+XConfigureRequestEvent.above	44
-+XConfigureRequestEvent.detail	48
-+XConfigureRequestEvent.value_mask	52
-+XConfigureRequestEvent	56
-+ScreenFormat.ext_data	0
-+ScreenFormat.depth	4
-+ScreenFormat.bits_per_pixel	8
-+ScreenFormat.scanline_pad	12
-+ScreenFormat	16
-+XButtonEvent.type	0
-+XButtonEvent.serial	4
-+XButtonEvent.send_event	8
-+XButtonEvent.display	12
-+XButtonEvent.window	16
-+XButtonEvent.root	20
-+XButtonEvent.subwindow	24
-+XButtonEvent.time	28
-+XButtonEvent.x	32
-+XButtonEvent.y	36
-+XButtonEvent.x_root	40
-+XButtonEvent.y_root	44
-+XButtonEvent.state	48
-+XButtonEvent.button	52
-+XButtonEvent.same_screen	56
-+XButtonEvent	60
-+XFontProp.name	0
-+XFontProp.card32	4
-+XFontProp	8
-+XIMValuesList.count_values	0
-+XIMValuesList.supported_values	2
-+XIMValuesList	6
-+XKeymapEvent.type	0
-+XKeymapEvent.serial	4
-+XKeymapEvent.send_event	8
-+XKeymapEvent.display	12
-+XKeymapEvent.window	16
-+XKeymapEvent.key_vector	20
-+XKeymapEvent	52
-+XTextItem16.chars	0
-+XTextItem16.nchars	4
-+XTextItem16.delta	8
-+XTextItem16.font	12
-+XTextItem16	16
-+XIMPreeditDrawCallbackStruct.caret	0
-+XIMPreeditDrawCallbackStruct.chg_first	4
-+XIMPreeditDrawCallbackStruct.chg_length	8
-+XIMPreeditDrawCallbackStruct.text	12
-+XIMPreeditDrawCallbackStruct	16
-+XVisualInfo.visual	0
-+XVisualInfo.visualid	4
-+XVisualInfo.screen	8
-+XVisualInfo.depth	12
-+XVisualInfo.class	16
-+XVisualInfo.red_mask	20
-+XVisualInfo.green_mask	24
-+XVisualInfo.blue_mask	28
-+XVisualInfo.colormap_size	32
-+XVisualInfo.bits_per_rgb	36
-+XVisualInfo	40
-+XkbControlsNotifyEvent.type	0
-+XkbControlsNotifyEvent.serial	4
-+XkbControlsNotifyEvent.send_event	8
-+XkbControlsNotifyEvent.display	12
-+XkbControlsNotifyEvent.time	16
-+XkbControlsNotifyEvent.xkb_type	20
-+XkbControlsNotifyEvent.device	24
-+XkbControlsNotifyEvent.changed_ctrls	28
-+XkbControlsNotifyEvent.enabled_ctrls	32
-+XkbControlsNotifyEvent.enabled_ctrl_changes	36
-+XkbControlsNotifyEvent.num_groups	40
-+XkbControlsNotifyEvent.keycode	44
-+XkbControlsNotifyEvent.event_type	45
-+XkbControlsNotifyEvent.req_major	46
-+XkbControlsNotifyEvent.req_minor	47
-+XkbControlsNotifyEvent	48
-+PropMwmHints.flags	0
-+PropMwmHints.functions	4
-+PropMwmHints.decorations	8
-+PropMwmHints.inputMode	12
-+PropMwmHints.status	16
-+PropMwmHints	20
-+XClientMessageEvent.type	0
-+XClientMessageEvent.serial	4
-+XClientMessageEvent.send_event	8
-+XClientMessageEvent.display	12
-+XClientMessageEvent.window	16
-+XClientMessageEvent.message_type	20
-+XClientMessageEvent.format	24
-+XClientMessageEvent.data	28
-+XClientMessageEvent	48
-+XAnyEvent.type	0
-+XAnyEvent.serial	4
-+XAnyEvent.send_event	8
-+XAnyEvent.display	12
-+XAnyEvent.window	16
-+XAnyEvent	20
-+XkbIndicatorNotifyEvent.type	0
-+XkbIndicatorNotifyEvent.serial	4
-+XkbIndicatorNotifyEvent.send_event	8
-+XkbIndicatorNotifyEvent.display	12
-+XkbIndicatorNotifyEvent.time	16
-+XkbIndicatorNotifyEvent.xkb_type	20
-+XkbIndicatorNotifyEvent.device	24
-+XkbIndicatorNotifyEvent.changed	28
-+XkbIndicatorNotifyEvent.state	32
-+XkbIndicatorNotifyEvent	36
-+XIMPreeditStateNotifyCallbackStruct.state	0
-+XIMPreeditStateNotifyCallbackStruct	4
-+XkbAnyEvent.type	0
-+XkbAnyEvent.serial	4
-+XkbAnyEvent.send_event	8
-+XkbAnyEvent.display	12
-+XkbAnyEvent.time	16
-+XkbAnyEvent.xkb_type	20
-+XkbAnyEvent.device	24
-+XkbAnyEvent	28
-+XMotionEvent.type	0
-+XMotionEvent.serial	4
-+XMotionEvent.send_event	8
-+XMotionEvent.display	12
-+XMotionEvent.window	16
-+XMotionEvent.root	20
-+XMotionEvent.subwindow	24
-+XMotionEvent.time	28
-+XMotionEvent.x	32
-+XMotionEvent.y	36
-+XMotionEvent.x_root	40
-+XMotionEvent.y_root	44
-+XMotionEvent.state	48
-+XMotionEvent.is_hint	52
-+XMotionEvent.same_screen	54
-+XMotionEvent	58
-+XIMHotKeyTriggers.num_hot_key	0
-+XIMHotKeyTriggers.key	4
-+XIMHotKeyTriggers	8
-+XIMStyles.count_styles	0
-+XIMStyles.supported_styles	2
-+XIMStyles	6
-+XkbExtensionDeviceNotifyEvent.type	0
-+XkbExtensionDeviceNotifyEvent.serial	4
-+XkbExtensionDeviceNotifyEvent.send_event	8
-+XkbExtensionDeviceNotifyEvent.display	12
-+XkbExtensionDeviceNotifyEvent.time	16
-+XkbExtensionDeviceNotifyEvent.xkb_type	20
-+XkbExtensionDeviceNotifyEvent.device	24
-+XkbExtensionDeviceNotifyEvent.reason	28
-+XkbExtensionDeviceNotifyEvent.supported	32
-+XkbExtensionDeviceNotifyEvent.unsupported	36
-+XkbExtensionDeviceNotifyEvent.first_btn	40
-+XkbExtensionDeviceNotifyEvent.num_btns	44
-+XkbExtensionDeviceNotifyEvent.leds_defined	48
-+XkbExtensionDeviceNotifyEvent.led_state	52
-+XkbExtensionDeviceNotifyEvent.led_class	56
-+XkbExtensionDeviceNotifyEvent.led_id	60
-+XkbExtensionDeviceNotifyEvent	64
-+XwcTextItem.chars	0
-+XwcTextItem.nchars	4
-+XwcTextItem.delta	8
-+XwcTextItem.font_set	12
-+XwcTextItem	16
-+XClassHint.res_name	0
-+XClassHint.res_class	4
-+XClassHint	8
-+XChar2b.byte1	0
-+XChar2b.byte2	1
-+XChar2b	2
-+XSetWindowAttributes.background_pixmap	0
-+XSetWindowAttributes.background_pixel	4
-+XSetWindowAttributes.border_pixmap	8
-+XSetWindowAttributes.border_pixel	12
-+XSetWindowAttributes.bit_gravity	16
-+XSetWindowAttributes.win_gravity	20
-+XSetWindowAttributes.backing_store	24
-+XSetWindowAttributes.backing_planes	28
-+XSetWindowAttributes.backing_pixel	32
-+XSetWindowAttributes.save_under	36
-+XSetWindowAttributes.event_mask	40
-+XSetWindowAttributes.do_not_propagate_mask	44
-+XSetWindowAttributes.override_redirect	48
-+XSetWindowAttributes.colormap	52
-+XSetWindowAttributes.cursor	56
-+XSetWindowAttributes	60
-+XRenderPictFormat.id	0
-+XRenderPictFormat.type	4
-+XRenderPictFormat.depth	8
-+XRenderPictFormat.direct	12
-+XRenderPictFormat.colormap	28
-+XRenderPictFormat	32
-+XReparentEvent.type	0
-+XReparentEvent.serial	4
-+XReparentEvent.send_event	8
-+XReparentEvent.display	12
-+XReparentEvent.event	16
-+XReparentEvent.window	20
-+XReparentEvent.parent	24
-+XReparentEvent.x	28
-+XReparentEvent.y	32
-+XReparentEvent.override_redirect	36
-+XReparentEvent	40
-+XCirculateRequestEvent.type	0
-+XCirculateRequestEvent.serial	4
-+XCirculateRequestEvent.send_event	8
-+XCirculateRequestEvent.display	12
-+XCirculateRequestEvent.parent	16
-+XCirculateRequestEvent.window	20
-+XCirculateRequestEvent.place	24
-+XCirculateRequestEvent	28
-+XImage.width	0
-+XImage.height	4
-+XImage.xoffset	8
-+XImage.format	12
-+XImage.data	16
-+XImage.byte_order	20
-+XImage.bitmap_unit	24
-+XImage.bitmap_bit_order	28
-+XImage.bitmap_pad	32
-+XImage.depth	36
-+XImage.bytes_per_line	40
-+XImage.bits_per_pixel	44
-+XImage.red_mask	48
-+XImage.green_mask	52
-+XImage.blue_mask	56
-+XImage.obdata	60
-+XImage.f.create_image	64
-+XImage.f.destroy_image	68
-+XImage.f.get_pixel	72
-+XImage.f.put_pixel	76
-+XImage.f.sub_image	80
-+XImage.f.add_pixel	84
-+XImage	88
-+XKeyEvent.type	0
-+XKeyEvent.serial	4
-+XKeyEvent.send_event	8
-+XKeyEvent.display	12
-+XKeyEvent.window	16
-+XKeyEvent.root	20
-+XKeyEvent.subwindow	24
-+XKeyEvent.time	28
-+XKeyEvent.x	32
-+XKeyEvent.y	36
-+XKeyEvent.x_root	40
-+XKeyEvent.y_root	44
-+XKeyEvent.state	48
-+XKeyEvent.keycode	52
-+XKeyEvent.same_screen	56
-+XKeyEvent	60
-+XkbActionMessageEvent.type	0
-+XkbActionMessageEvent.serial	4
-+XkbActionMessageEvent.send_event	8
-+XkbActionMessageEvent.display	12
-+XkbActionMessageEvent.time	16
-+XkbActionMessageEvent.xkb_type	20
-+XkbActionMessageEvent.device	24
-+XkbActionMessageEvent.keycode	28
-+XkbActionMessageEvent.press	30
-+XkbActionMessageEvent.key_event_follows	34
-+XkbActionMessageEvent.group	38
-+XkbActionMessageEvent.mods	42
-+XkbActionMessageEvent.message	46
-+XkbActionMessageEvent	54
-+XdbeSwapInfo.swap_window	0
-+XdbeSwapInfo.swap_action	4
-+XdbeSwapInfo	6
-+XTextItem.chars	0
-+XTextItem.nchars	4
-+XTextItem.delta	8
-+XTextItem.font	12
-+XTextItem	16
-+XModifierKeymap.max_keypermod	0
-+XModifierKeymap.modifiermap	4
-+XModifierKeymap	8
-+XCharStruct.lbearing	0
-+XCharStruct.rbearing	2
-+XCharStruct.width	4
-+XCharStruct.ascent	6
-+XCharStruct.descent	8
-+XCharStruct.attributes	10
-+XCharStruct	12
-+XGravityEvent.type	0
-+XGravityEvent.serial	4
-+XGravityEvent.send_event	8
-+XGravityEvent.display	12
-+XGravityEvent.event	16
-+XGravityEvent.window	20
-+XGravityEvent.x	24
-+XGravityEvent.y	28
-+XGravityEvent	32
-+Visual.ext_data	0
-+Visual.visualid	4
-+Visual.class	8
-+Visual.red_mask	12
-+Visual.green_mask	16
-+Visual.blue_mask	20
-+Visual.bits_per_rgb	24
-+Visual.map_entries	28
-+Visual	32
-+XOMOrientation.num_orientation	0
-+XOMOrientation.orientation	4
-+XOMOrientation	8
-+XkbAccessXNotifyEvent.type	0
-+XkbAccessXNotifyEvent.serial	4
-+XkbAccessXNotifyEvent.send_event	8
-+XkbAccessXNotifyEvent.display	12
-+XkbAccessXNotifyEvent.time	16
-+XkbAccessXNotifyEvent.xkb_type	20
-+XkbAccessXNotifyEvent.device	24
-+XkbAccessXNotifyEvent.detail	28
-+XkbAccessXNotifyEvent.keycode	32
-+XkbAccessXNotifyEvent.sk_delay	36
-+XkbAccessXNotifyEvent.debounce_delay	40
-+XkbAccessXNotifyEvent	44
-+XWindowAttributes.x	0
-+XWindowAttributes.y	4
-+XWindowAttributes.width	8
-+XWindowAttributes.height	12
-+XWindowAttributes.border_width	16
-+XWindowAttributes.depth	20
-+XWindowAttributes.visual	24
-+XWindowAttributes.root	28
-+XWindowAttributes.class	32
-+XWindowAttributes.bit_gravity	36
-+XWindowAttributes.win_gravity	40
-+XWindowAttributes.backing_store	44
-+XWindowAttributes.backing_planes	48
-+XWindowAttributes.backing_pixel	52
-+XWindowAttributes.save_under	56
-+XWindowAttributes.colormap	60
-+XWindowAttributes.map_installed	64
-+XWindowAttributes.map_state	68
-+XWindowAttributes.all_event_masks	72
-+XWindowAttributes.your_event_mask	76
-+XWindowAttributes.do_not_propagate_mask	80
-+XWindowAttributes.override_redirect	84
-+XWindowAttributes.screen	88
-+XWindowAttributes	92
-+XmbTextItem.chars	0
-+XmbTextItem.nchars	4
-+XmbTextItem.delta	8
-+XmbTextItem.font_set	12
-+XmbTextItem	16
-+XMappingEvent.type	0
-+XMappingEvent.serial	4
-+XMappingEvent.send_event	8
-+XMappingEvent.display	12
-+XMappingEvent.window	16
-+XMappingEvent.request	20
-+XMappingEvent.first_keycode	24
-+XMappingEvent.count	28
-+XMappingEvent	32
-+XSizeHints.flags	0
-+XSizeHints.x	4
-+XSizeHints.y	8
-+XSizeHints.width	12
-+XSizeHints.height	16
-+XSizeHints.min_width	20
-+XSizeHints.min_height	24
-+XSizeHints.max_width	28
-+XSizeHints.max_height	32
-+XSizeHints.width_inc	36
-+XSizeHints.height_inc	40
-+XSizeHints.min_aspect.x	44
-+XSizeHints.min_aspect.y	48
-+XSizeHints.max_aspect.x	52
-+XSizeHints.max_aspect.y	56
-+XSizeHints.base_width	60
-+XSizeHints.base_height	64
-+XSizeHints.win_gravity	68
-+XSizeHints	72
-+XUnmapEvent.type	0
-+XUnmapEvent.serial	4
-+XUnmapEvent.send_event	8
-+XUnmapEvent.display	12
-+XUnmapEvent.event	16
-+XUnmapEvent.window	20
-+XUnmapEvent.from_configure	24
-+XUnmapEvent	28
-+awtImageData.Depth	0
-+awtImageData.wsImageFormat	4
-+awtImageData.clrdata	16
-+awtImageData.convert	48
-+awtImageData	304
-+XkbStateNotifyEvent.type	0
-+XkbStateNotifyEvent.serial	4
-+XkbStateNotifyEvent.send_event	8
-+XkbStateNotifyEvent.display	12
-+XkbStateNotifyEvent.time	16
-+XkbStateNotifyEvent.xkb_type	20
-+XkbStateNotifyEvent.device	24
-+XkbStateNotifyEvent.changed	28
-+XkbStateNotifyEvent.group	32
-+XkbStateNotifyEvent.base_group	36
-+XkbStateNotifyEvent.latched_group	40
-+XkbStateNotifyEvent.locked_group	44
-+XkbStateNotifyEvent.mods	48
-+XkbStateNotifyEvent.base_mods	52
-+XkbStateNotifyEvent.latched_mods	56
-+XkbStateNotifyEvent.locked_mods	60
-+XkbStateNotifyEvent.compat_state	64
-+XkbStateNotifyEvent.grab_mods	68
-+XkbStateNotifyEvent.compat_grab_mods	69
-+XkbStateNotifyEvent.lookup_mods	70
-+XkbStateNotifyEvent.compat_lookup_mods	71
-+XkbStateNotifyEvent.ptr_buttons	72
-+XkbStateNotifyEvent.keycode	76
-+XkbStateNotifyEvent.event_type	77
-+XkbStateNotifyEvent.req_major	78
-+XkbStateNotifyEvent.req_minor	79
-+XkbStateNotifyEvent	80
-+XExposeEvent.type	0
-+XExposeEvent.serial	4
-+XExposeEvent.send_event	8
-+XExposeEvent.display	12
-+XExposeEvent.window	16
-+XExposeEvent.x	20
-+XExposeEvent.y	24
-+XExposeEvent.width	28
-+XExposeEvent.height	32
-+XExposeEvent.count	36
-+XExposeEvent	40
-+XkbMapNotifyEvent.type	0
-+XkbMapNotifyEvent.serial	4
-+XkbMapNotifyEvent.send_event	8
-+XkbMapNotifyEvent.display	12
-+XkbMapNotifyEvent.time	16
-+XkbMapNotifyEvent.xkb_type	20
-+XkbMapNotifyEvent.device	24
-+XkbMapNotifyEvent.changed	28
-+XkbMapNotifyEvent.flags	32
-+XkbMapNotifyEvent.first_type	36
-+XkbMapNotifyEvent.num_types	40
-+XkbMapNotifyEvent.min_key_code	44
-+XkbMapNotifyEvent.max_key_code	45
-+XkbMapNotifyEvent.first_key_sym	46
-+XkbMapNotifyEvent.first_key_act	47
-+XkbMapNotifyEvent.first_key_behavior	48
-+XkbMapNotifyEvent.first_key_explicit	49
-+XkbMapNotifyEvent.first_modmap_key	50
-+XkbMapNotifyEvent.first_vmodmap_key	51
-+XkbMapNotifyEvent.num_key_syms	52
-+XkbMapNotifyEvent.num_key_acts	56
-+XkbMapNotifyEvent.num_key_behaviors	60
-+XkbMapNotifyEvent.num_key_explicit	64
-+XkbMapNotifyEvent.num_modmap_keys	68
-+XkbMapNotifyEvent.num_vmodmap_keys	72
-+XkbMapNotifyEvent.vmods	76
-+XkbMapNotifyEvent	80
-+XGCValues.function	0
-+XGCValues.plane_mask	4
-+XGCValues.foreground	8
-+XGCValues.background	12
-+XGCValues.line_width	16
-+XGCValues.line_style	20
-+XGCValues.cap_style	24
-+XGCValues.join_style	28
-+XGCValues.fill_style	32
-+XGCValues.fill_rule	36
-+XGCValues.arc_mode	40
-+XGCValues.tile	44
-+XGCValues.stipple	48
-+XGCValues.ts_x_origin	52
-+XGCValues.ts_y_origin	56
-+XGCValues.font	60
-+XGCValues.subwindow_mode	64
-+XGCValues.graphics_exposures	68
-+XGCValues.clip_x_origin	72
-+XGCValues.clip_y_origin	76
-+XGCValues.clip_mask	80
-+XGCValues.dash_offset	84
-+XGCValues.dashes	88
-+XGCValues	90
-+XFocusChangeEvent.type	0
-+XFocusChangeEvent.serial	4
-+XFocusChangeEvent.send_event	8
-+XFocusChangeEvent.display	12
-+XFocusChangeEvent.window	16
-+XFocusChangeEvent.mode	20
-+XFocusChangeEvent.detail	24
-+XFocusChangeEvent	28
-+XPixmapFormatValues.depth	0
-+XPixmapFormatValues.bits_per_pixel	4
-+XPixmapFormatValues.scanline_pad	8
-+XPixmapFormatValues	12
-+XMapEvent.type	0
-+XMapEvent.serial	4
-+XMapEvent.send_event	8
-+XMapEvent.display	12
-+XMapEvent.event	16
-+XMapEvent.window	20
-+XMapEvent.override_redirect	24
-+XMapEvent	28
-+XkbBellNotifyEvent.type	0
-+XkbBellNotifyEvent.serial	4
-+XkbBellNotifyEvent.send_event	8
-+XkbBellNotifyEvent.display	12
-+XkbBellNotifyEvent.time	16
-+XkbBellNotifyEvent.xkb_type	20
-+XkbBellNotifyEvent.device	24
-+XkbBellNotifyEvent.percent	28
-+XkbBellNotifyEvent.pitch	32
-+XkbBellNotifyEvent.duration	36
-+XkbBellNotifyEvent.bell_class	40
-+XkbBellNotifyEvent.bell_id	44
-+XkbBellNotifyEvent.name	48
-+XkbBellNotifyEvent.window	52
-+XkbBellNotifyEvent.event_only	56
-+XkbBellNotifyEvent	60
-+XIMStringConversionText.length	0
-+XIMStringConversionText.feedback	2
-+XIMStringConversionText.encoding_is_wchar	6
-+XIMStringConversionText.string	10
-+XIMStringConversionText	14
-+XKeyboardState.key_click_percent	0
-+XKeyboardState.bell_percent	4
-+XKeyboardState.bell_pitch	8
-+XKeyboardState.bell_duration	12
-+XKeyboardState.led_mask	16
-+XKeyboardState.global_auto_repeat	20
-+XKeyboardState.auto_repeats	24
-+XKeyboardState	56
-+XkbEvent.type	0
-+XkbEvent.any	0
-+XkbEvent.new_kbd	0
-+XkbEvent.map	0
-+XkbEvent.state	0
-+XkbEvent.ctrls	0
-+XkbEvent.indicators	0
-+XkbEvent.names	0
-+XkbEvent.compat	0
-+XkbEvent.bell	0
-+XkbEvent.message	0
-+XkbEvent.accessx	0
-+XkbEvent.device	0
-+XkbEvent.core	0
-+XkbEvent	96
-+XPoint.x	0
-+XPoint.y	2
-+XPoint	4
-+XSegment.x1	0
-+XSegment.y1	2
-+XSegment.x2	4
-+XSegment.y2	6
-+XSegment	8
-+XIconSize.min_width	0
-+XIconSize.min_height	4
-+XIconSize.max_width	8
-+XIconSize.max_height	12
-+XIconSize.width_inc	16
-+XIconSize.height_inc	20
-+XIconSize	24
-+XIMCallback.client_data	0
-+XIMCallback.callback	4
-+XIMCallback	8
-+XConfigureEvent.type	0
-+XConfigureEvent.serial	4
-+XConfigureEvent.send_event	8
-+XConfigureEvent.display	12
-+XConfigureEvent.event	16
-+XConfigureEvent.window	20
-+XConfigureEvent.x	24
-+XConfigureEvent.y	28
-+XConfigureEvent.width	32
-+XConfigureEvent.height	36
-+XConfigureEvent.border_width	40
-+XConfigureEvent.above	44
-+XConfigureEvent.override_redirect	48
-+XConfigureEvent	52
-+XRectangle.x	0
-+XRectangle.y	2
-+XRectangle.width	4
-+XRectangle.height	6
-+XRectangle	8
-+XkbNamesNotifyEvent.type	0
-+XkbNamesNotifyEvent.serial	4
-+XkbNamesNotifyEvent.send_event	8
-+XkbNamesNotifyEvent.display	12
-+XkbNamesNotifyEvent.time	16
-+XkbNamesNotifyEvent.xkb_type	20
-+XkbNamesNotifyEvent.device	24
-+XkbNamesNotifyEvent.changed	28
-+XkbNamesNotifyEvent.first_type	32
-+XkbNamesNotifyEvent.num_types	36
-+XkbNamesNotifyEvent.first_lvl	40
-+XkbNamesNotifyEvent.num_lvls	44
-+XkbNamesNotifyEvent.num_aliases	48
-+XkbNamesNotifyEvent.num_radio_groups	52
-+XkbNamesNotifyEvent.changed_vmods	56
-+XkbNamesNotifyEvent.changed_groups	60
-+XkbNamesNotifyEvent.changed_indicators	64
-+XkbNamesNotifyEvent.first_key	68
-+XkbNamesNotifyEvent.num_keys	72
-+XkbNamesNotifyEvent	76
-+XCreateWindowEvent.type	0
-+XCreateWindowEvent.serial	4
-+XCreateWindowEvent.send_event	8
-+XCreateWindowEvent.display	12
-+XCreateWindowEvent.parent	16
-+XCreateWindowEvent.window	20
-+XCreateWindowEvent.x	24
-+XCreateWindowEvent.y	28
-+XCreateWindowEvent.width	32
-+XCreateWindowEvent.height	36
-+XCreateWindowEvent.border_width	40
-+XCreateWindowEvent.override_redirect	44
-+XCreateWindowEvent	48
-+XVisibilityEvent.type	0
-+XVisibilityEvent.serial	4
-+XVisibilityEvent.send_event	8
-+XVisibilityEvent.display	12
-+XVisibilityEvent.window	16
-+XVisibilityEvent.state	20
-+XVisibilityEvent	24
-+XWMHints.flags	0
-+XWMHints.initial_state	8
-+XWMHints.icon_pixmap	12
-+XWMHints.icon_window	16
-+XWMHints.icon_x	20
-+XWMHints.icon_y	24
-+XWMHints.icon_mask	28
-+XWMHints.input	4
-+XWMHints.window_group	32
-+XWMHints	36
-+XCrossingEvent.type	0
-+XCrossingEvent.serial	4
-+XCrossingEvent.send_event	8
-+XCrossingEvent.display	12
-+XCrossingEvent.window	16
-+XCrossingEvent.root	20
-+XCrossingEvent.subwindow	24
-+XCrossingEvent.time	28
-+XCrossingEvent.x	32
-+XCrossingEvent.y	36
-+XCrossingEvent.x_root	40
-+XCrossingEvent.y_root	44
-+XCrossingEvent.mode	48
-+XCrossingEvent.detail	52
-+XCrossingEvent.same_screen	56
-+XCrossingEvent.focus	60
-+XCrossingEvent.state	64
-+XCrossingEvent	68
-+XSelectionRequestEvent.type	0
-+XSelectionRequestEvent.serial	4
-+XSelectionRequestEvent.send_event	8
-+XSelectionRequestEvent.display	12
-+XSelectionRequestEvent.owner	16
-+XSelectionRequestEvent.requestor	20
-+XSelectionRequestEvent.selection	24
-+XSelectionRequestEvent.target	28
-+XSelectionRequestEvent.property	32
-+XSelectionRequestEvent.time	36
-+XSelectionRequestEvent	40
-+XNoExposeEvent.type	0
-+XNoExposeEvent.serial	4
-+XNoExposeEvent.send_event	8
-+XNoExposeEvent.display	12
-+XNoExposeEvent.drawable	16
-+XNoExposeEvent.major_code	20
-+XNoExposeEvent.minor_code	24
-+XNoExposeEvent	28
-+XHostAddress.family	0
-+XHostAddress.length	4
-+XHostAddress.address	8
-+XHostAddress	12
-+XColormapEvent.type	0
-+XColormapEvent.serial	4
-+XColormapEvent.send_event	8
-+XColormapEvent.display	12
-+XColormapEvent.window	16
-+XColormapEvent.colormap	20
-+XColormapEvent.new	24
-+XColormapEvent.state	28
-+XColormapEvent	32
-+ColorEntry.r	0
-+ColorEntry.g	1
-+ColorEntry.b	2
-+ColorEntry.flags	3
-+ColorEntry	4
-+XResizeRequestEvent.type	0
-+XResizeRequestEvent.serial	4
-+XResizeRequestEvent.send_event	8
-+XResizeRequestEvent.display	12
-+XResizeRequestEvent.window	16
-+XResizeRequestEvent.width	20
-+XResizeRequestEvent.height	24
-+XResizeRequestEvent	28
-+Depth.depth	0
-+Depth.nvisuals	4
-+Depth.visuals	8
-+Depth	12
-+XPropertyEvent.type	0
-+XPropertyEvent.serial	4
-+XPropertyEvent.send_event	8
-+XPropertyEvent.display	12
-+XPropertyEvent.window	16
-+XPropertyEvent.atom	20
-+XPropertyEvent.time	24
-+XPropertyEvent.state	28
-+XPropertyEvent	32
-+XDestroyWindowEvent.type	0
-+XDestroyWindowEvent.serial	4
-+XDestroyWindowEvent.send_event	8
-+XDestroyWindowEvent.display	12
-+XDestroyWindowEvent.event	16
-+XDestroyWindowEvent.window	20
-+XDestroyWindowEvent	24
-+XStandardColormap.colormap	0
-+XStandardColormap.red_max	4
-+XStandardColormap.red_mult	8
-+XStandardColormap.green_max	12
-+XStandardColormap.green_mult	16
-+XStandardColormap.blue_max	20
-+XStandardColormap.blue_mult	24
-+XStandardColormap.base_pixel	28
-+XStandardColormap.visualid	32
-+XStandardColormap.killid	36
-+XStandardColormap	40
-+XComposeStatus.compose_ptr	0
-+XComposeStatus.chars_matched	4
-+XComposeStatus	8
-+AwtGraphicsConfigData.awt_depth	0
-+AwtGraphicsConfigData.awt_cmap	4
-+AwtGraphicsConfigData.awt_visInfo	8
-+AwtGraphicsConfigData.awt_num_colors	48
-+AwtGraphicsConfigData.awtImage	52
-+AwtGraphicsConfigData.AwtColorMatch	56
-+AwtGraphicsConfigData.monoImage	60
-+AwtGraphicsConfigData.monoPixmap	64
-+AwtGraphicsConfigData.monoPixmapWidth	68
-+AwtGraphicsConfigData.monoPixmapHeight	72
-+AwtGraphicsConfigData.monoPixmapGC	76
-+AwtGraphicsConfigData.pixelStride	80
-+AwtGraphicsConfigData.color_data	84
-+AwtGraphicsConfigData.glxInfo	88
-+AwtGraphicsConfigData.isTranslucencySupported	92
-+AwtGraphicsConfigData.renderPictFormat	96
-+AwtGraphicsConfigData	128
-+XColor.pixel	0
-+XColor.red	4
-+XColor.green	6
-+XColor.blue	8
-+XColor.flags	10
-+XColor.pad	11
-+XColor	12
-+XTextProperty.value	0
-+XTextProperty.encoding	4
-+XTextProperty.format	8
-+XTextProperty.nitems	12
-+XTextProperty	16
---- a/make/gensrc/GensrcX11Wrappers.gmk
-+++ b/make/gensrc/GensrcX11Wrappers.gmk
-@@ -33,9 +33,14 @@ GENSRC_X11WRAPPERS_MARKER := $(GENSRC_X1
- # Put the generated Java classes used to interface X11 from awt here.
- GENSRC_X11WRAPPERS_OUTPUTDIR := $(GENSRC_X11WRAPPERS_OUTPUT_TOP)/sun/awt/X11
- 
-+GENSRC_X11_VERSION_VARIANT :=
-+ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-m68k)
-+  GENSRC_X11_VERSION_VARIANT := -linux-m68k
-+endif
-+
- # The pre-calculated offset file are stored here:
- GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/make/data/x11wrappergen
--GENSRC_X11WRAPPERS_DATA := $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(OPENJDK_TARGET_CPU_BITS).txt
-+GENSRC_X11WRAPPERS_DATA := $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(OPENJDK_TARGET_CPU_BITS)$(GENSRC_X11_VERSION_VARIANT).txt
- 
- # Run the tool on the offset files to generate several Java classes used in awt.
- $(GENSRC_X11WRAPPERS_MARKER): $(BUILD_TOOLS_JDK) $(GENSRC_X11WRAPPERS_DATA) \
---- a/src/hotspot/share/memory/allocation.hpp
-+++ b/src/hotspot/share/memory/allocation.hpp
-@@ -211,7 +211,7 @@ template <MEMFLAGS F> class CHeapObj ALL
- 
-   void  operator delete(void* p)     { FreeHeap(p); }
-   void  operator delete [] (void* p) { FreeHeap(p); }
--};
-+} __attribute__ ((aligned (4)));
- 
- // Base class for objects allocated on the stack only.
- // Calling new or delete will result in fatal error.
-@@ -225,7 +225,7 @@ class StackObj ALLOCATION_SUPER_CLASS_SP
- #endif
-   void  operator delete(void* p);
-   void  operator delete [](void* p);
--};
-+} __attribute__ ((aligned (4)));
- 
- // Base class for objects stored in Metaspace.
- // Calling delete will result in fatal error.
-@@ -326,7 +326,7 @@ class MetaspaceObj {
-   // that should be read-only by default. See symbol.hpp for an example. This function
-   // is used by the templates in metaspaceClosure.hpp
-   static bool is_read_only_by_default() { return false; }
--};
-+} __attribute__ ((aligned (4)));
- 
- // Base class for classes that constitute name spaces.
- 
-@@ -416,7 +416,7 @@ class ResourceObj ALLOCATION_SUPER_CLASS
- 
-   void  operator delete(void* p);
-   void  operator delete [](void* p);
--};
-+} __attribute__ ((aligned (4)));
- 
- // One of the following macros must be used when allocating an array
- // or object to determine whether it should reside in the C heap on in
---- a/src/hotspot/share/oops/constMethod.hpp
-+++ b/src/hotspot/share/oops/constMethod.hpp
-@@ -559,6 +559,6 @@ private:
- 
-   // Verify
-   void verify_on(outputStream* st);
--};
-+} __attribute__ ((aligned (4)));
- 
- #endif // SHARE_VM_OOPS_CONSTMETHODOOP_HPP
---- a/src/hotspot/share/oops/oop.hpp
-+++ b/src/hotspot/share/oops/oop.hpp
-@@ -338,6 +338,6 @@ class oopDesc {
-   static void* load_oop_raw(oop obj, int offset);
-   static bool  is_valid(oop obj);
-   static oop   oop_or_null(address addr);
--};
-+} __attribute__ ((aligned (4)));
- 
- #endif // SHARE_VM_OOPS_OOP_HPP
---- a/src/java.base/unix/native/libjli/java_md_solinux.c
-+++ b/src/java.base/unix/native/libjli/java_md_solinux.c
-@@ -728,12 +728,24 @@ void SplashFreeLibrary() {
-     }
- }
- 
-+struct call_continuation_args {
-+  int (JNICALL *continuation)(void *);
-+  void *args;
-+};
-+
-+static void *call_continuation(void *_args)
-+{
-+  struct call_continuation_args *args = _args;
-+  return (void *)args->continuation(args->args);
-+}
-+
- /*
-  * Block current thread and continue execution in a new thread
-  */
- int
- ContinueInNewThread0(int (JNICALL *continuation)(void *), jlong stack_size, void * args) {
-     int rslt;
-+    struct call_continuation_args ccargs = { continuation, args };
- #ifndef __solaris__
-     pthread_t tid;
-     pthread_attr_t attr;
-@@ -745,7 +757,7 @@ ContinueInNewThread0(int (JNICALL *conti
-     }
-     pthread_attr_setguardsize(&attr, 0); // no pthread guard page on java threads
- 
--    if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) {
-+    if (pthread_create(&tid, &attr, call_continuation, &ccargs) == 0) {
-       void * tmp;
-       pthread_join(tid, &tmp);
-       rslt = (int)(intptr_t)tmp;
-@@ -763,7 +775,7 @@ ContinueInNewThread0(int (JNICALL *conti
- #else /* __solaris__ */
-     thread_t tid;
-     long flags = 0;
--    if (thr_create(NULL, stack_size, (void *(*)(void *))continuation, args, flags, &tid) == 0) {
-+    if (thr_create(NULL, stack_size, call_continuation, &ccargs, flags, &tid) == 0) {
-       void * tmp;
-       thr_join(tid, NULL, &tmp);
-       rslt = (int)(intptr_t)tmp;
diff --git a/debian/patches/machine-flag.diff b/debian/patches/machine-flag.diff
index bf04c46..8be4c24 100644
--- a/debian/patches/machine-flag.diff
+++ b/debian/patches/machine-flag.diff
@@ -1,6 +1,6 @@
 --- a/make/autoconf/flags.m4
 +++ b/make/autoconf/flags.m4
-@@ -262,6 +262,7 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
+@@ -271,6 +271,7 @@
          test "x$OPENJDK_TARGET_CPU_ARCH" = xppc; then
        MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
      fi
@@ -8,7 +8,7 @@
    fi
  
    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-@@ -344,11 +345,8 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL]
+@@ -357,11 +358,8 @@
    AC_SUBST(COMPILER_COMMAND_FILE_FLAG)
    AC_SUBST(COMPILER_BINDCMD_FILE_FLAG)
  
diff --git a/debian/patches/mips-sigset.diff b/debian/patches/mips-sigset.diff
 deleted file mode 100644
index 1477d34..0000000
--- a/debian/patches/mips-sigset.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/hotspot/os/linux/os_linux.cpp
-+++ b/src/hotspot/os/linux/os_linux.cpp
-@@ -4567,14 +4567,16 @@ bool os::Linux::signal_handlers_are_inst
- 
- // For signal-chaining
- struct sigaction sigact[NSIG];
--uint64_t sigs = 0;
--#if (64 < NSIG-1)
--#error "Not all signals can be encoded in sigs. Adapt its type!"
--#endif
-+sigset_t sigs;
- bool os::Linux::libjsig_is_loaded = false;
- typedef struct sigaction *(*get_signal_t)(int);
- get_signal_t os::Linux::get_signal_action = NULL;
- 
-+static __attribute__((constructor)) void sigs_init()
-+{
-+    sigemptyset(&sigs);
-+}
-+
- struct sigaction* os::Linux::get_chained_signal_action(int sig) {
-   struct sigaction *actp = NULL;
- 
-@@ -4649,7 +4651,7 @@ bool os::Linux::chained_handler(int sig,
- }
- 
- struct sigaction* os::Linux::get_preinstalled_handler(int sig) {
--  if ((((uint64_t)1 << (sig-1)) & sigs) != 0) {
-+  if (sigismember(&sigs, sig)) {
-     return &sigact[sig];
-   }
-   return NULL;
-@@ -4658,7 +4660,7 @@ struct sigaction* os::Linux::get_preinst
- void os::Linux::save_preinstalled_handler(int sig, struct sigaction& oldAct) {
-   assert(sig > 0 && sig < NSIG, "vm signal out of expected range");
-   sigact[sig] = oldAct;
--  sigs |= (uint64_t)1 << (sig-1);
-+  sigaddset(&sigs, sig);
- }
- 
- // for diagnostic
diff --git a/debian/patches/multiple-pkcs11-library-init.diff b/debian/patches/multiple-pkcs11-library-init.diff
index 52cd33f..aec9f96 100644
--- a/debian/patches/multiple-pkcs11-library-init.diff
+++ b/debian/patches/multiple-pkcs11-library-init.diff
@@ -7,7 +7,7 @@ Allow multiple PKCS11 library initialisation to be a non-critical error.
 
 --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
 +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Config.java
-@@ -52,6 +52,7 @@ final class Config {
+@@ -52,6 +52,7 @@
      static final int ERR_HALT       = 1;
      static final int ERR_IGNORE_ALL = 2;
      static final int ERR_IGNORE_LIB = 3;
@@ -15,7 +15,7 @@ Allow multiple PKCS11 library initialisation to be a non-critical error.
  
      // same as allowSingleThreadedModules but controlled via a system property
      // and applied to all providers. if set to false, no SunPKCS11 instances
-@@ -1026,6 +1027,8 @@ final class Config {
+@@ -1026,6 +1027,8 @@
              handleStartupErrors = ERR_IGNORE_LIB;
          } else if (val.equals("halt")) {
              handleStartupErrors = ERR_HALT;
@@ -26,7 +26,7 @@ Allow multiple PKCS11 library initialisation to be a non-critical error.
          }
 --- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
 +++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java
-@@ -174,26 +174,37 @@ public final class SunPKCS11 extends Aut
+@@ -176,26 +176,37 @@
                  String nssLibraryDirectory = config.getNssLibraryDirectory();
                  String nssSecmodDirectory = config.getNssSecmodDirectory();
                  boolean nssOptimizeSpace = config.getNssOptimizeSpace();
diff --git a/debian/patches/no-pch-build.diff b/debian/patches/no-pch-build.diff
 deleted file mode 100644
index 76726e8..0000000
--- a/debian/patches/no-pch-build.diff
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/src/hotspot/src/share/vm/oops/arrayKlassKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/arrayKlassKlass.cpp	2013-04-15 13:57:24.992929086 +0200
-@@ -30,6 +30,7 @@
- #include "runtime/handles.inline.hpp"
- #ifndef SERIALGC
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
- #include "memory/cardTableRS.hpp"
---- a/src/hotspot/src/share/vm/oops/constantPoolKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/constantPoolKlass.cpp	2013-04-15 14:02:52.143087149 +0200
-@@ -49,6 +49,7 @@
- #endif
- #ifndef SERIALGC
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
- #include "memory/cardTableRS.hpp"
---- a/src/hotspot/src/share/vm/oops/cpCacheKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/cpCacheKlass.cpp	2013-04-15 14:04:45.219838633 +0200
-@@ -35,6 +35,7 @@
- #include "runtime/handles.inline.hpp"
- #ifndef SERIALGC
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
- #include "memory/cardTableRS.hpp"
---- a/src/hotspot/src/share/vm/oops/instanceKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/instanceKlass.cpp	2013-04-15 14:07:55.861109867 +0200
-@@ -70,6 +70,7 @@
- #include "gc_implementation/g1/g1RemSet.inline.hpp"
- #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
- #include "oops/oop.pcgc.inline.hpp"
---- a/src/hotspot/src/share/vm/oops/instanceKlassKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/instanceKlassKlass.cpp	2013-04-15 14:08:53.541485528 +0200
-@@ -44,6 +44,7 @@
- #include "runtime/fieldDescriptor.hpp"
- #ifndef SERIALGC
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
- #include "memory/cardTableRS.hpp"
---- a/src/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/instanceMirrorKlass.cpp	2013-04-15 14:10:11.162003798 +0200
-@@ -42,6 +42,7 @@
- #include "gc_implementation/g1/g1RemSet.inline.hpp"
- #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
- #include "oops/oop.pcgc.inline.hpp"
---- a/src/hotspot/src/share/vm/oops/instanceRefKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/instanceRefKlass.cpp	2013-04-15 14:11:11.726403390 +0200
-@@ -39,6 +39,7 @@
- #include "gc_implementation/g1/g1RemSet.inline.hpp"
- #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
- #include "oops/oop.pcgc.inline.hpp"
---- a/src/hotspot/src/share/vm/oops/klassKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/klassKlass.cpp	2013-04-15 14:13:01.999133769 +0200
-@@ -42,6 +42,7 @@
- #include "runtime/handles.inline.hpp"
- #ifndef SERIALGC
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
- #include "memory/cardTableRS.hpp"
---- a/src/hotspot/src/share/vm/oops/objArrayKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/objArrayKlass.cpp	2013-04-15 14:16:10.616389484 +0200
-@@ -47,6 +47,7 @@
- #include "gc_implementation/g1/g1RemSet.inline.hpp"
- #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psCompactionManager.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
---- a/src/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/oops/objArrayKlassKlass.cpp	2013-04-15 14:17:01.800729154 +0200
-@@ -33,6 +33,7 @@
- #include "oops/oop.inline2.hpp"
- #ifndef SERIALGC
- #include "gc_implementation/parNew/parOopClosures.inline.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
- #include "memory/cardTableRS.hpp"
---- a/src/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp~	2013-03-04 22:51:00.000000000 +0100
-+++ b/src/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp	2013-04-15 14:20:24.782079605 +0200
-@@ -28,6 +28,7 @@
- #include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
- #include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
- #include "gc_implementation/parallelScavenge/psMarkSweep.hpp"
-+#include "gc_implementation/parallelScavenge/psOldGen.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
- #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
- #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
diff --git a/debian/patches/pass-extra-flags.diff b/debian/patches/pass-extra-flags.diff
 deleted file mode 100644
index cbf36c5..0000000
--- a/debian/patches/pass-extra-flags.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/hotspot/make/linux/makefiles/jsig.make
-+++ b/src/hotspot/make/linux/makefiles/jsig.make
-@@ -54,7 +54,9 @@ endif
- $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
- 	@echo $(LOG_INFO) Making signal interposition lib...
- 	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
--                         $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
-+                         $(LFLAGS_JSIG) $(EXTRA_LDFLAGS) \
-+                         $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) \
-+                         -o $@ $< -ldl
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- 	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
- 	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
---- a/src/hotspot/make/linux/makefiles/vm.make
-+++ b/src/hotspot/make/linux/makefiles/vm.make
-@@ -118,7 +118,8 @@ CFLAGS += $(CFLAGS/NOEX)
- 
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+CXXFLAGS += $(EXTRA_CXXFLAGS)
-+LFLAGS += $(EXTRA_LDFLAGS)
- 
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
diff --git a/debian/patches/powerpcspe-float-const.diff b/debian/patches/powerpcspe-float-const.diff
 deleted file mode 100644
index b03e29e..0000000
--- a/debian/patches/powerpcspe-float-const.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/java.base/share/classes/java/lang/Float.java	2018-03-13 17:46:28.000000000 +0100
-+++ b/src/java.base/share/classes/java/lang/Float.java	2018-05-01 15:35:55.626369726 +0200
-@@ -92,7 +92,7 @@
-      * hexadecimal floating-point literal {@code 0x0.000002P-126f}
-      * and also equal to {@code Float.intBitsToFloat(0x1)}.
-      */
--    public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
-+    public static final float MIN_VALUE = Float.intBitsToFloat(0x1);
- 
-     /**
-      * Maximum exponent a finite {@code float} variable may have.  It
diff --git a/debian/patches/reproducible-build-jmod.diff b/debian/patches/reproducible-build-jmod.diff
index 11e73e5..f1e9ca1 100644
--- a/debian/patches/reproducible-build-jmod.diff
+++ b/debian/patches/reproducible-build-jmod.diff
@@ -12,7 +12,7 @@ Forwarded: not-needed
 
 --- a/make/CreateJmods.gmk
 +++ b/make/CreateJmods.gmk
-@@ -213,6 +213,15 @@ endif
+@@ -218,6 +218,15 @@
  
  # Create jmods in a temp dir and then move them into place to keep the
  # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.
@@ -28,7 +28,7 @@ Forwarded: not-needed
  $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)
  	$(call LogWarn, Creating $(patsubst $(OUTPUTDIR)/%, %, $@))
  	$(call MakeDir, $(JMODS_DIR) $(JMODS_TEMPDIR))
-@@ -224,7 +233,11 @@ $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)
+@@ -229,7 +238,11 @@
  	        --module-path $(JMODS_DIR) \
  	        $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@) \
  	)
diff --git a/debian/patches/reproducible-build-user.diff b/debian/patches/reproducible-build-user.diff
index 2ed579c..60c7a7b 100644
--- a/debian/patches/reproducible-build-user.diff
+++ b/debian/patches/reproducible-build-user.diff
@@ -1,14 +1,14 @@
 Description: Makes the build user invariant to improve the reproducibility (it appears in the interval VM version in libjvm.so)
 Author: Emmanuel Bourg <[e-mail]>
 Forwarded: no
---- a/make/autoconf/basics.m4
-+++ b/make/autoconf/basics.m4
-@@ -658,7 +658,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
- 
+--- a/make/autoconf/basic.m4
++++ b/make/autoconf/basic.m4
+@@ -100,7 +100,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
+
    # Setup username (for use in adhoc version strings etc)
    # Outer [ ] to quote m4.
 -  [ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
 +  [ USERNAME="unknown" ]
    AC_SUBST(USERNAME)
  ])
- 
+
diff --git a/debian/patches/reproducible-character-data.diff b/debian/patches/reproducible-character-data.diff
index 778b3b2..93412a0 100644
--- a/debian/patches/reproducible-character-data.diff
+++ b/debian/patches/reproducible-character-data.diff
@@ -12,12 +12,13 @@ Forwarded: no
          int marklen = commandMarker.length();
          LOOP: while(true) {
              try {
-@@ -1819,7 +1819,7 @@ OUTER:  for (int i = 0; i < n; i += m) {
+@@ -1819,7 +1819,8 @@ OUTER:  for (int i = 0; i < n; i += m) {
          }
          commentStart = (Csyntax ? "/*" : "//");
          commentEnd = (Csyntax ? " */" : "");
--        commandLineDescription = desc.toString();
-+        commandLineDescription = desc.toString().replace(System.getProperty("user.dir").replace("make/gensrc", ""), "");
+-        commandLineDescription = desc.toString().replace("\\", "\\\\");
++        commandLineDescription = desc.toString().replace("\\", "\\\\")
++            .replace(System.getProperty("user.dir").replace("make/gensrc", ""), "");
      }
- 
+
      private static void searchBins(long[] map, int binsOccupied) throws Exception {
diff --git a/debian/patches/reproducible-properties-timestamp.diff b/debian/patches/reproducible-properties-timestamp.diff
index 491359a..596c01c 100644
--- a/debian/patches/reproducible-properties-timestamp.diff
+++ b/debian/patches/reproducible-properties-timestamp.diff
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[e-mail]>
 Forwarded: no
 --- a/src/java.base/share/classes/java/util/Properties.java
 +++ b/src/java.base/share/classes/java/util/Properties.java
-@@ -926,7 +926,7 @@ class Properties extends Hashtable<Objec
+@@ -929,7 +929,7 @@
          if (comments != null) {
              writeComments(bw, comments);
          }
@@ -12,7 +12,7 @@ Forwarded: no
          bw.newLine();
          synchronized (this) {
              for (Map.Entry<Object, Object> e : entrySet()) {
-@@ -1576,4 +1576,22 @@ class Properties extends Hashtable<Objec
+@@ -1579,4 +1579,22 @@
          }
          this.map = map;
      }
diff --git a/debian/patches/riscv64.diff b/debian/patches/riscv64.diff
index 8eb8898..218aa5d 100644
--- a/debian/patches/riscv64.diff
+++ b/debian/patches/riscv64.diff
@@ -25,7 +25,7 @@ Reviewed-by: aph, erikj, ehelin, ihse
  
 --- a/make/autoconf/build-aux/config.sub
 +++ b/make/autoconf/build-aux/config.sub
-@@ -34,8 +34,8 @@ if echo $* | grep linux-musl >/dev/null
+@@ -40,8 +40,8 @@
      exit
  fi
  
@@ -36,7 +36,7 @@ Reviewed-by: aph, erikj, ehelin, ihse
      . $DIR/autoconf-config.sub "$@"
      # autoconf-config.sub exits, so we never reach here, but just in
      # case we do:
-@@ -50,6 +50,10 @@ while test $# -gt 0 ; do
+@@ -56,6 +56,10 @@
              config=`echo $1 | sed 's/^aarch64-/arm-/'`
              sub_args="$sub_args $config"
              shift; ;;
@@ -47,7 +47,7 @@ Reviewed-by: aph, erikj, ehelin, ihse
          - )    # Use stdin as input.
              sub_args="$sub_args $1"
              shift; break ;;
-@@ -62,7 +66,7 @@ done
+@@ -68,7 +72,7 @@
  result=`. $DIR/autoconf-config.sub $sub_args "$@"`
  exitcode=$?
  
diff --git a/debian/patches/s390x-opt.diff b/debian/patches/s390x-opt.diff
index ea60068..e5e119a 100644
--- a/debian/patches/s390x-opt.diff
+++ b/debian/patches/s390x-opt.diff
@@ -1,6 +1,6 @@
 --- a/make/autoconf/flags-cflags.m4
 +++ b/make/autoconf/flags-cflags.m4
-@@ -756,6 +756,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
+@@ -757,6 +757,9 @@
        fi
      elif test "x$FLAGS_CPU" = xs390x; then
        $1_CFLAGS_CPU="-mbackchain -march=z10"
diff --git a/debian/patches/s390x-thread-stack-size.diff b/debian/patches/s390x-thread-stack-size.diff
index 00c785f..6308b10 100644
--- a/debian/patches/s390x-thread-stack-size.diff
+++ b/debian/patches/s390x-thread-stack-size.diff
@@ -14,35 +14,35 @@
  #endif // _LP64
 --- a/make/autoconf/boot-jdk.m4
 +++ b/make/autoconf/boot-jdk.m4
-@@ -431,6 +431,9 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
+@@ -459,6 +459,9 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
    fi
-   ADD_JVM_ARG_IF_OK([-Xmx${JVM_MAX_HEAP}M],boot_jdk_jvmargs_big,[$JAVA])
-   ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
+   UTIL_ADD_JVM_ARG_IF_OK([-Xmx${JVM_MAX_HEAP}M],boot_jdk_jvmargs_big,[$JAVA])
+   UTIL_ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])
 +  if test "$VAR_CPU" = s390x; then
-+    ADD_JVM_ARG_IF_OK([-Xss1600k],boot_jdk_jvmargs_big,[$JAVA])
++    UTIL_ADD_JVM_ARG_IF_OK([-Xss1600k],boot_jdk_jvmargs_big,[$JAVA])
 +  fi
- 
+
    AC_MSG_RESULT([$boot_jdk_jvmargs_big])
- 
-@@ -460,6 +463,9 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
-   ADD_JVM_ARG_IF_OK([-XX:+UseSerialGC],boot_jdk_jvmargs_small,[$JAVA])
-   ADD_JVM_ARG_IF_OK([-Xms32M],boot_jdk_jvmargs_small,[$JAVA])
-   ADD_JVM_ARG_IF_OK([-Xmx512M],boot_jdk_jvmargs_small,[$JAVA])
+
+@@ -488,6 +491,9 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
+   UTIL_ADD_JVM_ARG_IF_OK([-XX:+UseSerialGC],boot_jdk_jvmargs_small,[$JAVA])
+   UTIL_ADD_JVM_ARG_IF_OK([-Xms32M],boot_jdk_jvmargs_small,[$JAVA])
+   UTIL_ADD_JVM_ARG_IF_OK([-Xmx512M],boot_jdk_jvmargs_small,[$JAVA])
 +  if test "$VAR_CPU" = s390x; then
-+    ADD_JVM_ARG_IF_OK([-Xss1600k],boot_jdk_jvmargs_small,[$JAVA])
++    UTIL_ADD_JVM_ARG_IF_OK([-Xss1600k],boot_jdk_jvmargs_small,[$JAVA])
 +  fi
-   ADD_JVM_ARG_IF_OK([-XX:TieredStopAtLevel=1],boot_jdk_jvmargs_small,[$JAVA])
- 
+   UTIL_ADD_JVM_ARG_IF_OK([-XX:TieredStopAtLevel=1],boot_jdk_jvmargs_small,[$JAVA])
+
    AC_MSG_RESULT([$boot_jdk_jvmargs_small])
 --- a/make/autoconf/build-performance.m4
 +++ b/make/autoconf/build-performance.m4
 @@ -443,6 +443,9 @@ AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC],
      MX_VALUE=512
    fi
-   ADD_JVM_ARG_IF_OK([-Xms${MS_VALUE}M -Xmx${MX_VALUE}M],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA])
+   UTIL_ADD_JVM_ARG_IF_OK([-Xms${MS_VALUE}M -Xmx${MX_VALUE}M],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA])
 +  if test "$VAR_CPU" = s390x; then
-+    ADD_JVM_ARG_IF_OK([-Xss1600k],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA])
++    UTIL_ADD_JVM_ARG_IF_OK([-Xss1600k],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA])
 +  fi
    AC_SUBST(SJAVAC_SERVER_JAVA_FLAGS)
- 
+
    AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac],
diff --git a/debian/patches/series b/debian/patches/series
index 7aebfe9..27795ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-# jdk11u-dev-updates.diff
 system-pcsclite.diff
 hotspot-mips-align.diff
 icc_loading_with_symlink.diff
@@ -18,13 +17,8 @@ disable-doclint-by-default.diff
 8199220.diff
 machine-flag.diff
 zero-x32.diff
-# mips-sigset.diff
-# s390x-zEC12.diff
 hotspot-disable-exec-shield-workaround.diff
 atk-wrapper-security.diff
-# java-access-bridge-security.diff
-# jdk-pulseaudio.diff
-# alpha-float-const.diff
 dnd-files.diff
 hotspot-libpath.diff
 generated-headers.patch
diff --git a/debian/patches/set-exec-name.diff b/debian/patches/set-exec-name.diff
 deleted file mode 100644
index d1fc398..0000000
--- a/debian/patches/set-exec-name.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/src/jdk/src/solaris/bin/java_md.c.orig
-+++ b/src/jdk/src/solaris/bin/java_md.c
-@@ -688,8 +688,19 @@
-         char buf[PATH_MAX+1];
-         int len = readlink(self, buf, PATH_MAX);
-         if (len >= 0) {
-+	    const char* prefixes[] = {"/cow/", "/persistmnt/", "/rofs/", "/rwfs/", "/squashmnt/", NULL};
-+	    const char **prefix;
-+	    size_t prefix_len = 0;
-             buf[len] = '\0';            /* readlink doesn't nul terminate */
--            exec_path = JLI_StringDup(buf);
-+	    for (prefix = prefixes; *prefix; prefix++) {
-+	      prefix_len = strlen(buf) < strlen(*prefix) ? strlen(buf) : strlen(*prefix);
-+	      if (!strncmp(*prefix, buf, prefix_len)) {
-+		    prefix_len--;
-+		    break;
-+	      }
-+	      prefix_len = 0;
-+	    }
-+            exec_path = JLI_StringDup(buf + prefix_len);
-         }
-     }
- #else /* !__solaris__ && !__linux */
---- a/src/hotspot/src/os/posix/launcher/java_md.c.orig
-+++ b/src/hotspot/src/os/posix/launcher/java_md.c
-@@ -967,8 +967,19 @@
-         char buf[PATH_MAX+1];
-         int len = readlink(self, buf, PATH_MAX);
-         if (len >= 0) {
--            buf[len] = '\0';            /* readlink doesn't nul terminate */
--            exec_path = JLI_StringDup(buf);
-+           buf[len] = '\0';            /* readlink doesn't nul terminate */
-+           const char* prefixes[] = {"/cow/", "/persistmnt/", "/rofs/", "/rwfs/", "/squashmnt/", NULL};
-+           const char **prefix;
-+           size_t prefix_len = 0;
-+           for (prefix = prefixes; *prefix; prefix++) {
-+             prefix_len = strlen(buf) < strlen(*prefix) ? strlen(buf) : strlen(*prefix);
-+             if (!strncmp(*prefix, buf, prefix_len)) {
-+                   prefix_len--;
-+                   break;
-+             }
-+             prefix_len = 0;
-+           }
-+           exec_path = JLI_StringDup(buf + prefix_len);
-         }
-     }
- #else /* !__sun && !__linux */
diff --git a/debian/patches/stack-direction.diff b/debian/patches/stack-direction.diff
 deleted file mode 100644
index a4421ca..0000000
--- a/debian/patches/stack-direction.diff
+++ /dev/null
@@ -1,215 +0,0 @@
---- a/src/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.old	2010-01-06 16:30:02.000000000 +0100
-+++ b/src/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	2010-01-06 23:14:47.000000000 +0100
-@@ -144,8 +144,13 @@
-       address addr = (address) info->si_addr;
- 
-       // check if fault address is within thread stack
-+#ifdef __hppa__
-+      if (addr > thread->stack_base() &&
-+          addr <= thread->stack_base() + thread->stack_size()) {
-+#else
-       if (addr < thread->stack_base() &&
-           addr >= thread->stack_base() - thread->stack_size()) {
-+#endif
-         // stack overflow
-         if (thread->in_stack_yellow_zone(addr)) {
-           thread->disable_stack_yellow_zone();
-@@ -294,7 +299,11 @@
-   if (res != 0) {
-     fatal1("pthread_attr_getstack failed with errno = %d", res);
-   }
-+#ifdef __hppa__
-+  address stack_top = stack_bottom - stack_bytes;
-+#else
-   address stack_top = stack_bottom + stack_bytes;
-+#endif
- 
-   // The block of memory returned by pthread_attr_getstack() includes
-   // guard pages where present.  We need to trim these off.
-@@ -321,7 +330,11 @@
-   stack_bottom += (total_pages - guard_pages) / 2 * page_bytes;
- #endif // IA64
- 
-+#ifdef __hppa__
-+  stack_bottom -= guard_bytes;
-+#else
-   stack_bottom += guard_bytes;
-+#endif
- 
-   pthread_attr_destroy(&attr);
- 
-@@ -329,19 +342,36 @@
-   // by pthread_attr_getstack is the maximum size it could possibly
-   // be given what currently mapped.  This can be huge, so we cap it.
-   if (os::Linux::is_initial_thread()) {
-+#ifdef __hppa__
-+    stack_bytes = stack_bottom - stack_top;
-+#else
-     stack_bytes = stack_top - stack_bottom;
-+#endif
- 
-     if (stack_bytes > JavaThread::stack_size_at_create())
-       stack_bytes = JavaThread::stack_size_at_create();
- 
-+#ifdef __hppa__
-+    stack_bottom = stack_top + stack_bytes;
-+#else
-     stack_bottom = stack_top - stack_bytes;
-+#endif
-   }
- 
-+#ifdef __hppa__
-+  assert(os::current_stack_pointer() <= stack_bottom, "should do");
-+  assert(os::current_stack_pointer() > stack_top, "should do");
-+#else
-   assert(os::current_stack_pointer() >= stack_bottom, "should do");
-   assert(os::current_stack_pointer() < stack_top, "should do");
-+#endif
- 
-   *bottom = stack_bottom;
-+#ifdef __hppa__
-+  *size = stack_bottom - stack_top;
-+#else
-   *size = stack_top - stack_bottom;
-+#endif
- }
- 
- address os::current_stack_base() {
---- a/src/hotspot/src/share/vm/runtime/thread.cpp.old	2009-10-02 23:16:39.000000000 +0200
-+++ b/src/hotspot/src/share/vm/runtime/thread.cpp	2010-01-06 23:31:24.000000000 +0100
-@@ -713,8 +713,13 @@
-   else if (is_ConcurrentGC_thread())        st->print("ConcurrentGCThread");
-   else st->print("Thread");
- 
-+#ifdef __hppa__
-   st->print(" [stack: " PTR_FORMAT "," PTR_FORMAT "]",
-             _stack_base - _stack_size, _stack_base);
-+#else
-+  st->print(" [stack: " PTR_FORMAT "," PTR_FORMAT "]",
-+            _stack_base + _stack_size, _stack_base);
-+#endif
- 
-   if (osthread()) {
-     st->print(" [id=%d]", osthread()->thread_id());
-@@ -792,7 +797,11 @@
- bool Thread::is_in_stack(address adr) const {
-   assert(Thread::current() == this, "is_in_stack can only be called from current thread");
-   address end = os::current_stack_pointer();
-+#ifdef __hppa__
-+  if (stack_base() <= adr && adr <= end) return true;
-+#else
-   if (stack_base() >= adr && adr >= end) return true;
-+#endif
- 
-   return false;
- }
-@@ -804,7 +813,11 @@
- // should be revisited, and they should be removed if possible.
- 
- bool Thread::is_lock_owned(address adr) const {
-+#ifdef __hppa__
-+  return (_stack_base <= adr && adr <= (_stack_base + _stack_size));
-+#else
-   return (_stack_base >= adr && adr >= (_stack_base - _stack_size));
-+#endif
- }
- 
- bool Thread::set_as_starting_thread() {
-@@ -2108,7 +2121,11 @@
- 
- void JavaThread::create_stack_guard_pages() {
-   if (! os::uses_stack_guard_pages() || _stack_guard_state != stack_guard_unused) return;
-+#ifdef __hppa__
-+  address low_addr = stack_base();
-+#else
-   address low_addr = stack_base() - stack_size();
-+#endif
-   size_t len = (StackYellowPages + StackRedPages) * os::vm_page_size();
- 
-   int allocate = os::allocate_stack_guard_pages();
-@@ -2131,7 +2148,11 @@
- 
- void JavaThread::remove_stack_guard_pages() {
-   if (_stack_guard_state == stack_guard_unused) return;
-+#ifdef __hppa__
-+  address low_addr = stack_base();
-+#else
-   address low_addr = stack_base() - stack_size();
-+#endif
-   size_t len = (StackYellowPages + StackRedPages) * os::vm_page_size();
- 
-   if (os::allocate_stack_guard_pages()) {
-@@ -2156,10 +2177,17 @@
- 
-   // The base notation is from the stacks point of view, growing downward.
-   // We need to adjust it to work correctly with guard_memory()
-+#ifdef __hppa__
-+  address base = stack_yellow_zone_base() + stack_yellow_zone_size();
-+
-+  guarantee(base > stack_base(),"Error calculating stack yellow zone");
-+  guarantee(base > os::current_stack_pointer(),"Error calculating stack yellow zone");
-+#else
-   address base = stack_yellow_zone_base() - stack_yellow_zone_size();
- 
-   guarantee(base < stack_base(),"Error calculating stack yellow zone");
-   guarantee(base < os::current_stack_pointer(),"Error calculating stack yellow zone");
-+#endif
- 
-   if (os::guard_memory((char *) base, stack_yellow_zone_size())) {
-     _stack_guard_state = stack_guard_enabled;
-@@ -2178,7 +2206,11 @@
- 
-   // The base notation is from the stacks point of view, growing downward.
-   // We need to adjust it to work correctly with guard_memory()
-+#ifdef __hppa__
-+  address base = stack_yellow_zone_base() + stack_yellow_zone_size();
-+#else
-   address base = stack_yellow_zone_base() - stack_yellow_zone_size();
-+#endif
- 
-   if (os::unguard_memory((char *)base, stack_yellow_zone_size())) {
-     _stack_guard_state = stack_guard_yellow_disabled;
-@@ -2192,10 +2224,17 @@
-   // The base notation is from the stacks point of view, growing downward.
-   // We need to adjust it to work correctly with guard_memory()
-   assert(_stack_guard_state != stack_guard_unused, "must be using guard pages.");
-+#ifdef __hppa__
-+  address base = stack_red_zone_base() + stack_red_zone_size();
-+
-+  guarantee(base > stack_base(),"Error calculating stack red zone");
-+  guarantee(base > os::current_stack_pointer(),"Error calculating stack red zone");
-+#else
-   address base = stack_red_zone_base() - stack_red_zone_size();
- 
-   guarantee(base < stack_base(),"Error calculating stack red zone");
-   guarantee(base < os::current_stack_pointer(),"Error calculating stack red zone");
-+#endif
- 
-   if(!os::guard_memory((char *) base, stack_red_zone_size())) {
-     warning("Attempt to guard stack red zone failed.");
-@@ -2206,7 +2245,11 @@
-   // The base notation is from the stacks point of view, growing downward.
-   // We need to adjust it to work correctly with guard_memory()
-   assert(_stack_guard_state != stack_guard_unused, "must be using guard pages.");
-+#ifdef __hppa__
-+  address base = stack_red_zone_base() + stack_red_zone_size();
-+#else
-   address base = stack_red_zone_base() - stack_red_zone_size();
-+#endif
-   if (!os::unguard_memory((char *)base, stack_red_zone_size())) {
-     warning("Attempt to unguard stack red zone failed.");
-   }
-@@ -2451,8 +2494,13 @@
-   if (osthread()) {
-     st->print(", id=%d", osthread()->thread_id());
-   }
-+#ifdef __hppa__
-+  st->print(", stack(" PTR_FORMAT "," PTR_FORMAT ")",
-+            _stack_base + _stack_size, _stack_base);
-+#else
-   st->print(", stack(" PTR_FORMAT "," PTR_FORMAT ")",
-             _stack_base - _stack_size, _stack_base);
-+#endif
-   st->print("]");
-   return;
- }
diff --git a/debian/patches/system-pcsclite.diff b/debian/patches/system-pcsclite.diff
index 16788a1..09b4ad8 100644
--- a/debian/patches/system-pcsclite.diff
+++ b/debian/patches/system-pcsclite.diff
@@ -1,6 +1,6 @@
 --- a/make/autoconf/lib-bundled.m4
 +++ b/make/autoconf/lib-bundled.m4
-@@ -38,6 +38,7 @@ AC_DEFUN_ONCE([LIB_SETUP_BUNDLED_LIBS],
+@@ -38,6 +38,7 @@
    LIB_SETUP_ZLIB
    LIB_SETUP_LCMS
    LIB_SETUP_HARFBUZZ
@@ -8,7 +8,7 @@
  ])
  
  ################################################################################
-@@ -301,3 +302,41 @@ AC_DEFUN_ONCE([LIB_SETUP_HARFBUZZ],
+@@ -304,3 +305,41 @@
    AC_SUBST(HARFBUZZ_CFLAGS)
    AC_SUBST(HARFBUZZ_LIBS)
  ])
@@ -52,7 +52,7 @@
 +])
 --- a/make/autoconf/spec.gmk.in
 +++ b/make/autoconf/spec.gmk.in
-@@ -768,6 +768,7 @@ ENABLE_AOT:=@ENABLE_AOT@
+@@ -776,6 +776,7 @@
  ENABLE_INTREE_EC:=@ENABLE_INTREE_EC@
  USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
  USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
@@ -62,7 +62,7 @@
  LIBZ_LIBS:=@LIBZ_LIBS@
 --- a/make/lib/Lib-java.smartcardio.gmk
 +++ b/make/lib/Lib-java.smartcardio.gmk
-@@ -30,12 +30,12 @@ include LibCommon.gmk
+@@ -30,12 +30,12 @@
  $(eval $(call SetupJdkLibrary, BUILD_LIBJ2PCSC, \
      NAME := j2pcsc, \
      CFLAGS := $(CFLAGS_JDKLIB), \
@@ -88,7 +88,7 @@
  void *hModule;
  FPTR_SCardEstablishContext scardEstablishContext;
  FPTR_SCardConnect scardConnect;
-@@ -47,6 +48,7 @@ FPTR_SCardListReaders scardListReaders;
+@@ -47,6 +48,7 @@
  FPTR_SCardBeginTransaction scardBeginTransaction;
  FPTR_SCardEndTransaction scardEndTransaction;
  FPTR_SCardControl scardControl;
@@ -96,7 +96,7 @@
  
  /*
   * Throws a Java Exception by name
-@@ -75,7 +77,9 @@ void throwIOException(JNIEnv *env, const
+@@ -75,7 +77,9 @@
      throwByName(env, "java/io/IOException", msg);
  }
  
@@ -106,7 +106,7 @@
      void *fAddress = dlsym(hModule, functionName);
      if (fAddress == NULL) {
          char errorMessage[256];
-@@ -85,9 +89,11 @@ void *findFunction(JNIEnv *env, void *hM
+@@ -85,9 +89,11 @@
      }
      return fAddress;
  }
@@ -118,7 +118,7 @@
      const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
      if (libName == NULL) {
          throwNullPointerException(env, "PCSC library name is null");
-@@ -141,4 +147,5 @@ JNIEXPORT void JNICALL Java_sun_security
+@@ -141,4 +147,5 @@
  #else
      scardControl          = (FPTR_SCardControl)         findFunction(env, hModule, "SCardControl132");
  #endif // __APPLE__
@@ -135,7 +135,7 @@
  typedef LONG (*FPTR_SCardEstablishContext)(DWORD dwScope,
                  LPCVOID pvReserved1,
                  LPCVOID pvReserved2,
-@@ -111,3 +113,41 @@ extern FPTR_SCardListReaders scardListRe
+@@ -111,3 +113,41 @@
  extern FPTR_SCardBeginTransaction scardBeginTransaction;
  extern FPTR_SCardEndTransaction scardEndTransaction;
  extern FPTR_SCardControl scardControl;
diff --git a/debian/patches/workaround_expand_exec_shield_cs_limit.diff b/debian/patches/workaround_expand_exec_shield_cs_limit.diff
index b161e41..fc635ec 100644
--- a/debian/patches/workaround_expand_exec_shield_cs_limit.diff
+++ b/debian/patches/workaround_expand_exec_shield_cs_limit.diff
@@ -1,6 +1,6 @@
 --- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
 +++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
-@@ -863,7 +863,7 @@ void os::verify_stack_alignment() {
+@@ -874,7 +874,7 @@
   * updates (JDK-8023956).
   */
  void os::workaround_expand_exec_shield_cs_limit() {
diff --git a/debian/patches/zero-x32.diff b/debian/patches/zero-x32.diff
index ef8067c..f1cec3a 100644
--- a/debian/patches/zero-x32.diff
+++ b/debian/patches/zero-x32.diff
@@ -1,6 +1,6 @@
 --- a/src/hotspot/os/linux/os_linux.cpp
 +++ b/src/hotspot/os/linux/os_linux.cpp
-@@ -1906,7 +1906,7 @@ void * os::dll_load(const char *filename
+@@ -1909,7 +1909,7 @@
  
  #if  (defined IA32)
    static  Elf32_Half running_arch_code=EM_386;
@@ -11,7 +11,7 @@
    static  Elf32_Half running_arch_code=EM_IA_64;
 --- a/make/autoconf/platform.m4
 +++ b/make/autoconf/platform.m4
-@@ -35,6 +35,10 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU
+@@ -35,6 +35,10 @@
        VAR_CPU_ARCH=x86
        VAR_CPU_BITS=64
        VAR_CPU_ENDIAN=little
@@ -22,7 +22,7 @@
        ;;
      i?86)
        VAR_CPU=x86
-@@ -546,6 +550,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HEL
+@@ -546,6 +550,8 @@
      HOTSPOT_$1_CPU_DEFINE=IA32
    elif test "x$OPENJDK_$1_CPU" = xx86_64; then
      HOTSPOT_$1_CPU_DEFINE=AMD64
diff --git a/debian/rules b/debian/rules
index 56b8a4f..b012c83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -151,7 +151,7 @@ ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
   NJOBS = $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 
-ifneq (,$(filter $(distrel), focal jammy kinetic))
+ifneq (,$(filter $(distrel), focal jammy kinetic lunar))
   jtreg_pkg = jtreg6
 else ifneq (,$(filter $(distrel), sid bookworm bullseye))
   jtreg_pkg = jtreg
@@ -1247,7 +1247,7 @@ install: packaging-files
 
 	chmod -R u+w $(d)
 
-	: # use javaws from icedtea-netx 
+	: # use javaws from icedtea-netx
 	find $(d) -name 'javaws*' | xargs -r rm -f
 
 	: # install default jvm config file
diff --git a/debian/watch b/debian/watch
index 61a97f0..af7b83f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=4
 opts="filenamemangle=s%(?:.*?)?jdk-(\d[\d.]*\+\d[\d]*)\.tar\.gz%<project>-$1.tar.gz%, dversionmangle=s/~/+/" \
-   https://github.com/openjdk/jdk11u-dev/tags \
+   https://github.com/openjdk/jdk11u/tags \
    (?:.*?/)?jdk-(\d[\d.]*\+\d[\d]*)\.tar\.gz debian uupdate
diff --git a/doc/building.html b/doc/building.html
index a25fe0d..7d6f18c 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -195,7 +195,7 @@
 <h3 id="windows">Windows</h3>
 <p>Windows XP is not a supported platform, but all newer Windows should be able to build the JDK.</p>
 <p>On Windows, it is important that you pay attention to the instructions in the <a href="#special-considerations">Special Considerations</a>.</p>
-<p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layer is Cygwin. (Msys is no longer supported due to a too old bash; msys2 and the new Windows Subsystem for Linux (WSL) would likely be possible to support in a future version but that would require effort to implement.)</p>
+<p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layers are Cygwin and MSYS2. (MSYS is no longer supported due to an outdated bash; While OpenJDK can be built with MSYS2, support for it is still experimental, so build failures and unusual errors are not uncommon.)</p>
 <p>Internally in the build system, all paths are represented as Unix-style paths, e.g. <code>/cygdrive/c/git/jdk/Makefile</code> rather than <code>C:\git\jdk\Makefile</code>. This rule also applies to input to the build system, e.g. in arguments to <code>configure</code>. So, use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than <code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
 <h4 id="cygwin">Cygwin</h4>
 <p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment is thus required for building the JDK on Windows. If you have a 64-bit OS, we strongly recommend using the 64-bit version of Cygwin.</p>
@@ -362,6 +362,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
 <p>The minimum accepted version of Visual Studio is 2010. Older versions will not be accepted by <code>configure</code>. The maximum accepted version of Visual Studio is 2019. Versions older than 2017 are unlikely to continue working for long.</p>
 <p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2015</code>.</p>
+<p>If you have Visual Studio installed but <code>configure</code> fails to detect it, it may be because of <a href="#spaces-in-path">spaces in path</a>.</p>
 <p>If you get <code>LINK: fatal error LNK1123: failure during conversion to COFF: file invalid</code> when building using Visual Studio 2010, you have encountered <a href="http://support.microsoft.com/kb/2757355">KB2757355</a>, a bug triggered by a specific installation order. However, the solution suggested by the KB article does not always resolve the problem. See <a href="https://stackoverflow.com/questions/10888391">this stackoverflow discussion</a> for other suggestions.</p>
 <h3 id="ibm-xl-cc">IBM XL C/C++</h3>
 <p>The regular builds by SAP is using version 12.1, described as <code>IBM XL C/C++ for AIX, V12.1 (5765-J02, 5725-C72) Version: 12.01.0000.0017</code>.</p>
@@ -943,6 +944,8 @@ Clock skew detected. Your build may be incomplete.</code></pre>
 cannot create ... Permission denied
 spawn failed</code></pre>
 <p>This can be a sign of a Cygwin problem. See the information about solving problems in the <a href="#cygwin">Cygwin</a> section. Rebooting the computer might help temporarily.</p>
+<h4 id="spaces-in-path">Spaces in Path</h4>
+<p>On Windows, when configuring, <code>fixpath.sh</code> may report that some directory names have spaces. Usually, it assumes those directories have <a href="https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/fsutil-8dot3name">short paths</a>. You can run <code>fsutil file setshortname</code> in <code>cmd</code> on certain directories, such as <code>Microsoft Visual Studio</code> or <code>Windows Kits</code>, to assign arbitrary short paths so <code>configure</code> can access them.</p>
 <h3 id="getting-help">Getting Help</h3>
 <p>If none of the suggestions in this document helps you, or if you find what you believe is a bug in the build system, please contact the Build Group by sending a mail to <a href="mailto:[e-mail]">[e-mail]</a>. Please include the relevant parts of the configure and/or build log.</p>
 <p>If you need general help or advice about developing for the JDK, you can also contact the Adoption Group. See the section on <a href="#contributing-to-openjdk">Contributing to OpenJDK</a> for more information.</p>
diff --git a/doc/building.md b/doc/building.md
index d4914ad..55cd791 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -177,10 +177,9 @@ On Windows, it is important that you pay attention to the instructions in the
 
 Windows is the only non-POSIX OS supported by the JDK, and as such, requires
 some extra care. A POSIX support layer is required to build on Windows.
-Currently, the only supported such layer is Cygwin. (Msys is no longer
-supported due to a too old bash; msys2 and the new Windows Subsystem for Linux
-(WSL) would likely be possible to support in a future version but that would
-require effort to implement.)
+Currently, the only supported such layers are Cygwin and MSYS2. (MSYS is no longer
+supported due to an outdated bash; While OpenJDK can be built with MSYS2,
+support for it is still experimental, so build failures and unusual errors are not uncommon.)
 
 Internally in the build system, all paths are represented as Unix-style paths,
 e.g. `/cygdrive/c/git/jdk/Makefile` rather than `C:\git\jdk\Makefile`. This
@@ -403,6 +402,9 @@ specific installation order. However, the solution suggested by the KB article
 does not always resolve the problem. See [this stackoverflow discussion](
 https://stackoverflow.com/questions/10888391) for other suggestions.
 
+If you have Visual Studio installed but `configure` fails to detect it, it may
+be because of [spaces in path](#spaces-in-path).
+
 ### IBM XL C/C++
 
 The regular builds by SAP is using version 12.1, described as `IBM XL C/C++ for
@@ -1510,6 +1512,15 @@ This can be a sign of a Cygwin problem. See the information about solving
 problems in the [Cygwin](#cygwin) section. Rebooting the computer might help
 temporarily.
 
+#### Spaces in Path
+
+On Windows, when configuring, `fixpath.sh` may report that some directory
+names have spaces. Usually, it assumes those directories have
+[short paths](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/fsutil-8dot3name).
+You can run `fsutil file setshortname` in `cmd` on certain directories, such as
+`Microsoft Visual Studio` or `Windows Kits`, to assign arbitrary short paths so
+`configure` can access them.
+
 ### Getting Help
 
 If none of the suggestions in this document helps you, or if you find what you
diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index c2a8b8b..de068ec 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -173,6 +173,11 @@ else # not java.base
         JMOD_FLAGS += --exclude '$(notdir $(MSVCR_DLL))'
       endif
     endif
+    ifneq ($(VCRUNTIME_1_DLL), )
+      ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(VCRUNTIME_1_DLL))), )
+        JMOD_FLAGS += --exclude '$(notdir $(VCRUNTIME_1_DLL))'
+      endif
+    endif
     ifneq ($(MSVCP_DLL), )
       ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCP_DLL))), )
         JMOD_FLAGS += --exclude '$(notdir $(MSVCP_DLL))'
diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index fa55ce2..7a98cb3 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -57,7 +57,7 @@ ifeq ($(EXTERNAL_BUILDJDK), true)
   INTERIM_IMAGE_DIR := $(BUILD_JDK)
 endif
 
-$(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
+$(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST_JAR)
 	$(call MakeDir, $(LINK_OPT_DIR))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
@@ -72,7 +72,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
 # dependencies, make will correctly rebuild both jli trace and classlist
 # incrementally using the single recipe above.
 $(CLASSLIST_FILE): $(JLI_TRACE_FILE)
-$(JLI_TRACE_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
+$(JLI_TRACE_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST_JAR)
 
 TARGETS += $(CLASSLIST_FILE) $(JLI_TRACE_FILE)
 
diff --git a/make/InterimImage.gmk b/make/InterimImage.gmk
index af7ae90..bb4b1fc 100644
--- a/make/InterimImage.gmk
+++ b/make/InterimImage.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ include Modules.gmk
 ################################################################################
 
 # Use this file inside the image as target for make rule
-JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
+JIMAGE_TARGET_FILE := bin/java$(EXECUTABLE_SUFFIX)
 
 INTERIM_MODULES_LIST := $(call CommaList, $(INTERIM_IMAGE_MODULES))
 
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index f8b0a94..0c998c2 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -60,18 +60,13 @@ define SetTestOpt
   endif
 endef
 
-# Setup _NT_SYMBOL_PATH on Windows
+# Setup _NT_SYMBOL_PATH on Windows, which points to our pdb files.
 ifeq ($(OPENJDK_TARGET_OS), windows)
   ifndef _NT_SYMBOL_PATH
-    # Can't use PathList here as it adds quotes around the value.
-    _NT_SYMBOL_PATH := \
-        $(subst $(SPACE),;,$(strip \
-            $(foreach p, $(sort $(dir $(wildcard \
-                $(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb)))), \
-              $(call FixPath, $p) \
-            ) \
-        ))
-    export _NT_SYMBOL_PATH
+    SYMBOL_PATH := $(call PathList, $(sort $(patsubst %/, %, $(dir $(wildcard \
+        $(addprefix $(SYMBOLS_IMAGE_DIR)/bin/, *.pdb */*.pdb))))))
+    export _NT_SYMBOL_PATH := $(subst \\,\, $(call FixPath, \
+        $(subst $(DQUOTE),, $(SYMBOL_PATH))))
     $(info _NT_SYMBOL_PATH=$(_NT_SYMBOL_PATH))
   endif
 endif
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index 63af249..8cd4ca5 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -209,15 +209,9 @@ else ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  ifeq ($(wildcard $(TEST_IMAGE_DIR)/bin/fixpath.exe), )
-    $(info Error: fixpath is missing from test image '$(TEST_IMAGE_DIR)')
-    $(error Cannot continue.)
-  endif
-  FIXPATH := $(TEST_IMAGE_DIR)/bin/fixpath.exe -c
-  PATH_SEP:=;
+  FIXPATH := $(BASH) $(TOPDIR)/make/scripts/fixpath.sh exec
 else
   FIXPATH :=
-  PATH_SEP:=:
 endif
 
 # Check number of cores and memory in MB
@@ -301,7 +295,6 @@ $(call CreateNewSpec, $(NEW_SPEC), \
     BASH := $(BASH), \
     JIB_JAR := $(JIB_JAR), \
     FIXPATH := $(FIXPATH), \
-    PATH_SEP := $(PATH_SEP), \
     OPENJDK_TARGET_OS := $(OPENJDK_TARGET_OS), \
     OPENJDK_TARGET_OS_TYPE := $(OPENJDK_TARGET_OS_TYPE), \
     OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS_ENV), \
diff --git a/make/RunTestsPrebuiltSpec.gmk b/make/RunTestsPrebuiltSpec.gmk
index c4d08d1..eb6a91a 100644
--- a/make/RunTestsPrebuiltSpec.gmk
+++ b/make/RunTestsPrebuiltSpec.gmk
@@ -116,7 +116,6 @@ JAVAC_CMD := $(BOOT_JDK)/bin/javac
 JAR_CMD := $(BOOT_JDK)/bin/jar
 JLINK_CMD := $(JDK_OUTPUTDIR)/bin/jlink
 JMOD_CMD := $(JDK_OUTPUTDIR)/bin/jmod
-JARSIGNER_CMD := $(BOOT_JDK)/bin/jarsigner
 
 JAVA := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 JAVA_SMALL := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
@@ -125,7 +124,6 @@ JAVAC := $(FIXPATH) $(JAVAC_CMD)
 JAR := $(FIXPATH) $(JAR_CMD)
 JLINK := $(FIXPATH) $(JLINK_CMD)
 JMOD := $(FIXPATH) $(JMOD_CMD)
-JARSIGNER := $(FIXPATH) $(JARSIGNER_CMD)
 
 BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
 ################################################################################
@@ -167,7 +165,6 @@ TAIL := tail
 TEE := tee
 TR := tr
 TOUCH := touch
-UNIQ := uniq
 WC := wc
 XARGS := xargs
 ZIPEXE := zip
@@ -188,7 +185,7 @@ ifeq ($(OPENJDK_BUILD_OS), solaris)
 endif
 
 ifeq ($(OPENJDK_BUILD_OS), windows)
-  CYGPATH := cygpath
+  PATHTOOL := cygpath
 endif
 
 ################################################################################
diff --git a/make/TestImage.gmk b/make/TestImage.gmk
index 059a1d9..d5ef69f 100644
--- a/make/TestImage.gmk
+++ b/make/TestImage.gmk
@@ -30,13 +30,6 @@ include MakeBase.gmk
 
 ############################################################################
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  FIXPATH_COPY := $(TEST_IMAGE_DIR)/bin/fixpath.exe
-
-  $(FIXPATH_COPY): $(firstword $(FIXPATH))
-	$(call install-file)
-endif
-
 BUILD_INFO_PROPERTIES := $(TEST_IMAGE_DIR)/build-info.properties
 
 FIXPATH_ECHO := $(FIXPATH) $(call FixPath, $(ECHO))
@@ -44,10 +37,10 @@ FIXPATH_ECHO := $(FIXPATH) $(call FixPath, $(ECHO))
 $(BUILD_INFO_PROPERTIES):
 	$(call MakeTargetDir)
 	$(ECHO) "# Build info properties for JDK tests" > $@
-	$(FIXPATH_ECHO) "build.workspace.root=$(WORKSPACE_ROOT)" >> $@
-	$(FIXPATH_ECHO) "build.output.root=$(OUTPUTDIR)" >> $@
+	$(ECHO) "build.workspace.root=$(call FixPath, $(WORKSPACE_ROOT))" >> $@
+	$(ECHO) "build.output.root=$(call FixPath, $(OUTPUTDIR))" >> $@
 
-prepare-test-image: $(FIXPATH_COPY) $(BUILD_INFO_PROPERTIES)
+prepare-test-image: $(BUILD_INFO_PROPERTIES)
 	$(call MakeDir, $(TEST_IMAGE_DIR))
 	$(ECHO) > $(TEST_IMAGE_DIR)/Readme.txt 'JDK test image'
 
diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
 new file mode 100644
index 0000000..a3a4e13
--- /dev/null
+++ b/make/autoconf/basic.m4
@@ -0,0 +1,542 @@
+#
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+m4_include([basic_tools.m4])
+m4_include([basic_windows.m4])
+
+###############################################################################
+AC_DEFUN_ONCE([BASIC_INIT],
+[
+  # Save the original command line. This is passed to us by the wrapper configure script.
+  AC_SUBST(CONFIGURE_COMMAND_LINE)
+  # AUTOCONF might be set in the environment by the user. Preserve for "make reconfigure".
+  AC_SUBST(AUTOCONF)
+  # Save the path variable before it gets changed
+  ORIGINAL_PATH="$PATH"
+  AC_SUBST(ORIGINAL_PATH)
+  DATE_WHEN_CONFIGURED=`date`
+  AC_SUBST(DATE_WHEN_CONFIGURED)
+  AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
+])
+
+###############################################################################
+# Check that there are no unprocessed overridden variables left.
+# If so, they are an incorrect argument and we will exit with an error.
+AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
+[
+  if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then
+    # Replace the separating ! with spaces before presenting for end user.
+    unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ }
+    AC_MSG_WARN([The following variables might be unknown to configure: $unknown_variables])
+  fi
+])
+
+###############################################################################
+# Setup basic configuration paths, and platform-specific stuff related to PATHs.
+AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
+[
+  # Save the current directory this script was started from
+  CONFIGURE_START_DIR="$PWD"
+
+  # We might need to rewrite ORIGINAL_PATH, if it includes "#", to quote them
+  # for make. We couldn't do this when we retrieved ORIGINAL_PATH, since SED
+  # was not available at that time.
+  REWRITTEN_PATH=`$ECHO "$ORIGINAL_PATH" | $SED -e 's/#/\\\\#/g'`
+  if test "x$REWRITTEN_PATH" != "x$ORIGINAL_PATH"; then
+    ORIGINAL_PATH="$REWRITTEN_PATH"
+    AC_MSG_NOTICE([Rewriting ORIGINAL_PATH to $REWRITTEN_PATH])
+  fi
+
+  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+    BASIC_SETUP_PATHS_WINDOWS
+  fi
+
+  # We get the top-level directory from the supporting wrappers.
+  BASIC_WINDOWS_VERIFY_DIR($TOPDIR, source)
+  UTIL_FIXUP_PATH(TOPDIR)
+  AC_MSG_CHECKING([for top-level directory])
+  AC_MSG_RESULT([$TOPDIR])
+  AC_SUBST(TOPDIR)
+
+  if test "x$CUSTOM_ROOT" != x; then
+    BASIC_WINDOWS_VERIFY_DIR($CUSTOM_ROOT, custom root)
+    UTIL_FIXUP_PATH(CUSTOM_ROOT)
+    WORKSPACE_ROOT="${CUSTOM_ROOT}"
+  else
+    WORKSPACE_ROOT="${TOPDIR}"
+  fi
+  AC_SUBST(WORKSPACE_ROOT)
+
+  # We can only call UTIL_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
+  UTIL_FIXUP_PATH(CONFIGURE_START_DIR)
+  UTIL_FIXUP_PATH(TOPDIR)
+
+  AC_SUBST(CONFIGURE_START_DIR)
+
+  # Locate the directory of this script.
+  AUTOCONF_DIR=$TOPDIR/make/autoconf
+
+  # Setup username (for use in adhoc version strings etc)
+  # Outer [ ] to quote m4.
+  [ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
+  AC_SUBST(USERNAME)
+])
+
+###############################################################################
+# Evaluates platform specific overrides for devkit variables.
+# $1: Name of variable
+AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
+[
+  if test "x[$]$1" = x; then
+    eval $1="\${$1_${OPENJDK_TARGET_CPU}}"
+  fi
+])
+
+###############################################################################
+# Evaluates platform specific overrides for build devkit variables.
+# $1: Name of variable
+AC_DEFUN([BASIC_EVAL_BUILD_DEVKIT_VARIABLE],
+[
+  if test "x[$]$1" = x; then
+    eval $1="\${$1_${OPENJDK_BUILD_CPU}}"
+  fi
+])
+
+###############################################################################
+AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
+[
+  AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
+      [use this devkit for compilers, tools and resources])])
+
+  if test "x$with_devkit" = xyes; then
+    AC_MSG_ERROR([--with-devkit must have a value])
+  elif test "x$with_devkit" != x && test "x$with_devkit" != xno; then
+    UTIL_FIXUP_PATH([with_devkit])
+    DEVKIT_ROOT="$with_devkit"
+    # Check for a meta data info file in the root of the devkit
+    if test -f "$DEVKIT_ROOT/devkit.info"; then
+      . $DEVKIT_ROOT/devkit.info
+      # This potentially sets the following:
+      # A descriptive name of the devkit
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_NAME])
+      # Corresponds to --with-extra-path
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_EXTRA_PATH])
+      # Corresponds to --with-toolchain-path
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_TOOLCHAIN_PATH])
+      # Corresponds to --with-sysroot
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_SYSROOT])
+
+      # Identifies the Visual Studio version in the devkit
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_VERSION])
+      # The Visual Studio include environment variable
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_INCLUDE])
+      # The Visual Studio lib environment variable
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_LIB])
+      # Corresponds to --with-msvcr-dll
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCR_DLL])
+      # Corresponds to --with-vcruntime-1-dll
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VCRUNTIME_1_DLL])
+      # Corresponds to --with-msvcp-dll
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCP_DLL])
+      # Corresponds to --with-ucrt-dll-dir
+      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_UCRT_DLL_DIR])
+    fi
+
+    AC_MSG_CHECKING([for devkit])
+    if test "x$DEVKIT_NAME" != x; then
+      AC_MSG_RESULT([$DEVKIT_NAME in $DEVKIT_ROOT])
+    else
+      AC_MSG_RESULT([$DEVKIT_ROOT])
+    fi
+
+    UTIL_PREPEND_TO_PATH([EXTRA_PATH],$DEVKIT_EXTRA_PATH)
+
+    # Fallback default of just /bin if DEVKIT_PATH is not defined
+    if test "x$DEVKIT_TOOLCHAIN_PATH" = x; then
+      DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/bin"
+    fi
+    UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$DEVKIT_TOOLCHAIN_PATH)
+
+    # If DEVKIT_SYSROOT is set, use that, otherwise try a couple of known
+    # places for backwards compatiblity.
+    if test "x$DEVKIT_SYSROOT" != x; then
+      SYSROOT="$DEVKIT_SYSROOT"
+    elif test -d "$DEVKIT_ROOT/$host_alias/libc"; then
+      SYSROOT="$DEVKIT_ROOT/$host_alias/libc"
+    elif test -d "$DEVKIT_ROOT/$host/sys-root"; then
+      SYSROOT="$DEVKIT_ROOT/$host/sys-root"
+    fi
+
+    if test "x$DEVKIT_ROOT" != x; then
+      DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib"
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+        DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib64"
+      fi
+      AC_SUBST(DEVKIT_LIB_DIR)
+    fi
+  fi
+
+  # You can force the sysroot if the sysroot encoded into the compiler tools
+  # is not correct.
+  AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
+      [alias for --with-sysroot for backwards compatability])],
+      [SYSROOT=$with_sys_root]
+  )
+
+  AC_ARG_WITH(sysroot, [AS_HELP_STRING([--with-sysroot],
+      [use this directory as sysroot])],
+      [SYSROOT=$with_sysroot]
+  )
+
+  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
+      [alias for --with-toolchain-path for backwards compatibility])],
+      [UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_tools_dir)]
+  )
+
+  AC_ARG_WITH([toolchain-path], [AS_HELP_STRING([--with-toolchain-path],
+      [prepend these directories when searching for toolchain binaries (compilers etc)])],
+      [UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_toolchain_path)]
+  )
+
+  AC_ARG_WITH([extra-path], [AS_HELP_STRING([--with-extra-path],
+      [prepend these directories to the default path])],
+      [UTIL_PREPEND_TO_PATH([EXTRA_PATH],$with_extra_path)]
+  )
+
+  if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
+    # If a devkit has been supplied, find xcodebuild in the toolchain_path.
+    # If not, detect if Xcode is installed by running xcodebuild -version
+    # if no Xcode installed, xcodebuild exits with 1
+    # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
+    if test "x$DEVKIT_ROOT" != x || /usr/bin/xcodebuild -version >/dev/null 2>&1; then
+      # We need to use xcodebuild in the toolchain dir provided by the user
+      UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild, $TOOLCHAIN_PATH)
+      if test x$XCODEBUILD = x; then
+        # fall back on the stub binary in /usr/bin/xcodebuild
+        XCODEBUILD=/usr/bin/xcodebuild
+      fi
+    else
+      # this should result in SYSROOT being empty, unless --with-sysroot is provided
+      # when only the command line tools are installed there are no SDKs, so headers
+      # are copied into the system frameworks
+      XCODEBUILD=
+      AC_SUBST(XCODEBUILD)
+    fi
+
+    AC_MSG_CHECKING([for sdk name])
+    AC_ARG_WITH([sdk-name], [AS_HELP_STRING([--with-sdk-name],
+        [use the platform SDK of the given name. @<:@macosx@:>@])],
+        [SDKNAME=$with_sdk_name]
+    )
+    AC_MSG_RESULT([$SDKNAME])
+
+    # if toolchain path is specified then don't rely on system headers, they may not compile
+    HAVE_SYSTEM_FRAMEWORK_HEADERS=0
+    test -z "$TOOLCHAIN_PATH" && \
+      HAVE_SYSTEM_FRAMEWORK_HEADERS=`test ! -f /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h; echo $?`
+
+    if test -z "$SYSROOT"; then
+      if test -n "$XCODEBUILD"; then
+        # if we don't have system headers, use default SDK name (last resort)
+        if test -z "$SDKNAME" -a $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
+          SDKNAME=${SDKNAME:-macosx}
+        fi
+
+        if test -n "$SDKNAME"; then
+          # Call xcodebuild to determine SYSROOT
+          SYSROOT=`"$XCODEBUILD" -sdk $SDKNAME -version | $GREP '^Path: ' | $SED 's/Path: //'`
+        fi
+      else
+        if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
+          AC_MSG_ERROR([No xcodebuild tool and no system framework headers found, use --with-sysroot or --with-sdk-name to provide a path to a valid SDK])
+        fi
+      fi
+    else
+      # warn user if --with-sdk-name was also set
+      if test -n "$with_sdk_name"; then
+        AC_MSG_WARN([Both SYSROOT and --with-sdk-name are set, only SYSROOT will be used])
+      fi
+    fi
+
+    if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0 -a -z "$SYSROOT"; then
+      # If no system framework headers, then SYSROOT must be set, or we won't build
+      AC_MSG_ERROR([Unable to determine SYSROOT and no headers found in /System/Library/Frameworks. Check Xcode configuration, --with-sysroot or --with-sdk-name arguments.])
+    fi
+
+    # Perform a basic sanity test
+    if test ! -f "$SYSROOT/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
+      if test -z "$SYSROOT"; then
+        AC_MSG_ERROR([Unable to find required framework headers, provide a path to an SDK via --with-sysroot or --with-sdk-name and be sure Xcode is installed properly])
+      else
+        AC_MSG_ERROR([Invalid SDK or SYSROOT path, dependent framework headers not found])
+      fi
+    fi
+
+    # set SDKROOT too, Xcode tools will pick it up
+    SDKROOT="$SYSROOT"
+    AC_SUBST(SDKROOT)
+  fi
+
+  # Prepend the extra path to the global path
+  UTIL_PREPEND_TO_PATH([PATH],$EXTRA_PATH)
+
+  AC_MSG_CHECKING([for sysroot])
+  AC_MSG_RESULT([$SYSROOT])
+  AC_MSG_CHECKING([for toolchain path])
+  AC_MSG_RESULT([$TOOLCHAIN_PATH])
+  AC_SUBST(TOOLCHAIN_PATH)
+  AC_MSG_CHECKING([for extra path])
+  AC_MSG_RESULT([$EXTRA_PATH])
+])
+
+###############################################################################
+AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
+[
+
+  AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
+      [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
+      [ CONF_NAME=${with_conf_name} ])
+
+  # Test from where we are running configure, in or outside of src root.
+  AC_MSG_CHECKING([where to store configuration])
+  if test "x$CONFIGURE_START_DIR" = "x$TOPDIR" \
+      || test "x$CONFIGURE_START_DIR" = "x$CUSTOM_ROOT" \
+      || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make/autoconf" \
+      || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make" ; then
+    # We are running configure from the src root.
+    # Create a default ./build/target-variant-debuglevel output root.
+    if test "x${CONF_NAME}" = x; then
+      AC_MSG_RESULT([in default location])
+      CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${JVM_VARIANTS_WITH_AND}-${DEBUG_LEVEL}"
+    else
+      AC_MSG_RESULT([in build directory with custom name])
+    fi
+
+    OUTPUTDIR="${WORKSPACE_ROOT}/build/${CONF_NAME}"
+    $MKDIR -p "$OUTPUTDIR"
+    if test ! -d "$OUTPUTDIR"; then
+      AC_MSG_ERROR([Could not create build directory $OUTPUTDIR])
+    fi
+  else
+    # We are running configure from outside of the src dir.
+    # Then use the current directory as output dir!
+    # If configuration is situated in normal build directory, just use the build
+    # directory name as configuration name, otherwise use the complete path.
+    if test "x${CONF_NAME}" = x; then
+      CONF_NAME=`$ECHO $CONFIGURE_START_DIR | $SED -e "s!^${TOPDIR}/build/!!"`
+    fi
+    OUTPUTDIR="$CONFIGURE_START_DIR"
+    AC_MSG_RESULT([in current directory])
+
+    # WARNING: This might be a bad thing to do. You need to be sure you want to
+    # have a configuration in this directory. Do some sanity checks!
+
+    if test ! -e "$OUTPUTDIR/spec.gmk"; then
+      # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
+      # other files
+      files_present=`$LS $OUTPUTDIR`
+      # Configure has already touched config.log and confdefs.h in the current dir when this check
+      # is performed.
+      filtered_files=`$ECHO "$files_present" \
+          | $SED -e 's/config.log//g' \
+              -e 's/configure.log//g' \
+              -e 's/confdefs.h//g' \
+              -e 's/configure-support//g' \
+              -e 's/ //g' \
+          | $TR -d '\n'`
+      if test "x$filtered_files" != x; then
+        AC_MSG_NOTICE([Current directory is $CONFIGURE_START_DIR.])
+        AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
+        AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).])
+        AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could])
+        AC_MSG_NOTICE([seriously mess up just about everything.])
+        AC_MSG_NOTICE([Try 'cd $TOPDIR' and restart configure])
+        AC_MSG_NOTICE([(or create a new empty directory and cd to it).])
+        AC_MSG_ERROR([Will not continue creating configuration in $CONFIGURE_START_DIR])
+      fi
+    fi
+  fi
+  AC_MSG_CHECKING([what configuration name to use])
+  AC_MSG_RESULT([$CONF_NAME])
+
+  BASIC_WINDOWS_VERIFY_DIR($OUTPUTDIR, output)
+  UTIL_FIXUP_PATH(OUTPUTDIR)
+
+  CONFIGURESUPPORT_OUTPUTDIR="$OUTPUTDIR/configure-support"
+  $MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR"
+
+  SPEC="$OUTPUTDIR/spec.gmk"
+  AC_SUBST(SPEC)
+  AC_SUBST(CONF_NAME)
+  AC_SUBST(OUTPUTDIR)
+  AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR)
+
+  # The spec.gmk file contains all variables for the make system.
+  AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
+  # The bootcycle-spec.gmk file contains support for boot cycle builds.
+  AC_CONFIG_FILES([$OUTPUTDIR/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in])
+  # The buildjdk-spec.gmk file contains support for building a buildjdk when cross compiling.
+  AC_CONFIG_FILES([$OUTPUTDIR/buildjdk-spec.gmk:$AUTOCONF_DIR/buildjdk-spec.gmk.in])
+  # The compare.sh is used to compare the build output to other builds.
+  AC_CONFIG_FILES([$OUTPUTDIR/compare.sh:$AUTOCONF_DIR/compare.sh.in])
+  # The generated Makefile knows where the spec.gmk is and where the source is.
+  # You can run make from the OUTPUTDIR, or from the top-level Makefile
+  # which will look for generated configurations
+  AC_CONFIG_FILES([$OUTPUTDIR/Makefile:$AUTOCONF_DIR/Makefile.in])
+])
+
+###############################################################################
+# Check if build directory is on local disk. If not possible to determine,
+# we prefer to claim it's local.
+# Argument 1: directory to test
+# Argument 2: what to do if it is on local disk
+# Argument 3: what to do otherwise (remote disk or failure)
+AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
+[
+  # df -l lists only local disks; if the given directory is not found then
+  # a non-zero exit code is given
+  if test "x$DF" = x; then
+    # No df here, say it's local
+    $2
+  else
+    # JDK-8189619
+    # df on AIX does not understand -l. On modern AIXes it understands "-T local" which
+    # is the same. On older AIXes we just continue to live with a "not local build" warning.
+    if test "x$OPENJDK_TARGET_OS" = xaix; then
+      DF_LOCAL_ONLY_OPTION='-T local'
+    else
+      DF_LOCAL_ONLY_OPTION='-l'
+    fi
+    if $DF $DF_LOCAL_ONLY_OPTION $1 > /dev/null 2>&1; then
+      $2
+    else
+      # In WSL, local Windows drives are considered remote by df, but we are
+      # required to build into a directory accessible from windows, so consider
+      # them local here.
+      $3
+    fi
+  fi
+])
+
+###############################################################################
+# Check that source files have basic read permissions set. This might
+# not be the case in cygwin in certain conditions.
+AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
+[
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+    file_to_test="$TOPDIR/LICENSE"
+    if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
+      AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
+    fi
+  fi
+])
+
+###############################################################################
+AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
+[
+  AC_MSG_CHECKING([if build directory is on local disk])
+  BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUTDIR,
+      [OUTPUT_DIR_IS_LOCAL="yes"],
+      [OUTPUT_DIR_IS_LOCAL="no"])
+  AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL)
+
+  BASIC_CHECK_SRC_PERMS
+
+  # Check if the user has any old-style ALT_ variables set.
+  FOUND_ALT_VARIABLES=`env | grep ^ALT_`
+
+  # Before generating output files, test if they exist. If they do, this is a reconfigure.
+  # Since we can't properly handle the dependencies for this, warn the user about the situation
+  if test -e $OUTPUTDIR/spec.gmk; then
+    IS_RECONFIGURE=yes
+  else
+    IS_RECONFIGURE=no
+  fi
+])
+
+################################################################################
+#
+# Default make target
+#
+AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_MAKE_TARGET],
+[
+  AC_ARG_WITH(default-make-target, [AS_HELP_STRING([--with-default-make-target],
+      [set the default make target @<:@exploded-image@:>@])])
+  if test "x$with_default_make_target" = "x" \
+      || test "x$with_default_make_target" = "xyes"; then
+    DEFAULT_MAKE_TARGET="exploded-image"
+  elif test "x$with_default_make_target" = "xno"; then
+    AC_MSG_ERROR([--without-default-make-target is not a valid option])
+  else
+    DEFAULT_MAKE_TARGET="$with_default_make_target"
+  fi
+
+  AC_SUBST(DEFAULT_MAKE_TARGET)
+])
+
+###############################################################################
+# Setup the default value for LOG=
+#
+AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_LOG],
+[
+  AC_ARG_WITH(log, [AS_HELP_STRING([--with-log],
+      [[default vaue for make LOG argument [warn]]])])
+  AC_MSG_CHECKING([for default LOG value])
+  if test "x$with_log" = x; then
+    DEFAULT_LOG=""
+  else
+    # Syntax for valid LOG options is a bit too complex for it to be worth
+    # implementing a test for correctness in configure. Just accept it.
+    DEFAULT_LOG=$with_log
+  fi
+  AC_MSG_RESULT([$DEFAULT_LOG])
+  AC_SUBST(DEFAULT_LOG)
+])
+
+###############################################################################
+# Code to run after AC_OUTPUT
+AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
+[
+  # Try to move config.log (generated by autoconf) to the configure-support directory.
+  if test -e ./config.log; then
+    $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null
+  fi
+
+  # Rotate our log file (configure.log)
+  if test -e "$OUTPUTDIR/configure.log.old"; then
+    $RM -f "$OUTPUTDIR/configure.log.old"
+  fi
+  if test -e "$OUTPUTDIR/configure.log"; then
+    $MV -f "$OUTPUTDIR/configure.log" "$OUTPUTDIR/configure.log.old" 2> /dev/null
+  fi
+
+  # Move configure.log from current directory to the build output root
+  if test -e ./configure.log; then
+    $MV -f ./configure.log "$OUTPUTDIR/configure.log" 2> /dev/null
+  fi
+
+  # Make the compare script executable
+  $CHMOD +x $OUTPUTDIR/compare.sh
+])
diff --git a/make/autoconf/basic_tools.m4 b/make/autoconf/basic_tools.m4
 new file mode 100644
index 0000000..c39b87d
--- /dev/null
+++ b/make/autoconf/basic_tools.m4
@@ -0,0 +1,480 @@
+#
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+###############################################################################
+# Setup the most fundamental tools that relies on not much else to set up,
+# but is used by much of the early bootstrap code.
+AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
+[
+  # Bootstrapping: These tools are needed by UTIL_LOOKUP_PROGS
+  AC_PATH_PROGS(BASENAME, basename)
+  UTIL_CHECK_NONEMPTY(BASENAME)
+  AC_PATH_PROGS(DIRNAME, dirname)
+  UTIL_CHECK_NONEMPTY(DIRNAME)
+  AC_PATH_PROGS(FILE, file)
+  UTIL_CHECK_NONEMPTY(FILE)
+  AC_PATH_PROGS(LDD, ldd)
+
+  # First are all the fundamental required tools.
+  UTIL_REQUIRE_PROGS(BASH, bash)
+  UTIL_REQUIRE_PROGS(CAT, cat)
+  UTIL_REQUIRE_PROGS(CHMOD, chmod)
+  UTIL_REQUIRE_PROGS(CP, cp)
+  UTIL_REQUIRE_PROGS(CUT, cut)
+  UTIL_REQUIRE_PROGS(DATE, date)
+  UTIL_REQUIRE_PROGS(DIFF, gdiff diff)
+  UTIL_REQUIRE_PROGS(ECHO, echo)
+  UTIL_REQUIRE_PROGS(EXPR, expr)
+  UTIL_REQUIRE_PROGS(FIND, find)
+  UTIL_REQUIRE_PROGS(GUNZIP, gunzip)
+  UTIL_REQUIRE_PROGS(GZIP, pigz gzip)
+  UTIL_REQUIRE_PROGS(HEAD, head)
+  UTIL_REQUIRE_PROGS(LN, ln)
+  UTIL_REQUIRE_PROGS(LS, ls)
+  # gmkdir is known to be safe for concurrent invocations with -p flag.
+  UTIL_REQUIRE_PROGS(MKDIR, gmkdir mkdir)
+  UTIL_REQUIRE_PROGS(MKTEMP, mktemp)
+  UTIL_REQUIRE_PROGS(MV, mv)
+  UTIL_REQUIRE_PROGS(NAWK, nawk gawk awk)
+  UTIL_REQUIRE_PROGS(PRINTF, printf)
+  UTIL_REQUIRE_PROGS(RM, rm)
+  UTIL_REQUIRE_PROGS(RMDIR, rmdir)
+  UTIL_REQUIRE_PROGS(SH, sh)
+  UTIL_REQUIRE_PROGS(SORT, sort)
+  UTIL_REQUIRE_PROGS(TAIL, tail)
+  UTIL_REQUIRE_PROGS(TAR, gtar tar)
+  UTIL_REQUIRE_PROGS(TEE, tee)
+  UTIL_REQUIRE_PROGS(TOUCH, touch)
+  UTIL_REQUIRE_PROGS(TR, tr)
+  UTIL_REQUIRE_PROGS(UNAME, uname)
+  UTIL_REQUIRE_PROGS(WC, wc)
+  UTIL_REQUIRE_PROGS(WHICH, which)
+  UTIL_REQUIRE_PROGS(XARGS, xargs)
+
+  # Then required tools that require some special treatment.
+  UTIL_REQUIRE_SPECIAL(AWK, [AC_PROG_AWK])
+  UTIL_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
+  UTIL_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
+  UTIL_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])
+  UTIL_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
+
+  # Optional tools, we can do without them
+  UTIL_LOOKUP_PROGS(DF, df)
+  UTIL_LOOKUP_PROGS(NICE, nice)
+  UTIL_LOOKUP_PROGS(READLINK, greadlink readlink)
+
+  # These are only needed on some platforms
+  UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
+  UTIL_LOOKUP_PROGS(LSB_RELEASE, lsb_release)
+  UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
+
+  # For compare.sh only
+  UTIL_LOOKUP_PROGS(CMP, cmp)
+  UTIL_LOOKUP_PROGS(UNIQ, uniq)
+
+  # Always force rm.
+  RM="$RM -f"
+])
+
+###############################################################################
+# Check if we have found a usable version of make
+# $1: the path to a potential make binary (or empty)
+# $2: the description on how we found this
+AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
+[
+  MAKE_CANDIDATE="$1"
+  DESCRIPTION="$2"
+
+  # On Cygwin, we require a newer version of make than on other platforms
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+    MAKE_VERSION_EXPR="-e 4\."
+    MAKE_REQUIRED_VERSION="4.0"
+   else
+    MAKE_VERSION_EXPR="-e 3\.8[[12]] -e 4\."
+    MAKE_REQUIRED_VERSION="3.81"
+  fi
+
+  if test "x$MAKE_CANDIDATE" != x; then
+    AC_MSG_NOTICE([Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION])
+    MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
+    IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
+    if test "x$IS_GNU_MAKE" = x; then
+      AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
+    else
+      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP $MAKE_VERSION_EXPR`
+      if test "x$IS_MODERN_MAKE" = x; then
+        AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version $MAKE_REQUIRED_VERSION or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
+      else
+        if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+          if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+            MAKE_EXPECTED_ENV='cygwin'
+          elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys2"; then
+            MAKE_EXPECTED_ENV='msys'
+          else
+            AC_MSG_ERROR([Unknown Windows environment])
+          fi
+          MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
+          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
+        else
+          # Not relevant for non-Windows
+          IS_MAKE_CORRECT_ENV=true
+        fi
+        if test "x$IS_MAKE_CORRECT_ENV" = x; then
+          AC_MSG_NOTICE([Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring.])
+        else
+          FOUND_MAKE=$MAKE_CANDIDATE
+          UTIL_FIXUP_EXECUTABLE(FOUND_MAKE)
+        fi
+      fi
+    fi
+  fi
+])
+
+###############################################################################
+AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
+[
+  # Check if make supports the output sync option and if so, setup using it.
+  AC_MSG_CHECKING([if make --output-sync is supported])
+  if $MAKE --version -O > /dev/null 2>&1; then
+    OUTPUT_SYNC_SUPPORTED=true
+    AC_MSG_RESULT([yes])
+    AC_MSG_CHECKING([for output-sync value])
+    AC_ARG_WITH([output-sync], [AS_HELP_STRING([--with-output-sync],
+      [set make output sync type if supported by make. @<:@recurse@:>@])],
+      [OUTPUT_SYNC=$with_output_sync])
+    if test "x$OUTPUT_SYNC" = "x"; then
+      OUTPUT_SYNC=none
+    fi
+    AC_MSG_RESULT([$OUTPUT_SYNC])
+    if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then
+      AC_MSG_ERROR([Make did not the support the value $OUTPUT_SYNC as output sync type.])
+    fi
+  else
+    OUTPUT_SYNC_SUPPORTED=false
+    AC_MSG_RESULT([no])
+  fi
+  AC_SUBST(OUTPUT_SYNC_SUPPORTED)
+  AC_SUBST(OUTPUT_SYNC)
+])
+
+###############################################################################
+# Goes looking for a usable version of GNU make.
+AC_DEFUN([BASIC_CHECK_GNU_MAKE],
+[
+  UTIL_SETUP_TOOL(MAKE,
+  [
+    # Try our hardest to locate a correct version of GNU make
+    UTIL_LOOKUP_PROGS(CHECK_GMAKE, gmake)
+    BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH])
+
+    if test "x$FOUND_MAKE" = x; then
+      UTIL_LOOKUP_PROGS(CHECK_MAKE, make)
+      BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [make in PATH])
+    fi
+
+    if test "x$FOUND_MAKE" = x; then
+      if test "x$TOOLCHAIN_PATH" != x; then
+        # We have a toolchain path, check that as well before giving up.
+        OLD_PATH=$PATH
+        PATH=$TOOLCHAIN_PATH:$PATH
+        UTIL_LOOKUP_PROGS(CHECK_TOOLSDIR_GMAKE, gmake)
+        BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_GMAKE", [gmake in tools-dir])
+        if test "x$FOUND_MAKE" = x; then
+          UTIL_LOOKUP_PROGS(CHECK_TOOLSDIR_MAKE, make)
+          BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_MAKE", [make in tools-dir])
+        fi
+        PATH=$OLD_PATH
+      fi
+    fi
+
+    if test "x$FOUND_MAKE" = x; then
+      AC_MSG_ERROR([Cannot find GNU make $MAKE_REQUIRED_VERSION or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure.])
+    fi
+  ],[
+    # If MAKE was set by user, verify the version
+    BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE])
+    if test "x$FOUND_MAKE" = x; then
+      AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make $MAKE_REQUIRED_VERSION or newer.])
+    fi
+  ])
+
+  MAKE=$FOUND_MAKE
+  AC_SUBST(MAKE)
+  AC_MSG_NOTICE([Using GNU make at $FOUND_MAKE (version: $MAKE_VERSION_STRING)])
+
+  BASIC_CHECK_MAKE_OUTPUT_SYNC
+])
+
+###############################################################################
+AC_DEFUN([BASIC_CHECK_FIND_DELETE],
+[
+  # Test if find supports -delete
+  AC_MSG_CHECKING([if find supports -delete])
+  FIND_DELETE="-delete"
+
+  DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
+
+  echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
+
+  TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
+  if test -f $DELETEDIR/TestIfFindSupportsDelete; then
+    # No, it does not.
+    $RM $DELETEDIR/TestIfFindSupportsDelete
+    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
+      # AIX 'find' is buggy if called with '-exec {} \+' and an empty file list
+      FIND_DELETE="-print | $XARGS $RM"
+    else
+      FIND_DELETE="-exec $RM \{\} \+"
+    fi
+    AC_MSG_RESULT([no])
+  else
+    AC_MSG_RESULT([yes])
+  fi
+  $RMDIR $DELETEDIR
+  AC_SUBST(FIND_DELETE)
+])
+
+###############################################################################
+AC_DEFUN([BASIC_CHECK_TAR],
+[
+  # Test which kind of tar was found
+  if test "x$($TAR --version | $GREP "GNU tar")" != "x"; then
+    TAR_TYPE="gnu"
+  elif test "x$($TAR --version | $GREP "bsdtar")" != "x"; then
+    TAR_TYPE="bsd"
+  elif test "x$($TAR -v | $GREP "bsdtar")" != "x"; then
+    TAR_TYPE="bsd"
+  elif test "x$($TAR --version | $GREP "busybox")" != "x"; then
+    TAR_TYPE="busybox"
+  elif test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
+    TAR_TYPE="solaris"
+  elif test "x$OPENJDK_BUILD_OS" = "xaix"; then
+    TAR_TYPE="aix"
+  fi
+  AC_MSG_CHECKING([what type of tar was found])
+  AC_MSG_RESULT([$TAR_TYPE])
+
+  TAR_CREATE_FILE_PARAM=""
+
+  if test "x$TAR_TYPE" = "xgnu"; then
+    TAR_INCLUDE_PARAM="T"
+    TAR_SUPPORTS_TRANSFORM="true"
+    if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+      # When using gnu tar for Solaris targets, need to use compatibility mode
+      TAR_CREATE_EXTRA_PARAM="--format=ustar"
+    fi
+  elif test "x$TAR_TYPE" = "aix"; then
+    # -L InputList of aix tar: name of file listing the files and directories
+    # that need to be archived or extracted
+    TAR_INCLUDE_PARAM="L"
+    TAR_SUPPORTS_TRANSFORM="false"
+  elif test "x$TAR_TYPE" = "xbusybox"; then
+    TAR_INCLUDE_PARAM="T"
+    TAR_SUPPORTS_TRANSFORM="false"
+  else
+    TAR_INCLUDE_PARAM="I"
+    TAR_SUPPORTS_TRANSFORM="false"
+  fi
+  AC_SUBST(TAR_TYPE)
+  AC_SUBST(TAR_CREATE_EXTRA_PARAM)
+  AC_SUBST(TAR_INCLUDE_PARAM)
+  AC_SUBST(TAR_SUPPORTS_TRANSFORM)
+])
+
+###############################################################################
+AC_DEFUN([BASIC_CHECK_GREP],
+[
+  # Test that grep supports -Fx with a list of pattern which includes null pattern.
+  # This is a problem for the grep resident on AIX.
+  AC_MSG_CHECKING([that grep ($GREP) -Fx handles empty lines in the pattern list correctly])
+  # Multiple subsequent spaces..
+  STACK_SPACES='aaa   bbb   ccc'
+  # ..converted to subsequent newlines, causes STACK_LIST to be a list with some empty
+  # patterns in it.
+  STACK_LIST=${STACK_SPACES// /$'\n'}
+  NEEDLE_SPACES='ccc bbb aaa'
+  NEEDLE_LIST=${NEEDLE_SPACES// /$'\n'}
+  RESULT="$($GREP -Fvx "$STACK_LIST" <<< "$NEEDLE_LIST")"
+  if test "x$RESULT" == "x"; then
+    AC_MSG_RESULT([yes])
+  else
+    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
+      ADDINFO="Please make sure you use GNU grep, usually found at /opt/freeware/bin."
+    fi
+    AC_MSG_ERROR([grep does not handle -Fx correctly. ${ADDINFO}])
+  fi
+])
+
+###############################################################################
+AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
+[
+  BASIC_CHECK_GNU_MAKE
+
+  BASIC_CHECK_FIND_DELETE
+  BASIC_CHECK_TAR
+  BASIC_CHECK_GREP
+  BASIC_SETUP_PANDOC
+
+  # These tools might not be installed by default,
+  # need hint on how to install them.
+  UTIL_REQUIRE_PROGS(UNZIP, unzip)
+  # Since zip uses "ZIP" as a environment variable for passing options, we need
+  # to name our variable differently, hence ZIPEXE.
+  UTIL_REQUIRE_PROGS(ZIPEXE, zip)
+
+  # Non-required basic tools
+
+  UTIL_LOOKUP_PROGS(READELF, greadelf readelf)
+  UTIL_LOOKUP_PROGS(DOT, dot)
+  UTIL_LOOKUP_PROGS(HG, hg)
+  UTIL_LOOKUP_PROGS(GIT, git)
+  UTIL_LOOKUP_PROGS(STAT, stat)
+  UTIL_LOOKUP_PROGS(TIME, time)
+  UTIL_LOOKUP_PROGS(FLOCK, flock)
+  # Dtrace is usually found in /usr/sbin on Solaris, but that directory may not
+  # be in the user path.
+  UTIL_LOOKUP_PROGS(DTRACE, dtrace, $PATH:/usr/sbin)
+  UTIL_LOOKUP_PROGS(PATCH, gpatch patch)
+  # Check if it's GNU time
+  IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
+  if test "x$IS_GNU_TIME" != x; then
+    IS_GNU_TIME=yes
+  else
+    IS_GNU_TIME=no
+  fi
+  AC_SUBST(IS_GNU_TIME)
+
+  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+    UTIL_REQUIRE_PROGS(DSYMUTIL, dsymutil)
+    UTIL_REQUIRE_PROGS(MIG, mig)
+    UTIL_REQUIRE_PROGS(XATTR, xattr)
+    UTIL_LOOKUP_PROGS(CODESIGN, codesign)
+
+    if test "x$CODESIGN" != "x"; then
+      # Check for user provided code signing identity.
+      # If no identity was provided, fall back to "openjdk_codesign".
+      AC_ARG_WITH([macosx-codesign-identity], [AS_HELP_STRING([--with-macosx-codesign-identity],
+        [specify the code signing identity])],
+        [MACOSX_CODESIGN_IDENTITY=$with_macosx_codesign_identity],
+        [MACOSX_CODESIGN_IDENTITY=openjdk_codesign]
+      )
+
+      AC_SUBST(MACOSX_CODESIGN_IDENTITY)
+
+      # Verify that the codesign certificate is present
+      AC_MSG_CHECKING([if codesign certificate is present])
+      $RM codesign-testfile
+      $TOUCH codesign-testfile
+      $CODESIGN -s "$MACOSX_CODESIGN_IDENTITY" codesign-testfile 2>&AS_MESSAGE_LOG_FD \
+          >&AS_MESSAGE_LOG_FD || CODESIGN=
+      $RM codesign-testfile
+      if test "x$CODESIGN" = x; then
+        AC_MSG_RESULT([no])
+      else
+        AC_MSG_RESULT([yes])
+        # Verify that the codesign has --option runtime
+        AC_MSG_CHECKING([if codesign has --option runtime])
+        $RM codesign-testfile
+        $TOUCH codesign-testfile
+        $CODESIGN --option runtime -s "$MACOSX_CODESIGN_IDENTITY" codesign-testfile \
+            2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
+        $RM codesign-testfile
+        if test "x$CODESIGN" = x; then
+          AC_MSG_ERROR([codesign does not have --option runtime. macOS 10.13.6 and above is required.])
+        else
+          AC_MSG_RESULT([yes])
+        fi
+      fi
+    fi
+    UTIL_REQUIRE_PROGS(SETFILE, SetFile)
+  elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+    UTIL_REQUIRE_PROGS(ELFEDIT, elfedit)
+  fi
+  if ! test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+    UTIL_REQUIRE_PROGS(ULIMIT, ulimit)
+  fi
+])
+
+###############################################################################
+# Check for support for specific options in bash
+AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS],
+[
+  # Check bash version
+  # Extra [ ] to stop m4 mangling
+  [ BASH_VER=`$BASH --version | $SED -n  -e 's/^.*bash.*ersion *\([0-9.]*\).*$/\1/ p'` ]
+  AC_MSG_CHECKING([bash version])
+  AC_MSG_RESULT([$BASH_VER])
+
+  BASH_MAJOR=`$ECHO $BASH_VER | $CUT -d . -f 1`
+  BASH_MINOR=`$ECHO $BASH_VER | $CUT -d . -f 2`
+  if test $BASH_MAJOR -lt 3 || (test $BASH_MAJOR -eq 3 && test $BASH_MINOR -lt 2); then
+    AC_MSG_ERROR([bash version 3.2 or better is required])
+  fi
+
+  # Test if bash supports pipefail.
+  AC_MSG_CHECKING([if bash supports pipefail])
+  if ${BASH} -c 'set -o pipefail'; then
+    BASH_ARGS="$BASH_ARGS -o pipefail"
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
+
+  AC_MSG_CHECKING([if bash supports errexit (-e)])
+  if ${BASH} -e -c 'true'; then
+    BASH_ARGS="$BASH_ARGS -e"
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
+
+  AC_SUBST(BASH_ARGS)
+])
+
+################################################################################
+#
+# Setup Pandoc
+#
+AC_DEFUN_ONCE([BASIC_SETUP_PANDOC],
+[
+  UTIL_LOOKUP_PROGS(PANDOC, pandoc)
+  PANDOC_MARKDOWN_FLAG="markdown"
+  if test -n "$PANDOC"; then
+    AC_MSG_CHECKING(if the pandoc smart extension needs to be disabled for markdown)
+    if $PANDOC --list-extensions | $GREP -q '\+smart'; then
+      AC_MSG_RESULT([yes])
+      PANDOC_MARKDOWN_FLAG="markdown-smart"
+    else
+      AC_MSG_RESULT([no])
+    fi
+  fi
+  if test -n "$PANDOC"; then
+    ENABLE_PANDOC="true"
+  else
+    ENABLE_PANDOC="false"
+  fi
+  AC_SUBST(ENABLE_PANDOC)
+  AC_SUBST(PANDOC_MARKDOWN_FLAG)
+])
diff --git a/make/autoconf/basic_windows.m4 b/make/autoconf/basic_windows.m4
 new file mode 100644
index 0000000..dc19b63
--- /dev/null
+++ b/make/autoconf/basic_windows.m4
@@ -0,0 +1,187 @@
+#
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Setup basic configuration paths, and platform-specific stuff related to PATHs.
+AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
+[
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys2"; then
+    # Must be done prior to calling any commands to avoid mangling of command line
+    export MSYS2_ARG_CONV_EXCL="*"
+  fi
+
+  AC_MSG_CHECKING([Windows environment type])
+  WINENV_VENDOR=${OPENJDK_BUILD_OS_ENV#windows.}
+  AC_MSG_RESULT([$WINENV_VENDOR])
+
+  if test "x$WINENV_VENDOR" = x; then
+    AC_MSG_ERROR([Unknown Windows environment. Neither cygwin nor msys2 was detected.])
+  fi
+
+  if test "x$PATHTOOL" = x; then
+    AC_MSG_ERROR([Incorrect $WINENV_VENDOR installation. cygpath was found])
+  fi
+
+  if test "x$CMD" = x; then
+    AC_MSG_ERROR([Incorrect Windows/$WINENV_VENDOR setup. Could not locate cmd.exe])
+  fi
+
+  AC_MSG_CHECKING([$WINENV_VENDOR drive prefix])
+  WINENV_PREFIX=`$PATHTOOL -u c:/ | $SED -e 's!/c/!!'`
+  AC_MSG_RESULT(['$WINENV_PREFIX'])
+  AC_SUBST(WINENV_PREFIX)
+
+  AC_MSG_CHECKING([$WINENV_VENDOR root directory as Windows path])
+  if test "x$OPENJDK_BUILD_OS_ENV" != "xwindows.wsl1"; then
+    WINENV_ROOT=`$PATHTOOL -w / 2> /dev/null`
+    # msys2 has a trailing backslash; strip it
+    WINENV_ROOT=${WINENV_ROOT%\\}
+  else
+    WINENV_ROOT='[[unavailable]]'
+  fi
+  AC_MSG_RESULT(['$WINENV_ROOT'])
+  AC_SUBST(WINENV_ROOT)
+
+  AC_MSG_CHECKING([$WINENV_VENDOR temp directory])
+  WINENV_TEMP_DIR=$($PATHTOOL -u $($CMD /q /c echo %TEMP% 2> /dev/null) | $TR -d '\r\n')
+  AC_MSG_RESULT([$WINENV_TEMP_DIR])
+
+  AC_MSG_CHECKING([$WINENV_VENDOR release])
+  WINENV_UNAME_RELEASE=`$UNAME -r`
+  AC_MSG_RESULT([$WINENV_UNAME_RELEASE])
+
+  AC_MSG_CHECKING([$WINENV_VENDOR version])
+  WINENV_UNAME_VERSION=`$UNAME -v`
+  AC_MSG_RESULT([$WINENV_UNAME_VERSION])
+
+  WINENV_VERSION="$WINENV_UNAME_RELEASE, $WINENV_UNAME_VERSION"
+
+  AC_MSG_CHECKING([Windows version])
+
+  # We must change directory to one guaranteed to work, otherwise WSL1
+  # can complain (since it does not have a WINENV_ROOT so it can't access
+  # unix-style paths from Windows.
+  # Additional [] needed to keep m4 from mangling shell constructs.
+  [ WINDOWS_VERSION=`cd $WINENV_TEMP_DIR && $CMD /c ver | $EGREP -o '([0-9]+\.)+[0-9]+'` ]
+  AC_MSG_RESULT([$WINDOWS_VERSION])
+
+  # Additional handling per specific env
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+    # Additional [] needed to keep m4 from mangling shell constructs.
+    [ CYGWIN_VERSION_OLD=`$ECHO $WINENV_UNAME_RELEASE | $GREP -e '^1\.[0-6]'` ]
+    if test "x$CYGWIN_VERSION_OLD" != x; then
+      AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.])
+      AC_MSG_ERROR([Cannot continue])
+    fi
+    if test "x$LDD" = x; then
+      AC_MSG_ERROR([ldd is missing, which is needed on cygwin])
+    fi
+    WINENV_MARKER_DLL=cygwin1.dll
+  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys2"; then
+    if test "x$LDD" = x; then
+      AC_MSG_ERROR([ldd is missing, which is needed on msys2])
+    fi
+    WINENV_MARKER_DLL=msys-2.0.dll
+  fi
+
+  # Chicken and egg: FIXPATH is needed for UTIL_FIXUP_PATH to work. So for the
+  # first run we use the auto-detect abilities of fixpath.sh.
+  FIXPATH_DIR="$TOPDIR/make/scripts"
+  FIXPATH="$BASH $FIXPATH_DIR/fixpath.sh exec"
+  FIXPATH_BASE="$BASH $FIXPATH_DIR/fixpath.sh"
+  FIXPATH_SAVED_PATH="$PATH"
+  UTIL_FIXUP_PATH(FIXPATH_DIR)
+
+  # Now we can use FIXPATH_DIR to rewrite path to fixpath.sh properly.
+  if test "x$WINENV_PREFIX" = x; then
+    # On msys the prefix is empty, but we need to pass something to have the
+    # fixpath.sh options parser happy.
+    WINENV_PREFIX_ARG="NONE"
+  else
+    WINENV_PREFIX_ARG="$WINENV_PREFIX"
+  fi
+  FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR -c $CMD -q"
+  FIXPATH_BASE="$BASH $FIXPATH_DIR/fixpath.sh $FIXPATH_ARGS"
+  FIXPATH="$FIXPATH_BASE exec"
+
+  AC_SUBST(FIXPATH_BASE)
+  AC_SUBST(FIXPATH)
+
+  SRC_ROOT_LENGTH=`$ECHO "$TOPDIR" | $WC -m`
+  if test $SRC_ROOT_LENGTH -gt 100; then
+    AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported])
+  fi
+
+  # Test if windows or unix "find" is first in path.
+  AC_MSG_CHECKING([what kind of 'find' is first on the PATH])
+  FIND_BINARY_OUTPUT=`find --version 2>&1`
+  if test "x`echo $FIND_BINARY_OUTPUT | $GREP GNU`" != x; then
+    AC_MSG_RESULT([unix style])
+  elif test "x`echo $FIND_BINARY_OUTPUT | $GREP FIND`" != x; then
+    AC_MSG_RESULT([Windows])
+    AC_MSG_NOTICE([Your path contains Windows tools (C:\Windows\system32) before your unix tools.])
+    AC_MSG_NOTICE([This will not work. Please correct and make sure /usr/bin (or similar) is first in path.])
+    AC_MSG_ERROR([Cannot continue])
+  else
+    AC_MSG_RESULT([unknown])
+    AC_MSG_WARN([It seems that your find utility is non-standard.])
+  fi
+])
+
+# Verify that the directory is usable on Windows
+AC_DEFUN([BASIC_WINDOWS_VERIFY_DIR],
+[
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1"; then
+    OUTPUTDIR_WIN=`$FIXPATH_BASE print $1`
+    if test "x$OUTPUTDIR_WIN" = x; then
+      AC_MSG_NOTICE([For wsl1, the $2 dir must be located on a Windows drive. Please see doc/building.md for details.])
+      AC_MSG_ERROR([Cannot continue])
+    fi
+  fi
+])
+
+# Create fixpath wrapper
+AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
+[
+  if test "x$OPENJDK_BUILD_OS" = xwindows; then
+    FIXPATH_CMDLINE=". $TOPDIR/make/scripts/fixpath.sh -e $PATHTOOL \
+        -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR \
+        -c $CMD -q"
+    $ECHO >  $OUTPUTDIR/fixpath '#!/bin/bash'
+    $ECHO >> $OUTPUTDIR/fixpath export PATH='"[$]PATH:'$PATH'"'
+    $ECHO >> $OUTPUTDIR/fixpath $FIXPATH_CMDLINE '"[$]@"'
+    $CHMOD +x $OUTPUTDIR/fixpath
+    FIXPATH_BASE="$OUTPUTDIR/fixpath"
+    FIXPATH="$FIXPATH_BASE exec"
+  fi
+])
+
+# Platform-specific finalization
+AC_DEFUN([BASIC_WINDOWS_FINALIZE],
+[
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
+    # Change back from temp dir
+    cd $CONFIGURE_START_DIR
+  fi
+])
diff --git a/make/autoconf/basics.m4 b/make/autoconf/basics.m4
 deleted file mode 100644
index 90df36d..0000000
--- a/make/autoconf/basics.m4
+++ /dev/null
@@ -1,1479 +0,0 @@
-#
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-###############################################################################
-# Create a function/macro that takes a series of named arguments. The call is
-# similar to AC_DEFUN, but the setup of the function looks like this:
-# BASIC_DEFUN_NAMED([MYFUNC], [FOO *BAR], [$@], [
-# ... do something
-#   AC_MSG_NOTICE([Value of BAR is ARG_BAR])
-# ])
-# A star (*) in front of a named argument means that it is required and it's
-# presence will be verified. To pass e.g. the first value as a normal indexed
-# argument, use [m4_shift($@)] as the third argument instead of [$@]. These
-# arguments are referenced in the function by their name prefixed by ARG_, e.g.
-# "ARG_FOO".
-#
-# The generated function can be called like this:
-# MYFUNC(FOO: [foo-val],
-#     BAR: [
-#         $ECHO hello world
-#     ])
-# Note that the argument value must start on the same line as the argument name.
-#
-# Argument 1: Name of the function to define
-# Argument 2: List of legal named arguments, with a * prefix for required arguments
-# Argument 3: Argument array to treat as named, typically $@
-# Argument 4: The main function body
-AC_DEFUN([BASIC_DEFUN_NAMED],
-[
-  AC_DEFUN($1, [
-    m4_foreach(arg, m4_split($2), [
-      m4_if(m4_bregexp(arg, [^\*]), -1,
-        [
-          m4_set_add(legal_named_args, arg)
-        ],
-        [
-          m4_set_add(legal_named_args, m4_substr(arg, 1))
-          m4_set_add(required_named_args, m4_substr(arg, 1))
-        ]
-      )
-    ])
-
-    m4_foreach([arg], [$3], [
-      m4_define(arg_name, m4_substr(arg, 0, m4_bregexp(arg, [: ])))
-      m4_set_contains(legal_named_args, arg_name, [],[AC_MSG_ERROR([Internal error: arg_name is not a valid named argument to [$1]. Valid arguments are 'm4_set_contents(legal_named_args, [ ])'.])])
-      m4_set_remove(required_named_args, arg_name)
-      m4_set_remove(legal_named_args, arg_name)
-      m4_pushdef([ARG_][]arg_name, m4_substr(arg, m4_incr(m4_incr(m4_bregexp(arg, [: ])))))
-      m4_set_add(defined_args, arg_name)
-      m4_undefine([arg_name])
-    ])
-    m4_set_empty(required_named_args, [], [
-      AC_MSG_ERROR([Internal error: Required named arguments are missing for [$1]. Missing arguments: 'm4_set_contents(required_named_args, [ ])'])
-    ])
-    m4_foreach([arg], m4_indir([m4_dquote]m4_set_listc([legal_named_args])), [
-      m4_pushdef([ARG_][]arg, [])
-      m4_set_add(defined_args, arg)
-    ])
-    m4_set_delete(legal_named_args)
-    m4_set_delete(required_named_args)
-
-    # Execute function body
-    $4
-
-    m4_foreach([arg], m4_indir([m4_dquote]m4_set_listc([defined_args])), [
-      m4_popdef([ARG_][]arg)
-    ])
-
-    m4_set_delete(defined_args)
-  ])
-])
-
-###############################################################################
-# Check if a list of space-separated words are selected only from a list of
-# space-separated legal words. Typical use is to see if a user-specified
-# set of words is selected from a set of legal words.
-#
-# Sets the specified variable to list of non-matching (offending) words, or to
-# the empty string if all words are matching the legal set.
-#
-# $1: result variable name
-# $2: list of values to check
-# $3: list of legal values
-AC_DEFUN([BASIC_GET_NON_MATCHING_VALUES],
-[
-  # grep filter function inspired by a comment to http://stackoverflow.com/a/1617326
-  # Notice that the original variant fails on SLES 10 and 11
-  # Some grep versions (at least bsd) behaves strangely on the base case with
-  # no legal_values, so make it explicit.
-  values_to_check=`$ECHO $2 | $TR ' ' '\n'`
-  legal_values=`$ECHO $3 | $TR ' ' '\n'`
-  if test -z "$legal_values"; then
-    $1="$2"
-  else
-    result=`$GREP -Fvx "$legal_values" <<< "$values_to_check" | $GREP -v '^$'`
-    $1=${result//$'\n'/ }
-  fi
-])
-
-###############################################################################
-# Check if a list of space-separated words contains any word(s) from a list of
-# space-separated illegal words. Typical use is to see if a user-specified
-# set of words contains any from a set of illegal words.
-#
-# Sets the specified variable to list of matching illegal words, or to
-# the empty string if no words are matching the illegal set.
-#
-# $1: result variable name
-# $2: list of values to check
-# $3: list of illegal values
-AC_DEFUN([BASIC_GET_MATCHING_VALUES],
-[
-  # grep filter function inspired by a comment to http://stackoverflow.com/a/1617326
-  # Notice that the original variant fails on SLES 10 and 11
-  # Some grep versions (at least bsd) behaves strangely on the base case with
-  # no legal_values, so make it explicit.
-  values_to_check=`$ECHO $2 | $TR ' ' '\n'`
-  illegal_values=`$ECHO $3 | $TR ' ' '\n'`
-  if test -z "$illegal_values"; then
-    $1=""
-  else
-    result=`$GREP -Fx "$illegal_values" <<< "$values_to_check" | $GREP -v '^$'`
-    $1=${result//$'\n'/ }
-  fi
-])
-
-###############################################################################
-# Sort a space-separated list, and remove duplicates.
-#
-# Sets the specified variable to the resulting list.
-#
-# $1: result variable name
-# $2: list of values to sort
-AC_DEFUN([BASIC_SORT_LIST],
-[
-  values_to_sort=`$ECHO $2 | $TR ' ' '\n'`
-  result=`$SORT -u <<< "$values_to_sort" | $GREP -v '^$'`
-  $1=${result//$'\n'/ }
-])
-
-###############################################################################
-# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
-# If so, then append $1 to $2 \
-# Also set JVM_ARG_OK to true/false depending on outcome.
-AC_DEFUN([ADD_JVM_ARG_IF_OK],
-[
-  $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD
-  $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD
-  OUTPUT=`$3 $1 $USER_BOOT_JDK_OPTIONS -version 2>&1`
-  FOUND_WARN=`$ECHO "$OUTPUT" | $GREP -i warn`
-  FOUND_VERSION=`$ECHO $OUTPUT | $GREP " version \""`
-  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
-    $2="[$]$2 $1"
-    JVM_ARG_OK=true
-  else
-    $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD
-    $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD
-    JVM_ARG_OK=false
-  fi
-])
-
-# Appends a string to a path variable, only adding the : when needed.
-AC_DEFUN([BASIC_APPEND_TO_PATH],
-[
-  if test "x$2" != x; then
-    if test "x[$]$1" = x; then
-      $1="$2"
-    else
-      $1="[$]$1:$2"
-    fi
-  fi
-])
-
-# Prepends a string to a path variable, only adding the : when needed.
-AC_DEFUN([BASIC_PREPEND_TO_PATH],
-[
-  if test "x$2" != x; then
-    if test "x[$]$1" = x; then
-      $1="$2"
-    else
-      $1="$2:[$]$1"
-    fi
-  fi
-])
-
-###############################################################################
-# This will make sure the given variable points to a full and proper
-# path. This means:
-# 1) There will be no spaces in the path. On unix platforms,
-#    spaces in the path will result in an error. On Windows,
-#    the path will be rewritten using short-style to be space-free.
-# 2) The path will be absolute, and it will be in unix-style (on
-#     cygwin).
-# $1: The name of the variable to fix
-AC_DEFUN([BASIC_FIXUP_PATH],
-[
-  # Only process if variable expands to non-empty
-
-  if test "x[$]$1" != x; then
-    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-      BASIC_FIXUP_PATH_CYGWIN($1)
-    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-      BASIC_FIXUP_PATH_MSYS($1)
-    else
-      # We're on a unix platform. Hooray! :)
-      path="[$]$1"
-      has_space=`$ECHO "$path" | $GREP " "`
-      if test "x$has_space" != x; then
-        AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
-        AC_MSG_ERROR([Spaces are not allowed in this path.])
-      fi
-
-      # Use eval to expand a potential ~
-      eval path="$path"
-      if test ! -f "$path" && test ! -d "$path"; then
-        AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
-      fi
-
-      if test -d "$path"; then
-        $1="`cd "$path"; $THEPWDCMD -L`"
-      else
-        dir="`$DIRNAME "$path"`"
-        base="`$BASENAME "$path"`"
-        $1="`cd "$dir"; $THEPWDCMD -L`/$base"
-      fi
-    fi
-  fi
-])
-
-###############################################################################
-# This will make sure the given variable points to a executable
-# with a full and proper path. This means:
-# 1) There will be no spaces in the path. On unix platforms,
-#    spaces in the path will result in an error. On Windows,
-#    the path will be rewritten using short-style to be space-free.
-# 2) The path will be absolute, and it will be in unix-style (on
-#     cygwin).
-# Any arguments given to the executable is preserved.
-# If the input variable does not have a directory specification, then
-# it need to be in the PATH.
-# $1: The name of the variable to fix
-AC_DEFUN([BASIC_FIXUP_EXECUTABLE],
-[
-  # Only process if variable expands to non-empty
-
-  if test "x[$]$1" != x; then
-    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-      BASIC_FIXUP_EXECUTABLE_CYGWIN($1)
-    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
-      BASIC_FIXUP_EXECUTABLE_MSYS($1)
-    else
-      # We're on a unix platform. Hooray! :)
-      # First separate the path from the arguments. This will split at the first
-      # space.
-      complete="[$]$1"
-      path="${complete%% *}"
-      tmp="$complete EOL"
-      arguments="${tmp#* }"
-
-      # Cannot rely on the command "which" here since it doesn't always work.
-      is_absolute_path=`$ECHO "$path" | $GREP ^/`
-      if test -z "$is_absolute_path"; then
-        # Path to executable is not absolute. Find it.
-        IFS_save="$IFS"
-        IFS=:
-        for p in $PATH; do
-          if test -f "$p/$path" && test -x "$p/$path"; then
-            new_path="$p/$path"
-            break
-          fi
-        done
-        IFS="$IFS_save"
-      else
-        # This is an absolute path, we can use it without further modifications.
-        new_path="$path"
-      fi
-
-      if test "x$new_path" = x; then
-        AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
-        has_space=`$ECHO "$complete" | $GREP " "`
-        if test "x$has_space" != x; then
-          AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
-        fi
-        AC_MSG_ERROR([Cannot locate the the path of $1])
-      fi
-    fi
-
-    # Now join together the path and the arguments once again
-    if test "x$arguments" != xEOL; then
-      new_complete="$new_path ${arguments% *}"
-    else
-      new_complete="$new_path"
-    fi
-
-    if test "x$complete" != "x$new_complete"; then
-      $1="$new_complete"
-      AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
-    fi
-  fi
-])
-
-###############################################################################
-AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
-[
-  if test "x$OPENJDK_BUILD_OS" != xwindows; then
-    # Follow a chain of symbolic links. Use readlink
-    # where it exists, else fall back to horribly
-    # complicated shell code.
-    if test "x$READLINK_TESTED" != yes; then
-      # On MacOSX there is a readlink tool with a different
-      # purpose than the GNU readlink tool. Check the found readlink.
-      READLINK_ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
-      # If READLINK_ISGNU is empty, then it's a non-GNU readlink. Don't use it.
-      READLINK_TESTED=yes
-    fi
-
-    if test "x$READLINK" != x && test "x$READLINK_ISGNU" != x; then
-      $1=`$READLINK -f [$]$1`
-    else
-      # Save the current directory for restoring afterwards
-      STARTDIR=$PWD
-      COUNTER=0
-      sym_link_dir=`$DIRNAME [$]$1`
-      sym_link_file=`$BASENAME [$]$1`
-      cd $sym_link_dir
-      # Use -P flag to resolve symlinks in directories.
-      cd `$THEPWDCMD -P`
-      sym_link_dir=`$THEPWDCMD -P`
-      # Resolve file symlinks
-      while test $COUNTER -lt 20; do
-        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
-        if test "x$ISLINK" == x; then
-          # This is not a symbolic link! We are done!
-          break
-        fi
-        # Again resolve directory symlinks since the target of the just found
-        # link could be in a different directory
-        cd `$DIRNAME $ISLINK`
-        sym_link_dir=`$THEPWDCMD -P`
-        sym_link_file=`$BASENAME $ISLINK`
-        let COUNTER=COUNTER+1
-      done
-      cd $STARTDIR
-      $1=$sym_link_dir/$sym_link_file
-    fi
-  fi
-])
-
-###############################################################################
-# Register a --with argument but mark it as deprecated
-# $1: The name of the with argument to deprecate, not including --with-
-AC_DEFUN([BASIC_DEPRECATED_ARG_WITH],
-[
-  AC_ARG_WITH($1, [AS_HELP_STRING([--with-$1],
-      [Deprecated. Option is kept for backwards compatibility and is ignored])],
-      [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
-])
-
-###############################################################################
-# Register a --enable argument but mark it as deprecated
-# $1: The name of the with argument to deprecate, not including --enable-
-# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
-# $3: Messages to user.
-AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
-[
-  AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
-      [Deprecated. Option is kept for backwards compatibility and is ignored])])
-  if test "x$enable_$2" != x; then
-    AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
-
-    if test "x$3" != x; then
-      AC_MSG_WARN([$3])
-    fi
-
-  fi
-])
-
-###############################################################################
-AC_DEFUN_ONCE([BASIC_INIT],
-[
-  # Save the original command line. This is passed to us by the wrapper configure script.
-  AC_SUBST(CONFIGURE_COMMAND_LINE)
-  # AUTOCONF might be set in the environment by the user. Preserve for "make reconfigure".
-  AC_SUBST(AUTOCONF)
-  # Save the path variable before it gets changed
-  ORIGINAL_PATH="$PATH"
-  AC_SUBST(ORIGINAL_PATH)
-  DATE_WHEN_CONFIGURED=`date`
-  AC_SUBST(DATE_WHEN_CONFIGURED)
-  AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
-])
-
-###############################################################################
-# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
-# $1: variable to check
-AC_DEFUN([BASIC_CHECK_NONEMPTY],
-[
-  if test "x[$]$1" = x; then
-    AC_MSG_ERROR([Could not find required tool for $1])
-  fi
-])
-
-###############################################################################
-# Check that there are no unprocessed overridden variables left.
-# If so, they are an incorrect argument and we will exit with an error.
-AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
-[
-  if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then
-    # Replace the separating ! with spaces before presenting for end user.
-    unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ }
-    AC_MSG_WARN([The following variables might be unknown to configure: $unknown_variables])
-  fi
-])
-
-###############################################################################
-# Setup a tool for the given variable. If correctly specified by the user,
-# use that value, otherwise search for the tool using the supplied code snippet.
-# $1: variable to set
-# $2: code snippet to call to look for the tool
-# $3: code snippet to call if variable was used to find tool
-AC_DEFUN([BASIC_SETUP_TOOL],
-[
-  # Publish this variable in the help.
-  AC_ARG_VAR($1, [Override default value for $1])
-
-  if [[ -z "${$1+x}" ]]; then
-    # The variable is not set by user, try to locate tool using the code snippet
-    $2
-  else
-    # The variable is set, but is it from the command line or the environment?
-
-    # Try to remove the string !$1! from our list.
-    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!$1!/}
-    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
-      # If it failed, the variable was not from the command line. Ignore it,
-      # but warn the user (except for BASH, which is always set by the calling BASH).
-      if test "x$1" != xBASH; then
-        AC_MSG_WARN([Ignoring value of $1 from the environment. Use command line variables instead.])
-      fi
-      # Try to locate tool using the code snippet
-      $2
-    else
-      # If it succeeded, then it was overridden by the user. We will use it
-      # for the tool.
-
-      # First remove it from the list of overridden variables, so we can test
-      # for unknown variables in the end.
-      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
-
-      # Check if we try to supply an empty value
-      if test "x[$]$1" = x; then
-        AC_MSG_NOTICE([Setting user supplied tool $1= (no value)])
-        AC_MSG_CHECKING([for $1])
-        AC_MSG_RESULT([disabled])
-      else
-        # Check if the provided tool contains a complete path.
-        tool_specified="[$]$1"
-        tool_basename="${tool_specified##*/}"
-        if test "x$tool_basename" = "x$tool_specified"; then
-          # A command without a complete path is provided, search $PATH.
-          AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename])
-          AC_PATH_PROG($1, $tool_basename)
-          if test "x[$]$1" = x; then
-            AC_MSG_ERROR([User supplied tool $tool_basename could not be found])
-          fi
-        else
-          # Otherwise we believe it is a complete path. Use it as it is.
-          AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified])
-          AC_MSG_CHECKING([for $1])
-          if test ! -x "$tool_specified"; then
-            AC_MSG_RESULT([not found])
-            AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable])
-          fi
-          AC_MSG_RESULT([$tool_specified])
-        fi
-      fi
-    fi
-    $3
-  fi
-])
-
-###############################################################################
-# Call BASIC_SETUP_TOOL with AC_PATH_PROGS to locate the tool
-# $1: variable to set
-# $2: executable name (or list of names) to look for
-# $3: [path]
-AC_DEFUN([BASIC_PATH_PROGS],
-[
-  BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)])
-])
-
-###############################################################################
-# Call BASIC_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool
-# $1: variable to set
-# $2: executable name (or list of names) to look for
-AC_DEFUN([BASIC_CHECK_TOOLS],
-[
-  BASIC_SETUP_TOOL($1, [AC_CHECK_TOOLS($1, $2)])
-])
-
-###############################################################################
-# Like BASIC_PATH_PROGS but fails if no tool was found.
-# $1: variable to set
-# $2: executable name (or list of names) to look for
-# $3: [path]
-AC_DEFUN([BASIC_REQUIRE_PROGS],
-[
-  BASIC_PATH_PROGS($1, $2, , $3)
-  BASIC_CHECK_NONEMPTY($1)
-])
-
-###############################################################################
-# Like BASIC_SETUP_TOOL but fails if no tool was found.
-# $1: variable to set
-# $2: autoconf macro to call to look for the special tool
-AC_DEFUN([BASIC_REQUIRE_SPECIAL],
-[
-  BASIC_SETUP_TOOL($1, [$2])
-  BASIC_CHECK_NONEMPTY($1)
-])
-
-###############################################################################
-# Like BASIC_REQUIRE_PROGS but also allows for bash built-ins
-# $1: variable to set
-# $2: executable name (or list of names) to look for
-# $3: [path]
-AC_DEFUN([BASIC_REQUIRE_BUILTIN_PROGS],
-[
-  BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)])
-  if test "x[$]$1" = x; then
-    AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in])
-    if help $2 > /dev/null 2>&1; then
-      AC_MSG_NOTICE([Found $2 as shell built-in. Using it])
-      $1="$2"
-    else
-      AC_MSG_ERROR([Required tool $2 also not found as built-in.])
-    fi
-  fi
-  BASIC_CHECK_NONEMPTY($1)
-])
-
-###############################################################################
-# Setup the most fundamental tools that relies on not much else to set up,
-# but is used by much of the early bootstrap code.
-AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
-[
-  # Start with tools that do not need have cross compilation support
-  # and can be expected to be found in the default PATH. These tools are
-  # used by configure.
-
-  # First are all the simple required tools.
-  BASIC_REQUIRE_PROGS(BASENAME, basename)
-  BASIC_REQUIRE_PROGS(BASH, bash)
-  BASIC_REQUIRE_PROGS(CAT, cat)
-  BASIC_REQUIRE_PROGS(CHMOD, chmod)
-  BASIC_REQUIRE_PROGS(CMP, cmp)
-  BASIC_REQUIRE_PROGS(COMM, comm)
-  BASIC_REQUIRE_PROGS(CP, cp)
-  BASIC_REQUIRE_PROGS(CUT, cut)
-  BASIC_REQUIRE_PROGS(DATE, date)
-  BASIC_REQUIRE_PROGS(DIFF, [gdiff diff])
-  BASIC_REQUIRE_PROGS(DIRNAME, dirname)
-  BASIC_REQUIRE_PROGS(ECHO, echo)
-  BASIC_REQUIRE_PROGS(EXPR, expr)
-  BASIC_REQUIRE_PROGS(FILE, file)
-  BASIC_REQUIRE_PROGS(FIND, find)
-  BASIC_REQUIRE_PROGS(HEAD, head)
-  BASIC_REQUIRE_PROGS(GUNZIP, gunzip)
-  BASIC_REQUIRE_PROGS(GZIP, pigz gzip)
-  BASIC_REQUIRE_PROGS(LN, ln)
-  BASIC_REQUIRE_PROGS(LS, ls)
-  BASIC_REQUIRE_PROGS(MKDIR, mkdir)
-  BASIC_REQUIRE_PROGS(MKTEMP, mktemp)
-  BASIC_REQUIRE_PROGS(MV, mv)
-  BASIC_REQUIRE_PROGS(NAWK, [nawk gawk awk])
-  BASIC_REQUIRE_PROGS(PRINTF, printf)
-  BASIC_REQUIRE_PROGS(READLINK, [greadlink readlink])
-  BASIC_REQUIRE_PROGS(RM, rm)
-  BASIC_REQUIRE_PROGS(RMDIR, rmdir)
-  BASIC_REQUIRE_PROGS(SH, sh)
-  BASIC_REQUIRE_PROGS(SORT, sort)
-  BASIC_REQUIRE_PROGS(TAIL, tail)
-  BASIC_REQUIRE_PROGS(TAR, gtar tar)
-  BASIC_REQUIRE_PROGS(TEE, tee)
-  BASIC_REQUIRE_PROGS(TOUCH, touch)
-  BASIC_REQUIRE_PROGS(TR, tr)
-  BASIC_REQUIRE_PROGS(UNAME, uname)
-  BASIC_REQUIRE_PROGS(UNIQ, uniq)
-  BASIC_REQUIRE_PROGS(WC, wc)
-  BASIC_REQUIRE_PROGS(WHICH, which)
-  BASIC_REQUIRE_PROGS(XARGS, xargs)
-
-  # Then required tools that require some special treatment.
-  BASIC_REQUIRE_SPECIAL(AWK, [AC_PROG_AWK])
-  BASIC_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
-  BASIC_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
-  BASIC_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])
-  BASIC_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
-
-  # Always force rm.
-  RM="$RM -f"
-
-  # pwd behaves differently on various platforms and some don't support the -L flag.
-  # Always use the bash builtin pwd to get uniform behavior.
-  THEPWDCMD=pwd
-
-  # These are not required on all platforms
-  BASIC_PATH_PROGS(CYGPATH, cygpath)
-  BASIC_PATH_PROGS(DF, df)
-  BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
-  BASIC_PATH_PROGS(NICE, nice)
-  BASIC_PATH_PROGS(PANDOC, pandoc)
-])
-
-###############################################################################
-# Setup basic configuration paths, and platform-specific stuff related to PATHs.
-AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
-[
-  # Save the current directory this script was started from
-  CONFIGURE_START_DIR="$PWD"
-
-  # We might need to rewrite ORIGINAL_PATH, if it includes "#", to quote them
-  # for make. We couldn't do this when we retrieved ORIGINAL_PATH, since SED
-  # was not available at that time.
-  REWRITTEN_PATH=`$ECHO "$ORIGINAL_PATH" | $SED -e 's/#/\\\\#/g'`
-  if test "x$REWRITTEN_PATH" != "x$ORIGINAL_PATH"; then
-    ORIGINAL_PATH="$REWRITTEN_PATH"
-    AC_MSG_NOTICE([Rewriting ORIGINAL_PATH to $REWRITTEN_PATH])
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
-    PATH_SEP=";"
-    BASIC_CHECK_PATHS_WINDOWS
-  else
-    PATH_SEP=":"
-  fi
-  AC_SUBST(PATH_SEP)
-
-  # We get the top-level directory from the supporting wrappers.
-  AC_MSG_CHECKING([for top-level directory])
-  AC_MSG_RESULT([$TOPDIR])
-  AC_SUBST(TOPDIR)
-  AC_SUBST(CONFIGURE_START_DIR)
-
-  # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
-  BASIC_FIXUP_PATH(CONFIGURE_START_DIR)
-  BASIC_FIXUP_PATH(TOPDIR)
-
-  if test "x$CUSTOM_ROOT" != x; then
-    BASIC_FIXUP_PATH(CUSTOM_ROOT)
-    WORKSPACE_ROOT="${CUSTOM_ROOT}"
-  else
-    WORKSPACE_ROOT="${TOPDIR}"
-  fi
-  AC_SUBST(WORKSPACE_ROOT)
-
-  # Locate the directory of this script.
-  AUTOCONF_DIR=$TOPDIR/make/autoconf
-
-  # Setup username (for use in adhoc version strings etc)
-  # Outer [ ] to quote m4.
-  [ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
-  AC_SUBST(USERNAME)
-])
-
-###############################################################################
-# Evaluates platform specific overrides for devkit variables.
-# $1: Name of variable
-AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
-[
-  if test "x[$]$1" = x; then
-    eval $1="\${$1_${OPENJDK_TARGET_CPU}}"
-  fi
-])
-
-###############################################################################
-# Evaluates platform specific overrides for build devkit variables.
-# $1: Name of variable
-AC_DEFUN([BASIC_EVAL_BUILD_DEVKIT_VARIABLE],
-[
-  if test "x[$]$1" = x; then
-    eval $1="\${$1_${OPENJDK_BUILD_CPU}}"
-  fi
-])
-
-###############################################################################
-AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
-[
-  AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
-      [use this devkit for compilers, tools and resources])])
-
-  if test "x$with_devkit" = xyes; then
-    AC_MSG_ERROR([--with-devkit must have a value])
-  elif test "x$with_devkit" != x && test "x$with_devkit" != xno; then
-    BASIC_FIXUP_PATH([with_devkit])
-    DEVKIT_ROOT="$with_devkit"
-    # Check for a meta data info file in the root of the devkit
-    if test -f "$DEVKIT_ROOT/devkit.info"; then
-      . $DEVKIT_ROOT/devkit.info