1.1 --- a/make/solaris/makefiles/debug.make Fri Apr 12 12:22:59 2013 -0700
1.2 +++ b/make/solaris/makefiles/debug.make Fri Apr 12 15:53:30 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -19,7 +19,7 @@
1.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.12 # or visit www.oracle.com if you need additional information or have any
1.13 # questions.
1.14 -#
1.15 +#
1.16 #
1.17
1.18 # Sets make macros for making debug version of VM
1.19 @@ -37,22 +37,20 @@
1.20 endif
1.21 endif
1.22
1.23 -CFLAGS += $(DEBUG_CFLAGS/BYFILE)
1.24 +# _NMT_NOINLINE_ informs NMT that no inlining by Compiler
1.25 +CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_
1.26 +
1.27 +# Set the environment variable HOTSPARC_GENERIC to "true"
1.28 +# to inhibit the effect of the previous line on CFLAGS.
1.29
1.30 # Linker mapfiles
1.31 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
1.32 $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
1.33
1.34 -# This mapfile is only needed when compiling with dtrace support,
1.35 +# This mapfile is only needed when compiling with dtrace support,
1.36 # and mustn't be otherwise.
1.37 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
1.38
1.39 -_JUNK_ := $(shell echo >&2 ""\
1.40 - "-------------------------------------------------------------------------\n" \
1.41 - "WARNING: 'gnumake debug' is deprecated. It will be removed in the future.\n" \
1.42 - "Please use 'gnumake jvmg' to build debug JVM. \n" \
1.43 - "-------------------------------------------------------------------------\n")
1.44 -
1.45 VERSION = debug
1.46 -SYSDEFS += -DASSERT -DDEBUG
1.47 +SYSDEFS += -DASSERT
1.48 PICFLAGS = DEFAULT
