1.1 --- a/make/bsd/makefiles/debug.make Fri Apr 12 12:22:59 2013 -0700
1.2 +++ b/make/bsd/makefiles/debug.make Fri Apr 12 15:53:30 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1999, 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 @@ -27,17 +27,16 @@
1.20 # Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make
1.21 DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS)
1.22 DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@))
1.23 -CFLAGS += $(DEBUG_CFLAGS/BYFILE)
1.24 +
1.25 +# _NMT_NOINLINE_ informs NMT that no inlining by Compiler
1.26 +CFLAGS += $(DEBUG_CFLAGS/BYFILE) -D_NMT_NOINLINE_
1.27 +
1.28 +# Set the environment variable HOTSPARC_GENERIC to "true"
1.29 +# to inhibit the effect of the previous line on CFLAGS.
1.30
1.31 # Linker mapfile
1.32 MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
1.33
1.34 -_JUNK_ := $(shell echo -e >&2 ""\
1.35 - "----------------------------------------------------------------------\n" \
1.36 - "WARNING: 'make debug' is deprecated. It will be removed in the future.\n" \
1.37 - "Please use 'make jvmg' to build debug JVM. \n" \
1.38 - "----------------------------------------------------------------------\n")
1.39 -
1.40 VERSION = debug
1.41 -SYSDEFS += -DASSERT -DDEBUG
1.42 +SYSDEFS += -DASSERT
1.43 PICFLAGS = DEFAULT
