diff -r 71c04702a3d5 -r 72e3ae9a25eb make/hotspot/lib/JvmMapfile.gmk
--- a/make/hotspot/lib/JvmMapfile.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/hotspot/lib/JvmMapfile.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/JvmMapfile.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmMapfile.gmk))
 
 ################################################################################
 # Combine a list of static symbols
@@ -31,20 +31,20 @@
 ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86_64)
   # On Windows x86_64, we should not have any symbols at all, since that
   # results in duplicate warnings from the linker (JDK-8043491).
-  SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-shared
+  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-shared
 endif
 
 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
-  SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-unix
+  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-unix
 endif
 
-ifneq ($(wildcard $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)), )
-  SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)
+ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)), )
+  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)
 endif
 
 ifneq ($(findstring debug, $(DEBUG_LEVEL)), )
-  ifneq ($(wildcard $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
-    SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)-debug
+  ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
+    SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug
   endif
 endif
 
@@ -53,9 +53,9 @@
     # Additional mapfiles that are only used when dtrace is enabled
     ifeq ($(call check-jvm-feature, compiler2), true)
       # This also covers the case of compiler1+compiler2.
-      SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-solaris-dtrace-compiler2
+      SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-solaris-dtrace-compiler2
     else ifeq ($(call check-jvm-feature, compiler1), true)
-      SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-solaris-dtrace-compiler1
+      SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-solaris-dtrace-compiler1
     endif
   endif
 endif