--- a/components/gawk/Makefile	Thu Oct 27 16:11:16 2016 -0700
+++ b/components/gawk/Makefile	Fri Oct 28 16:40:06 2016 -0700
@@ -42,6 +42,9 @@
 # The additional gawk specific set of transforms to be applied to the
 # test results to try to normalize them.
 COMPONENT_TEST_TRANSFORMS += \
+	'-e "/Nothing to be done/d"' \
+	'-e "/Leaving directory/d"' \
+	'-e "/Entering directory/d"' \
         '-e "s|\(^/usr/gnu/bin/make\).*|\1|" ' 
 
 TPNO=			26217	
@@ -50,6 +53,9 @@
 SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_64)
 include $(WS_MAKE_RULES)/gnu-component.mk
 
+CFLAGS += $(XPG6MODE)
+studio_C99MODE = $(studio_C99_ENABLE) 
+
 # Utility executables are intentionally delivered to the 32-bit lib directory.
 CONFIGURE_LIBDIR.64 =   $(CONFIGURE_PREFIX)/lib
 

--- a/components/gawk/test/results-64.master	Thu Oct 27 16:11:16 2016 -0700
+++ b/components/gawk/test/results-64.master	Fri Oct 28 16:40:06 2016 -0700
@@ -1,30 +1,10 @@
-make[1]: Entering directory `$(@D)'
 Making check in .
-make[2]: Entering directory `$(@D)'
 /usr/gnu/bin/make
-make[3]: Entering directory `$(@D)'
-make[3]: Nothing to be done for `check-local'.
-make[3]: Leaving directory `$(@D)'
-make[2]: Leaving directory `$(@D)'
 Making check in doc
-make[2]: Entering directory `$(@D)/doc'
-make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `$(@D)/doc'
 Making check in awklib
-make[2]: Entering directory `$(@D)/awklib'
-make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `$(@D)/awklib'
 Making check in po
-make[2]: Entering directory `$(@D)/po'
-make[2]: Nothing to be done for `check'.
-make[2]: Leaving directory `$(@D)/po'
 Making check in extension
-make[2]: Entering directory `$(@D)/extension'
-make[3]: Entering directory `$(@D)/extension'
-make[3]: Leaving directory `$(@D)/extension'
-make[2]: Leaving directory `$(@D)/extension'
 Making check in test
-make[2]: Entering directory `$(@D)/test'
 
 Any output from "cmp" is bad news, although some differences
 in floating point values are probably benign -- in particular,
@@ -407,7 +387,6 @@
 fmtspcl
 intformat
 ======== Done with machine-specific tests ========
-make[3]: Entering directory `$(@D)/test'
 ======== Starting tests that can vary based on character set or locale support ========
 **************************************************************************
 * Some or all of these tests may fail if you have inadequate or missing  *
@@ -435,9 +414,7 @@
 sort1
 sprintfc
 ======== Done with tests that can vary based on character set or locale support ========
-make[3]: Leaving directory `$(@D)/test'
 ======== Starting shared library tests ========
-make[3]: Entering directory `$(@D)/test'
 fnmatch
 filefuncs
 fork
@@ -457,13 +434,8 @@
 rwarray
 testext
 time
-make[3]: Leaving directory `$(@D)/test'
 ======== Done with shared library tests ========
 ======== Starting MPFR tests ========
 MPFR tests not supported on this system
 ======== Done with MPFR tests ========
-make[3]: Entering directory `$(@D)/test'
 ALL TESTS PASSED
-make[3]: Leaving directory `$(@D)/test'
-make[2]: Leaving directory `$(@D)/test'
-make[1]: Leaving directory `$(@D)'

--- a/components/lynx/Makefile	Thu Oct 27 16:11:16 2016 -0700
+++ b/components/lynx/Makefile	Fri Oct 28 16:40:06 2016 -0700
@@ -43,6 +43,8 @@
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
 CFLAGS +=	-I$(USRINCDIR)/ncurses
+CFLAGS += $(XPG6MODE)
+studio_C99MODE = $(studio_C99_ENABLE) 
 
 CONFIGURE_OPTIONS +=	--enable-nls
 CONFIGURE_OPTIONS +=	--enable-japanese-utf8