Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 60424)
+++ /trunk/Config.kmk	(revision 60425)
@@ -1941,5 +1941,5 @@
  VBOX_NM ?= $(PATH_TOOL_MINGW32)/bin/nm.exe -p
 else
- VBOX_NM ?= nm -p
+ VBOX_NM ?= nm -p -t x
 endif
 
@@ -6424,5 +6424,10 @@
  ifeq ($(KBUILD_TARGET),solaris)
   # VBOX_JAVA_HOME ?= /usr/jdk/jdk1.6.0
-  VBOX_JAVA_HOME ?= /usr/java
+  VBOX_JAVA_HOME ?= $(firstword $(abspath $(wildcard \
+	/usr/jdk/latest/include/.. \
+	/usr/jdk/instances/jdk1.8*/include/.. \
+	/usr/jdk/instances/jdk1.7*/include/.. \
+	/usr/jdk/instances/jdk1.6*/include/.. \
+	)) /usr/java)
  endif
 
Index: /trunk/src/VBox/VMM/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/testcase/Makefile.kmk	(revision 60424)
+++ /trunk/src/VBox/VMM/testcase/Makefile.kmk	(revision 60425)
@@ -589,6 +589,6 @@
 		-e '/STAMPROFILEADV/d' \
 		\
-		-e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d' \
-		-e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
+		-e '/^\(0x\)\{0,1\}00[0-9a-fA-F]* [aAnN] [^_.]*\./!d' \
+		-e 's/^\(0x\)\{0,1\}\(00[0-9a-fA-F]*\) [aAnN] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\3, 0x0\2, \4);/' \
 		--output $@.tmp $@.dump
 	$(QUIET)$(SED) \
@@ -599,6 +599,6 @@
 		-e '/HMCPU_size$$/d' \
 		\
-		-e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d' \
-		-e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
+		-e '/^\(0x\)\{0,1\}00[0-9a-fA-F]* [aAnN] [^_.]*_size$$/!d' \
+		-e 's/^\(0x\)\{0,1\}\(00[0-9a-fA-F]*\) [aAnN] \([^_.]*\)_size/    CHECK_SIZE(\3, 0x0\2);/' \
 		--append $@.tmp $@.dump
 	$(QUIET)$(MV) -f $@.tmp $@