Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 3970:29296ea6529a jdk7-b137
7033960: Do not check for mapfiles when fastdebug building
Reviewed-by: dcubed
author | ohair |
---|---|
date | Tue, 05 Apr 2011 17:24:44 -0700 |
parents | 61d9af63ff0e |
children | 1631a3dee8fc 376a971344a3 272483f6650b |
files | make/common/shared/Defs-linux.gmk make/common/shared/Defs-solaris.gmk |
diffstat | 2 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Defs-linux.gmk Tue Apr 05 08:14:46 2011 -0700 +++ b/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/make/common/shared/Defs-solaris.gmk Tue Apr 05 08:14:46 2011 -0700 +++ b/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 +