1.1 --- a/make/common/shared/Defs.gmk Fri Aug 13 11:38:10 2010 -0700
1.2 +++ b/make/common/shared/Defs.gmk Mon Aug 30 14:39:42 2010 -0700
1.3 @@ -51,7 +51,7 @@
1.4 # Get shared system utilities macros defined
1.5 include $(BUILDDIR)/common/shared/Defs-utils.gmk
1.6
1.7 -# Assumes ARCH, PLATFORM, ARCH_VM_SUBDIR, etc. have been defined.
1.8 +# Assumes ARCH, PLATFORM, etc. have been defined.
1.9
1.10 # Simple pwd path
1.11 define PwdPath
1.12 @@ -157,7 +157,6 @@
1.13 _check_values:=\
1.14 $(call CheckValue,ARCH,),\
1.15 $(call CheckValue,ARCH_DATA_MODEL,),\
1.16 -$(call CheckValue,ARCH_VM_SUBDIR,),\
1.17 $(call CheckValue,VARIANT,),\
1.18 $(call CheckValue,PLATFORM,)
1.19
1.20 @@ -194,21 +193,15 @@
1.21 # can be OPT or DBG, default is OPT
1.22 # Determine the extra pattern to add to the release name for debug/fastdebug.
1.23 # Determine the JDK_IMPORT_VARIANT, so we get the right VM files copied over.
1.24 -# Determine suffix for obj directory or OBJDIR, for .o files.
1.25 -# (by keeping .o files separate, just .o files, they don't clobber each
1.26 -# other, however, the library files will clobber each other).
1.27 #
1.28 ifeq ($(VARIANT), DBG)
1.29 BUILD_VARIANT_RELEASE=-debug
1.30 - OBJDIRNAME_SUFFIX=_g
1.31 else
1.32 BUILD_VARIANT_RELEASE=
1.33 - OBJDIRNAME_SUFFIX=
1.34 endif
1.35 ifeq ($(FASTDEBUG), true)
1.36 VARIANT=DBG
1.37 BUILD_VARIANT_RELEASE=-fastdebug
1.38 - OBJDIRNAME_SUFFIX=_gO
1.39 _JDK_IMPORT_VARIANT=/fastdebug
1.40 endif
1.41
1.42 @@ -330,6 +323,4 @@
1.43 # Absolute path to output directory
1.44 ABS_OUTPUTDIR:=$(call FullPath,$(OUTPUTDIR))
1.45
1.46 -# Get shared compiler settings
1.47 -include $(BUILDDIR)/common/shared/Compiler.gmk
1.48
