--- old/make/gendata/Gendata-jdk.compiler.gmk	2020-03-23 19:56:23.907962796 +0100
+++ new/make/gendata/Gendata-jdk.compiler.gmk	2020-03-23 19:56:23.567962798 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -54,9 +54,9 @@
 
 $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(TOPDIR)/make/langtools/src/classes \
+    SRC := $(TOPDIR)/src/jdk.compiler/share/tools \
         $(TOPDIR)/src/jdk.jdeps/share/classes, \
-    INCLUDES := build/tools/symbolgenerator com/sun/tools/classfile, \
+    INCLUDES := org/openjdk/buildtools/symbolgenerator com/sun/tools/classfile, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \
     ADD_JAVAC_FLAGS := $(INTERIM_LANGTOOLS_ARGS) \
         --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
@@ -73,14 +73,14 @@
 	$(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
 	    $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
 	    -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \
-	    build.tools.symbolgenerator.CreateSymbols \
+	    org.openjdk.buildtools.symbolgenerator.CreateSymbols \
 	    build-ctsym \
 	    $(CT_DATA_DESCRIPTION) \
 	    $(@D)
 	$(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
 	    $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
 	    -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols \
-	    build.tools.symbolgenerator.TransitiveDependencies \
+	    org.openjdk.buildtools.symbolgenerator.TransitiveDependencies \
 	    $(@D) \
 	    $(CT_MODULESOURCEPATH) \
 	    $(CT_MODULES)