From 14d66bd438dfa1feeafaca39be8f79a91e2968e9 Mon Sep 17 00:00:00 2001
From: Andrew Leonard <aleonard@openjdk.org>
Date: Mon, 8 Nov 2021 20:37:24 +0000
Subject: [PATCH] 8276654: element-list order is non deterministic

Reviewed-by: ihse
---
 make/modules/jdk.javadoc/Gendata.gmk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/modules/jdk.javadoc/Gendata.gmk b/make/modules/jdk.javadoc/Gendata.gmk
index c648df6e032..50ef87545a4 100644
--- a/make/modules/jdk.javadoc/Gendata.gmk
+++ b/make/modules/jdk.javadoc/Gendata.gmk
@@ -72,7 +72,9 @@ $(JDK_JAVADOC_DIR)/_element_lists.marker: \
     $(MODULE_INFOS)
 	$(call MakeTargetDir)
 	$(call LogInfo, Creating javadoc element lists)
-	$(RM) -r $(ELEMENT_LISTS_DIR)
+	$(RM) $(ELEMENT_LISTS_DIR)/element-list-{$(call CommaList, \
+		$(call sequence, $(GENERATE_SYMBOLS_FROM_JDK_VERSION), \
+				 $(JDK_SOURCE_TARGET_VERSION)))}.txt
         # Generate element-list files for JDK 11 to current-1
 	$(call ExecuteWithLog, $@_historic, \
 	    $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \