Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7033960: Do not check for mapfiles when fastdebug building
authorohair
Tue, 05 Apr 2011 17:24:44 -0700
changeset 8901 6f226af63661
parent 8900 9c66b3a590af
child 8902 447780a0b6e5
7033960: Do not check for mapfiles when fastdebug building Reviewed-by: dcubed
jdk/make/common/shared/Defs-linux.gmk file | annotate | diff | comparison | revisions
jdk/make/common/shared/Defs-solaris.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/common/shared/Defs-linux.gmk	Tue Apr 05 08:14:46 2011 -0700
+++ b/jdk/make/common/shared/Defs-linux.gmk	Tue Apr 05 17:24:44 2011 -0700
@@ -187,6 +187,12 @@
 
 # Special define for checking the binaries
 
+# Debug builds should downgrade warnings to just info
+MAPFILE_WARNING-DBG=INFO
+MAPFILE_WARNING-OPT=WARNING
+MAPFILE_WARNING-=WARNING
+MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))
+
 # Macro to check it's input file for banned dependencies and verify the
 #   binary built properly. Relies on process exit code.
 ifndef CROSS_COMPILE_ARCH
@@ -194,7 +200,7 @@
 ( \
   $(ECHO) "Checking for mapfile use in: $1" && \
   if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
-    $(ECHO) "WARNING: File was not built with a mapfile: $1"; \
+    $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
   fi && \
   $(ECHO) "Library loads for: $1" && \
   $(LDD) $1 && \
@@ -208,4 +214,5 @@
   $(ECHO) "Skipping binary file verification for cross-compile build" \
 )
 endef
-endif
\ No newline at end of file
+endif
+
--- a/jdk/make/common/shared/Defs-solaris.gmk	Tue Apr 05 08:14:46 2011 -0700
+++ b/jdk/make/common/shared/Defs-solaris.gmk	Tue Apr 05 17:24:44 2011 -0700
@@ -188,6 +188,12 @@
 
 # Special define for checking the binaries
 
+# Debug builds should downgrade warnings to just info
+MAPFILE_WARNING-DBG=INFO
+MAPFILE_WARNING-OPT=WARNING
+MAPFILE_WARNING-=WARNING
+MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))
+
 # Macro to check it's input file for banned dependencies and verify the
 #   binary built properly. Relies on process exit code.
 ifndef CROSS_COMPILE_ARCH
@@ -195,7 +201,7 @@
 ( \
   $(ECHO) "Checking for mapfile use in: $1" && \
   if [ "`$(NM) -g -D $1 | $(EGREP) -v 'UNDEF' | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
-    $(ECHO) "WARNING: File was not built with a mapfile: $1"; \
+    $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
   fi && \
   $(ECHO) "Library loads for: $1" && \
   $(LDD) $1 && \
@@ -209,4 +215,5 @@
   $(ECHO) "Skipping binary file verification for cross-compile build" \
 )
 endef
-endif
\ No newline at end of file
+endif
+
jdk-sandbox