--- a/hotspot/src/share/vm/utilities/macros.hpp	Tue May 24 12:42:43 2016 -0500
+++ b/hotspot/src/share/vm/utilities/macros.hpp	Wed May 25 13:46:05 2016 -0400
@@ -34,6 +34,9 @@
 // Makes a string of the macro expansion of a
 #define XSTR(a) STR(a)
 
+// Allow commas in macro arguments.
+#define COMMA ,
+
 // Apply pre-processor token pasting to the expansions of x and y.
 // The token pasting operator (##) prevents its arguments from being
 // expanded.  This macro allows expansion of its arguments before the