diff --git a/make/hotspot/symbols/symbols-aix b/make/data/hotspot-symbols/symbols-aix
similarity index 100%
rename from make/hotspot/symbols/symbols-aix
rename to make/data/hotspot-symbols/symbols-aix
diff --git a/make/hotspot/symbols/symbols-aix-debug b/make/data/hotspot-symbols/symbols-aix-debug
similarity index 100%
rename from make/hotspot/symbols/symbols-aix-debug
rename to make/data/hotspot-symbols/symbols-aix-debug
diff --git a/make/hotspot/symbols/symbols-linux b/make/data/hotspot-symbols/symbols-linux
similarity index 100%
rename from make/hotspot/symbols/symbols-linux
rename to make/data/hotspot-symbols/symbols-linux
diff --git a/make/hotspot/symbols/symbols-macosx b/make/data/hotspot-symbols/symbols-macosx
similarity index 100%
rename from make/hotspot/symbols/symbols-macosx
rename to make/data/hotspot-symbols/symbols-macosx
diff --git a/make/hotspot/symbols/symbols-shared b/make/data/hotspot-symbols/symbols-shared
similarity index 100%
rename from make/hotspot/symbols/symbols-shared
rename to make/data/hotspot-symbols/symbols-shared
diff --git a/make/hotspot/symbols/symbols-unix b/make/data/hotspot-symbols/symbols-unix
similarity index 100%
rename from make/hotspot/symbols/symbols-unix
rename to make/data/hotspot-symbols/symbols-unix
diff --git a/make/hotspot/lib/JvmMapfile.gmk b/make/hotspot/lib/JvmMapfile.gmk
index 7da46ebe699..5cba93178c7 100644
--- a/make/hotspot/lib/JvmMapfile.gmk
+++ b/make/hotspot/lib/JvmMapfile.gmk
@@ -31,20 +31,20 @@ $(eval $(call IncludeCustomExtension, hotspot/lib/JvmMapfile.gmk))
 ifeq ($(call And, $(call isTargetOs, windows) $(call isTargetCpu, x86_64)), false)
   # 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 += $(TOPDIR)/make/hotspot/symbols/symbols-shared
+  SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-shared
 endif
 
 ifeq ($(call isTargetOsType, unix), true)
-  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-unix
+  SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-unix
 endif
 
-ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)), )
-  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)
+ifneq ($(wildcard $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)), )
+  SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)
 endif
 
 ifneq ($(findstring debug, $(DEBUG_LEVEL)), )
-  ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
-    SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug
+  ifneq ($(wildcard $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
+    SYMBOLS_SRC += $(TOPDIR)/make/data/hotspot-symbols/symbols-$(OPENJDK_TARGET_OS)-debug
   endif
 endif