--- a/src/hotspot/share/prims/methodHandles.cpp	Wed Aug 19 21:41:08 2020
+++ b/src/hotspot/share/prims/methodHandles.cpp	Fri Aug 21 10:42:08 2020
@@ -1367,6 +1367,10 @@
 #define LANG "Ljava/lang/"
 #define JLINV "Ljava/lang/invoke/"
 
+#ifdef CS
+#undef CS
+#endif
+
 #define OBJ   LANG "Object;"
 #define CLS   LANG "Class;"
 #define STRG  LANG "String;"