7033960: Do not check for mapfiles when fastdebug building jdk7-b137
authorohair
Tue, 05 Apr 2011 17:24:44 -0700
changeset 384229296ea6529a
parent 3841 61d9af63ff0e
child 3843 376a971344a3
child 3942 272483f6650b
7033960: Do not check for mapfiles when fastdebug building
Reviewed-by: dcubed
make/common/shared/Defs-linux.gmk
make/common/shared/Defs-solaris.gmk
     1.1 --- a/make/common/shared/Defs-linux.gmk	Tue Apr 05 08:14:46 2011 -0700
     1.2 +++ b/make/common/shared/Defs-linux.gmk	Tue Apr 05 17:24:44 2011 -0700
     1.3 @@ -187,6 +187,12 @@
     1.4  
     1.5  # Special define for checking the binaries
     1.6  
     1.7 +# Debug builds should downgrade warnings to just info
     1.8 +MAPFILE_WARNING-DBG=INFO
     1.9 +MAPFILE_WARNING-OPT=WARNING
    1.10 +MAPFILE_WARNING-=WARNING
    1.11 +MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))
    1.12 +
    1.13  # Macro to check it's input file for banned dependencies and verify the
    1.14  #   binary built properly. Relies on process exit code.
    1.15  ifndef CROSS_COMPILE_ARCH
    1.16 @@ -194,7 +200,7 @@
    1.17  ( \
    1.18    $(ECHO) "Checking for mapfile use in: $1" && \
    1.19    if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
    1.20 -    $(ECHO) "WARNING: File was not built with a mapfile: $1"; \
    1.21 +    $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
    1.22    fi && \
    1.23    $(ECHO) "Library loads for: $1" && \
    1.24    $(LDD) $1 && \
    1.25 @@ -208,4 +214,5 @@
    1.26    $(ECHO) "Skipping binary file verification for cross-compile build" \
    1.27  )
    1.28  endef
    1.29 -endif
    1.30 \ No newline at end of file
    1.31 +endif
    1.32 +
     2.1 --- a/make/common/shared/Defs-solaris.gmk	Tue Apr 05 08:14:46 2011 -0700
     2.2 +++ b/make/common/shared/Defs-solaris.gmk	Tue Apr 05 17:24:44 2011 -0700
     2.3 @@ -188,6 +188,12 @@
     2.4  
     2.5  # Special define for checking the binaries
     2.6  
     2.7 +# Debug builds should downgrade warnings to just info
     2.8 +MAPFILE_WARNING-DBG=INFO
     2.9 +MAPFILE_WARNING-OPT=WARNING
    2.10 +MAPFILE_WARNING-=WARNING
    2.11 +MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT))
    2.12 +
    2.13  # Macro to check it's input file for banned dependencies and verify the
    2.14  #   binary built properly. Relies on process exit code.
    2.15  ifndef CROSS_COMPILE_ARCH
    2.16 @@ -195,7 +201,7 @@
    2.17  ( \
    2.18    $(ECHO) "Checking for mapfile use in: $1" && \
    2.19    if [ "`$(NM) -g -D $1 | $(EGREP) -v 'UNDEF' | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
    2.20 -    $(ECHO) "WARNING: File was not built with a mapfile: $1"; \
    2.21 +    $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
    2.22    fi && \
    2.23    $(ECHO) "Library loads for: $1" && \
    2.24    $(LDD) $1 && \
    2.25 @@ -209,4 +215,5 @@
    2.26    $(ECHO) "Skipping binary file verification for cross-compile build" \
    2.27  )
    2.28  endef
    2.29 -endif
    2.30 \ No newline at end of file
    2.31 +endif
    2.32 +