--- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2018-10-22 05:22:47.000000000 +0000
+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2019-02-27 00:44:26.900000000 +0000
@@ -182,7 +182,7 @@
   # others have it in /usr/bin.
   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
                    $(wildcard $(UTILS_USR_BIN_PATH)sort))
-  NAWK           = $(USRBIN_PATH)gawk
+  NAWK           = $(USRBIN_PATH)mawk
   # Intrinsic unix command, with backslash-escaped character interpretation
   ECHO           = /bin/echo -e
   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2019-02-27 00:40:12.430000000 +0000
+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2019-02-27 00:43:49.520000000 +0000
@@ -207,7 +207,7 @@
   # others have it in /usr/bin.
   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
-  NAWK           = $(USRBIN_PATH)gawk
+  NAWK           = $(USRBIN_PATH)mawk
   # Intrinsic unix command, with backslash-escaped character interpretation
   ECHO           = /bin/echo -e
   # These are really in UTILS_USR_BIN_PATH on Linux