--- old/make/HotspotWrapper.gmk	2016-04-20 15:10:45.939582097 +0200
+++ /dev/null	2016-02-18 10:58:42.502130963 +0100
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2011, 2012, 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.
-#
-
-# Include the legacy hotspot-spec.gmk (which in turns includes spec.gmk)
-BASE_SPEC:=$(SPEC)
-# Assign to HOTSPOT_SPEC so that the variable HOTSPOT_SPEC can be
-# overridden when building the buildjdk.
-HOTSPOT_SPEC := $(dir $(SPEC))hotspot-spec.gmk
-include $(HOTSPOT_SPEC)
-include MakeBase.gmk
-
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
-
-default: all
-
-# Get all files in src, make or agent subdirs in hotspot directory and
-# filter out .hg. This skips the test directory.
-HOTSPOT_FILES := $(shell $(FIND) -L \
-    $(HOTSPOT_TOPDIR)/src $(HOTSPOT_TOPDIR)/make \
-    -name ".hg" -prune -o -print)
-
-# The old build creates hotspot output dir before calling hotspot and
-# not doing it breaks builds on msys.
-$(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp: $(HOTSPOT_FILES)
-	@$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
-	($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(HOTSPOT_MAKE_ARGS) \
-	    LOG_LEVEL=$(LOG_LEVEL) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC))
-	$(TOUCH) $@
-
-hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp
-
-all: hotspot
-
-.PHONY: default all hotspot