6583644: Move all managed/SCCS files out of 'build' into 'make' directory

Moved makefiles out of build and build/closed into make/

Reviewed-by: kvn, ohair

hotspot/.hgignore

@@ -1,170 +1,3 @@
-^build/solaris/solaris_sparc_compiler1/
-^build/solaris/solaris_sparc_compiler2/
-^build/solaris/solaris_sparc_core/
-^build/solaris/solaris_sparc_kernel/
-^build/solaris/solaris_sparc_docs/
-^build/solaris/jdk-solaris-sparc/
-^build/solaris/export-solaris-sparc/
-^build/solaris/solaris_sparcv9_compiler1/
-^build/solaris/solaris_sparcv9_compiler2/
-^build/solaris/solaris_sparcv9_core/
-^build/solaris/solaris_sparcv9_kernel/
-^build/solaris/solaris_sparcv9_docs/
-^build/solaris/jdk-solaris-sparcv9/
-^build/solaris/export-solaris-sparcv9/
-^build/solaris/solaris_sparc32_compiler1/
-^build/solaris/solaris_sparc32_compiler2/
-^build/solaris/solaris_sparc32_core/
-^build/solaris/solaris_sparc32_kernel/
-^build/solaris/solaris_sparc32_docs/
-^build/solaris/jdk-solaris-sparc32/
-^build/solaris/export-solaris-sparc32/
-^build/solaris/solaris_sparc64_compiler1/
-^build/solaris/solaris_sparc64_compiler2/
-^build/solaris/solaris_sparc64_core/
-^build/solaris/solaris_sparc64_kernel/
-^build/solaris/solaris_sparc64_docs/
-^build/solaris/jdk-solaris-sparc64/
-^build/solaris/export-solaris-sparc64/
-^build/solaris/solaris_i486_compiler1/
-^build/solaris/solaris_i486_compiler2/
-^build/solaris/solaris_i486_core/
-^build/solaris/solaris_i486_kernel/
-^build/solaris/solaris_i486_docs/
-^build/solaris/jdk-solaris-i486/
-^build/solaris/export-solaris-i486/
-^build/solaris/solaris_i386_compiler1/
-^build/solaris/solaris_i386_compiler2/
-^build/solaris/solaris_i386_core/
-^build/solaris/solaris_i386_kernel/
-^build/solaris/solaris_i386_docs/
-^build/solaris/jdk-solaris-i386/
-^build/solaris/export-solaris-i386/
-^build/solaris/solaris_amd64_compiler1/
-^build/solaris/solaris_amd64_compiler2/
-^build/solaris/solaris_amd64_core/
-^build/solaris/solaris_amd64_kernel/
-^build/solaris/solaris_amd64_docs/
-^build/solaris/jdk-solaris-amd64/
-^build/solaris/export-solaris-amd64/
-^build/solaris/solaris_x64_compiler1/
-^build/solaris/solaris_x64_compiler2/
-^build/solaris/solaris_x64_core/
-^build/solaris/solaris_x64_kernel/
-^build/solaris/solaris_x64_docs/
-^build/solaris/jdk-solaris-x64/
-^build/solaris/export-solaris-x64/
-^build/windows/windows_sparc_compiler1/
-^build/windows/windows_sparc_compiler2/
-^build/windows/windows_sparc_core/
-^build/windows/windows_sparc_kernel/
-^build/windows/windows_sparc_docs/
-^build/windows/jdk-windows-sparc/
-^build/windows/export-windows-sparc/
-^build/windows/windows_sparcv9_compiler1/
-^build/windows/windows_sparcv9_compiler2/
-^build/windows/windows_sparcv9_core/
-^build/windows/windows_sparcv9_kernel/
-^build/windows/windows_sparcv9_docs/
-^build/windows/jdk-windows-sparcv9/
-^build/windows/export-windows-sparcv9/
-^build/windows/windows_sparc32_compiler1/
-^build/windows/windows_sparc32_compiler2/
-^build/windows/windows_sparc32_core/
-^build/windows/windows_sparc32_kernel/
-^build/windows/windows_sparc32_docs/
-^build/windows/jdk-windows-sparc32/
-^build/windows/export-windows-sparc32/
-^build/windows/windows_sparc64_compiler1/
-^build/windows/windows_sparc64_compiler2/
-^build/windows/windows_sparc64_core/
-^build/windows/windows_sparc64_kernel/
-^build/windows/windows_sparc64_docs/
-^build/windows/jdk-windows-sparc64/
-^build/windows/export-windows-sparc64/
-^build/windows/windows_i486_compiler1/
-^build/windows/windows_i486_compiler2/
-^build/windows/windows_i486_core/
-^build/windows/windows_i486_kernel/
-^build/windows/windows_i486_docs/
-^build/windows/jdk-windows-i486/
-^build/windows/export-windows-i486/
-^build/windows/windows_i386_compiler1/
-^build/windows/windows_i386_compiler2/
-^build/windows/windows_i386_core/
-^build/windows/windows_i386_kernel/
-^build/windows/windows_i386_docs/
-^build/windows/jdk-windows-i386/
-^build/windows/export-windows-i386/
-^build/windows/windows_amd64_compiler1/
-^build/windows/windows_amd64_compiler2/
-^build/windows/windows_amd64_core/
-^build/windows/windows_amd64_kernel/
-^build/windows/windows_amd64_docs/
-^build/windows/jdk-windows-amd64/
-^build/windows/export-windows-amd64/
-^build/windows/windows_x64_compiler1/
-^build/windows/windows_x64_compiler2/
-^build/windows/windows_x64_core/
-^build/windows/windows_x64_kernel/
-^build/windows/windows_x64_docs/
-^build/windows/jdk-windows-x64/
-^build/windows/export-windows-x64/
-^build/linux/linux_sparc_compiler1/
-^build/linux/linux_sparc_compiler2/
-^build/linux/linux_sparc_core/
-^build/linux/linux_sparc_kernel/
-^build/linux/linux_sparc_docs/
-^build/linux/jdk-linux-sparc/
-^build/linux/export-linux-sparc/
-^build/linux/linux_sparcv9_compiler1/
-^build/linux/linux_sparcv9_compiler2/
-^build/linux/linux_sparcv9_core/
-^build/linux/linux_sparcv9_kernel/
-^build/linux/linux_sparcv9_docs/
-^build/linux/jdk-linux-sparcv9/
-^build/linux/export-linux-sparcv9/
-^build/linux/linux_sparc32_compiler1/
-^build/linux/linux_sparc32_compiler2/
-^build/linux/linux_sparc32_core/
-^build/linux/linux_sparc32_kernel/
-^build/linux/linux_sparc32_docs/
-^build/linux/jdk-linux-sparc32/
-^build/linux/export-linux-sparc32/
-^build/linux/linux_sparc64_compiler1/
-^build/linux/linux_sparc64_compiler2/
-^build/linux/linux_sparc64_core/
-^build/linux/linux_sparc64_kernel/
-^build/linux/linux_sparc64_docs/
-^build/linux/jdk-linux-sparc64/
-^build/linux/export-linux-sparc64/
-^build/linux/linux_i486_compiler1/
-^build/linux/linux_i486_compiler2/
-^build/linux/linux_i486_core/
-^build/linux/linux_i486_kernel/
-^build/linux/linux_i486_docs/
-^build/linux/jdk-linux-i486/
-^build/linux/export-linux-i486/
-^build/linux/linux_i386_compiler1/
-^build/linux/linux_i386_compiler2/
-^build/linux/linux_i386_core/
-^build/linux/linux_i386_kernel/
-^build/linux/linux_i386_docs/
-^build/linux/jdk-linux-i386/
-^build/linux/export-linux-i386/
-^build/linux/linux_amd64_compiler1/
-^build/linux/linux_amd64_compiler2/
-^build/linux/linux_amd64_core/
-^build/linux/linux_amd64_kernel/
-^build/linux/linux_amd64_docs/
-^build/linux/jdk-linux-amd64/
-^build/linux/export-linux-amd64/
-^build/linux/linux_x64_compiler1/
-^build/linux/linux_x64_compiler2/
-^build/linux/linux_x64_core/
-^build/linux/linux_x64_kernel/
-^build/linux/linux_x64_docs/
-^build/linux/jdk-linux-x64/
-^build/linux/export-linux-x64/
+^build/
 ^dist/
 ^nbproject/private/

hotspot/build/windows/projectfiles/tiered/vm.def

@@ -1,7 +0,0 @@
-;
-; This .DEF file is a placeholder for one which is automatically
-; generated during the build process. See
-; build\windows\build_vm_def.sh and
-; build\windows\makefiles\makedeps.make (esp. the "-prelink"
-; options).
-;

hotspot/make/defs.make

@@ -57,6 +57,7 @@ endef
 # When the tree of subdirs is built, this setting is stored in each flags.make.
 GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done)
 HS_SRC_DIR=$(GAMMADIR)/src
+HS_MAKE_DIR=$(GAMMADIR)/make
 HS_BUILD_DIR=$(GAMMADIR)/build
 
 ifeq ($(USER),)
@@ -170,17 +171,17 @@ endif
 
 # The platform dependent defs.make defines platform specific variable such 
 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
-include $(GAMMADIR)/build/$(OSNAME)/makefiles/defs.make
+include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
 
 # We are trying to put platform specific defintions
-# files to build/$(OSNAME)/makefiles dictory. However
+# files to make/$(OSNAME)/makefiles dictory. However
 # some definitions are common for both linux and solaris,
 # so we put them here.
 ifneq ($(OSNAME),windows)
-  ABS_OUTPUTDIR     := $(shell $(CD) $(OUTPUTDIR); $(PWD))
+  ABS_OUTPUTDIR     := $(shell mkdir -p $(OUTPUTDIR); $(CD) $(OUTPUTDIR); $(PWD))
   ABS_BOOTDIR       := $(shell $(CD) $(BOOTDIR); $(PWD))
   ABS_GAMMADIR      := $(shell $(CD) $(GAMMADIR); $(PWD))
-  ABS_OS_MAKEFILE   := $(shell $(CD) $(HS_BUILD_DIR)/$(OSNAME); $(PWD))/Makefile
+  ABS_OS_MAKEFILE   := $(shell $(CD) $(HS_MAKE_DIR)/$(OSNAME); $(PWD))/Makefile
 
   # uname, HotSpot source directory, build directory and JDK use different names
   # for CPU architectures.

hotspot/make/hotspot_distro

@@ -0,0 +1,14 @@
+# 
+# Copyright 2006-2007 Sun Microsystems, Inc.  All rights reserved.
+# SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+#
+
+#
+# This file format must remain compatible with both
+# GNU Makefile and Microsoft nmake formats.
+#
+
+# Don't put quotes (fail windows build).
+HOTSPOT_VM_DISTRO=Java HotSpot(TM)
+COMPANY_NAME=Sun Microsystems, Inc.
+PRODUCT_NAME=Java(TM) Platform SE

hotspot/make/jprt.properties

@@ -29,6 +29,11 @@ JPRT.tools.default.release=jdk1.7.0
 # Build result bundles are not partial builds| but include everything
 JPRT.need.sibling.build=false
 
+# Directories needed to build
+JPRT.bundle.src.dirs=make src agent
+JPRT.bundle.exclude.src.dirs=build
+
+
 # Standard list of JPRT build targets for this workspace
 JPRT.build.targets= \
     solaris_sparc_5.10-{product|fastdebug|debug}, \

hotspot/make/linux/Makefile

@@ -59,7 +59,7 @@ include ../../make/defs.make
 else
 include $(GAMMADIR)/make/defs.make
 endif
-include $(GAMMADIR)/build/$(OSNAME)/makefiles/rules.make
+include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
 
 ifndef LP64
 ifndef CC_INTERP
@@ -182,7 +182,7 @@ TARGETS_C1        = $(addsuffix 1,$(TARGETS))
 TARGETS_TIERED    = $(addsuffix tiered,$(TARGETS))
 TARGETS_CORE      = $(addsuffix core,$(TARGETS))
 
-BUILDTREE_MAKE    = $(GAMMADIR)/build/$(OSNAME)/makefiles/buildtree.make
+BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
 BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
 BUILDTREE_VARS   += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
 
@@ -225,24 +225,24 @@ check_j2se_version:
 	fi
 
 $(SUBDIRS_TIERED): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 	$(BUILDTREE) VARIANT=tiered
 
 $(SUBDIRS_C2): $(BUILDTREE_MAKE)
 ifdef FORCE_TIERED
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 		$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
 else
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 		$(BUILDTREE) VARIANT=compiler2
 endif
 
 $(SUBDIRS_C1): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 	$(BUILDTREE) VARIANT=compiler1
 
 $(SUBDIRS_CORE): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 	$(BUILDTREE) VARIANT=core
 
 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
@@ -284,7 +284,7 @@ treecore:  $(SUBDIRS_CORE)
 #     Hence create a docs directory beside ...$(ARCH)_[...]
 docs: checks
 	$(QUIETLY) mkdir -p $(SUBDIR_DOCS)
-	$(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs
+	$(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs
 
 # Synonyms for win32-like targets.
 compiler2:  jvmg product
@@ -301,7 +301,7 @@ clean_compiler1 clean_compiler2 clean_core:
 
 clean:  clean_compiler2 clean_compiler1 clean_core clean_docs
 
-include $(GAMMADIR)/build/$(OSNAME)/makefiles/cscope.make
+include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make
 
 #-------------------------------------------------------------------------------
 

hotspot/make/linux/build.sh

@@ -91,5 +91,5 @@ case ${Location} in
 esac
 
 echo \
-${GNUMAKE} -f ${Location}/build/linux/Makefile $Build_Options GAMMADIR=${Location}
-${GNUMAKE} -f ${Location}/build/linux/Makefile $Build_Options GAMMADIR=${Location}
+${GNUMAKE} -f ${Location}/make/linux/Makefile $Build_Options GAMMADIR=${Location}
+${GNUMAKE} -f ${Location}/make/linux/Makefile $Build_Options GAMMADIR=${Location}

hotspot/make/linux/makefiles/adlc.make

@@ -26,7 +26,7 @@
 # build directories.
 # It knows how to compile, link, and run the adlc.
 
-include $(GAMMADIR)/build/$(Platform_os_family)/makefiles/rules.make
+include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make
 
 # #########################################################################
 
@@ -138,7 +138,7 @@ endif
 # used to selectively update generated adlc files. This should
 # provide a nice compilation speed improvement.
 #
-ADLC_UPDATER_DIRECTORY = $(GAMMADIR)/build/$(OS)
+ADLC_UPDATER_DIRECTORY = $(GAMMADIR)/make/$(OS)
 ADLC_UPDATER = adlc_updater
 
 # This action refreshes all generated adlc files simultaneously.

hotspot/make/linux/makefiles/buildtree.make

@@ -64,9 +64,9 @@ QUIETLY$(MAKE_VERBOSE)	= @
 TESTFLAGS	= -Xbatch -showversion
 
 ifdef USE_SUNCC
-PLATFORM_FILE	= $(GAMMADIR)/build/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
+PLATFORM_FILE	= $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
 else
-PLATFORM_FILE   = $(GAMMADIR)/build/$(OS_FAMILY)/platform_$(BUILDARCH)
+PLATFORM_FILE   = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
 endif
 
 ifdef FORCE_TIERED
@@ -111,7 +111,7 @@ TARGETS      = debug fastdebug jvmg optimized product profiled
 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
 
 # For dependencies and recursive makes.
-BUILDTREE_MAKE	= $(GAMMADIR)/build/$(OS_FAMILY)/makefiles/buildtree.make
+BUILDTREE_MAKE	= $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
 
 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \
         env.sh env.csh .dbxrc test_gamma
@@ -133,19 +133,19 @@ endif
 ifndef HOTSPOT_BUILD_USER
   HOTSPOT_BUILD_USER := $(shell whoami)
 endif
-# Define HOTSPOT_VM_DISTRO based on settings in build/hotspot_distro
-# or build/closed/hotspot_distro.
+# Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro
+# or make/hotspot_distro.
 ifndef HOTSPOT_VM_DISTRO
   CLOSED_DIR_EXISTS := $(shell                \
-    if [ -d $(GAMMADIR)/build/closed ] ; then \
+    if [ -d $(GAMMADIR)/src/closed ] ; then \
       echo true;                              \
     else                                      \
       echo false;                             \
     fi)
   ifeq ($(CLOSED_DIR_EXISTS), true)
-    include $(GAMMADIR)/build/closed/hotspot_distro
+    include $(GAMMADIR)/make/hotspot_distro
   else
-    include $(GAMMADIR)/build/hotspot_distro
+    include $(GAMMADIR)/make/openjdk_distro
   endif
 endif
 
@@ -199,8 +199,8 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
 	    echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
 	    echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
 	) > $@
 
 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
@@ -209,8 +209,8 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
 	$(BUILDTREE_COMMENT); \
 	echo; \
 	[ "$(TARGET)" = profiled ] && \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/optimized.make"; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
 	) > $@
 
 ../shared_dirs.lst:  $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
@@ -226,7 +226,7 @@ Makefile: $(BUILDTREE_MAKE)
 	echo; \
 	echo include flags.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/top.make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/top.make"; \
 	) > $@
 
 vm.make: $(BUILDTREE_MAKE)
@@ -237,7 +237,7 @@ vm.make: $(BUILDTREE_MAKE)
 	echo include flags.make; \
 	echo include flags_vm.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(@F)"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
 	) > $@
 
 adlc.make: $(BUILDTREE_MAKE)
@@ -247,7 +247,7 @@ adlc.make: $(BUILDTREE_MAKE)
 	echo; \
 	echo include flags.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(@F)"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
 	) > $@
 
 jvmti.make: $(BUILDTREE_MAKE)
@@ -257,7 +257,7 @@ jvmti.make: $(BUILDTREE_MAKE)
 	echo; \
 	echo include flags.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(@F)"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
 	) > $@
 
 sa.make: $(BUILDTREE_MAKE)
@@ -267,7 +267,7 @@ sa.make: $(BUILDTREE_MAKE)
 	echo; \
 	echo include flags.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(@F)"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
 	) > $@
 
 env.sh: $(BUILDTREE_MAKE)
@@ -339,7 +339,7 @@ test_gamma:  $(BUILDTREE_MAKE)
 	echo "then"; \
 	echo "  $(WRONG_DATA_MODE_MSG); exit 0;"; \
 	echo "fi"; \
-	echo 'CLASSPATH="$(GAMMADIR)/build/$(OS_FAMILY):$$CLASSPATH"'; \
+	echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \
 	echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
 	echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
 	) > $@

hotspot/make/linux/makefiles/cscope.make

@@ -121,9 +121,9 @@ cscope cscope.out: cscope.files FORCE
 # relevant files first.
 cscope.files: .cscope.files.raw
 	echo "$(CSINCS)" > $@
-	-egrep -v "\.java|\/build\/"	$< >> $@
+	-egrep -v "\.java|\/make\/"	$< >> $@
 	-fgrep ".java"			$< >> $@
-	-fgrep "/build/"		$< >> $@
+	-fgrep "/make/"		$< >> $@
 
 .cscope.files.raw:  .nametable.files
 	-find $(CSDIRS) -type d \( $(CS_PRUNE) \) -prune -o \

hotspot/make/linux/makefiles/debug.make

@@ -30,7 +30,7 @@ DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@)
 CFLAGS += $(DEBUG_CFLAGS/BYFILE)
 
 # Linker mapfile
-MAPFILE = $(GAMMADIR)/build/linux/makefiles/mapfile-vers-debug
+MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
 
 _JUNK_ := $(shell echo -e >&2 ""\
  "----------------------------------------------------------------------\n" \

hotspot/make/linux/makefiles/fastdebug.make

@@ -56,7 +56,7 @@ CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
 # to inhibit the effect of the previous line on CFLAGS.
 
 # Linker mapfile
-MAPFILE = $(GAMMADIR)/build/linux/makefiles/mapfile-vers-debug
+MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
 
 G_SUFFIX =
 VERSION = optimized

hotspot/make/linux/makefiles/ia64.make

@@ -0,0 +1,43 @@
+#
+# Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#  
+#
+
+#
+# IA64 only uses c++ based interpreter
+CFLAGS += -DCC_INTERP -D_LP64=1 -DVM_LITTLE_ENDIAN
+# Hotspot uses very unstrict aliasing turn this optimization off
+OPT_CFLAGS += -fno-strict-aliasing
+ifeq ($(VERSION),debug)
+ASM_FLAGS= -DDEBUG
+else
+ASM_FLAGS=
+endif
+# workaround gcc bug in compiling varargs
+OPT_CFLAGS/jni.o = -O0
+
+# gcc/ia64 has a bug that internal gcc functions linked with libjvm.so
+# are made public. Hiding those symbols will cause undefined symbol error
+# when VM is dropped into older JDK. We probably will need an IA64
+# mapfile to include those symbols as a workaround. Disable linker mapfile 
+# for now.
+LDNOMAP=true

hotspot/make/linux/makefiles/jvmg.make

@@ -33,7 +33,7 @@ CFLAGS += $(DEBUG_CFLAGS/BYFILE)
 # to inhibit the effect of the previous line on CFLAGS.
 
 # Linker mapfile
-MAPFILE = $(GAMMADIR)/build/linux/makefiles/mapfile-vers-debug
+MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
 
 G_SUFFIX =
 VERSION = debug

hotspot/make/linux/makefiles/jvmti.make

@@ -27,7 +27,7 @@
 #
 # It knows how to build and run the tools to generate jvmti.
 
-include $(GAMMADIR)/build/linux/makefiles/rules.make
+include $(GAMMADIR)/make/linux/makefiles/rules.make
 
 # #########################################################################
 

hotspot/make/linux/makefiles/makedeps.make

@@ -22,7 +22,7 @@
 #  
 #
 
-include $(GAMMADIR)/build/linux/makefiles/rules.make
+include $(GAMMADIR)/make/linux/makefiles/rules.make
 
 COMPILE.JAVAC.FLAGS += -d $(OUTDIR)
 

hotspot/make/linux/makefiles/optimized.make

@@ -38,7 +38,7 @@ CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
 # to inhibit the effect of the previous line on CFLAGS.
 
 # Linker mapfile
-MAPFILE = $(GAMMADIR)/build/linux/makefiles/mapfile-vers-debug
+MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
 
 G_SUFFIX =
 VERSION = optimized

hotspot/make/linux/makefiles/product.make

@@ -38,7 +38,7 @@ CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
 # to inhibit the effect of the previous line on CFLAGS.
 
 # Linker mapfile
-MAPFILE = $(GAMMADIR)/build/linux/makefiles/mapfile-vers-product
+MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-product
 
 G_SUFFIX =
 SYSDEFS += -DPRODUCT

hotspot/make/linux/makefiles/sa.make

@@ -28,11 +28,11 @@
 # This makefile is used to build Serviceability Agent java code
 # and generate JNI header file for native methods.
 
-include $(GAMMADIR)/build/linux/makefiles/rules.make
+include $(GAMMADIR)/make/linux/makefiles/rules.make
 
 AGENT_DIR = $(GAMMADIR)/agent
 
-include $(GAMMADIR)/build/sa.files
+include $(GAMMADIR)/make/sa.files
 
 TOPDIR    = $(shell echo `pwd`)
 GENERATED = $(TOPDIR)/../generated

hotspot/make/linux/makefiles/sparc.make

@@ -0,0 +1,27 @@
+#
+# Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#  
+#
+
+# Not included in includeDB because it has no dependencies
+Obj_Files += linux_sparc.o
+

hotspot/make/linux/makefiles/sparcv9.make

@@ -0,0 +1,31 @@
+#
+# Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#  
+
+#
+# Not included in includeDB because it has no dependencies
+Obj_Files += linux_sparc.o
+
+# gcc 4.0 miscompiles this code in -m64
+OPT_CFLAGS/macro.o = -O0
+
+CFLAGS += -D_LP64=1

hotspot/make/linux/makefiles/top.make

@@ -46,7 +46,7 @@ Plat_File   = $(Platform_file)
 CDG         = cd $(GENERATED); 
 
 # Pick up MakeDeps' sources and definitions
-include $(GAMMADIR)/build/$(Platform_os_family)/makefiles/makedeps.make
+include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/makedeps.make
 MakeDepsClass = MakeDeps.class
 
 ifdef USE_PRECOMPILED_HEADER
@@ -153,7 +153,7 @@ sa_stuff:
 # resets -jN to -j1 for recursive runs.  (How helpful.)
 # Note that the user must specify the desired parallelism level via a
 # command-line or environment variable name HOTSPOT_BUILD_JOBS.
-$(adjust-mflags): $(GAMMADIR)/build/$(Platform_os_family)/makefiles/adjust-mflags.sh
+$(adjust-mflags): $(GAMMADIR)/make/$(Platform_os_family)/makefiles/adjust-mflags.sh
 	@+rm -f $@ $@+
 	@+cat $< > $@+
 	@+chmod +x $@+

hotspot/make/linux/makefiles/vm.make

@@ -26,7 +26,7 @@
 # directory.
 
 # Common build rules.
-MAKEFILES_DIR=$(GAMMADIR)/build/$(Platform_os_family)/makefiles
+MAKEFILES_DIR=$(GAMMADIR)/make/$(Platform_os_family)/makefiles
 include $(MAKEFILES_DIR)/rules.make
 
 default: build

hotspot/make/linux/platform_ia64

@@ -0,0 +1,15 @@
+os_family = linux
+
+arch = ia64
+
+os_arch = linux_ia64
+
+lib_arch = ia64
+
+compiler = gcc
+
+gnu_dis_arch = ia64
+
+sysdefs = -DLINUX -D_GNU_SOURCE -DIA64 -DCC_INTERP
+
+mark_style = alignment

hotspot/make/solaris/Makefile

@@ -50,7 +50,7 @@ include ../../make/defs.make
 else
 include $(GAMMADIR)/make/defs.make
 endif
-include $(GAMMADIR)/build/$(OSNAME)/makefiles/rules.make
+include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
 
 ifndef LP64
 ifndef CC_INTERP
@@ -165,7 +165,7 @@ TARGETS_TIERED    = $(addsuffix tiered,$(TARGETS))
 TARGETS_CORE      = $(addsuffix core,$(TARGETS))
 TARGETS_KERNEL    = $(addsuffix kernel,$(TARGETS))
 
-BUILDTREE_MAKE    = $(GAMMADIR)/build/$(OSNAME)/makefiles/buildtree.make
+BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
 BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
 BUILDTREE_VARS   += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
 
@@ -208,28 +208,28 @@ check_j2se_version:
 	fi
 
 $(SUBDIRS_TIERED): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 	$(BUILDTREE) VARIANT=tiered
 
 $(SUBDIRS_C2): $(BUILDTREE_MAKE)
 ifdef FORCE_TIERED
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 		$(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
 else
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 		$(BUILDTREE) VARIANT=compiler2
 endif
 
 $(SUBDIRS_C1): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 	$(BUILDTREE) VARIANT=compiler1
 
 $(SUBDIRS_CORE): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 	$(BUILDTREE) VARIANT=core
 
 $(SUBDIRS_KERNEL): $(BUILDTREE_MAKE)
-	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/Makefile checks
+	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
 	$(BUILDTREE) VARIANT=kernel
 
 # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
@@ -279,7 +279,7 @@ treekernel:  $(SUBDIRS_KERNEL)
 #     Hence create a docs directory beside ...$(ARCH)_[...]
 docs: checks
 	$(QUIETLY) mkdir -p $(SUBDIR_DOCS)
-	$(MAKE) -f $(GAMMADIR)/build/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs
+	$(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs
 
 # Synonyms for win32-like targets.
 compiler2:  jvmg product
@@ -296,7 +296,7 @@ clean_compiler1 clean_compiler2 clean_core clean_kernel:
 
 clean:  clean_compiler2 clean_compiler1 clean_core clean_docs clean_kernel
 
-include $(GAMMADIR)/build/$(OSNAME)/makefiles/cscope.make
+include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make
 
 #-------------------------------------------------------------------------------
 

hotspot/make/solaris/build.sh

@@ -121,7 +121,7 @@ case ${ws_path} in
 esac
 
 echo \
-${GNUMAKE} -f ${ws_path}/build/solaris/Makefile \
+${GNUMAKE} -f ${ws_path}/make/solaris/Makefile \
     $config GAMMADIR=${ws_path} $options
-${GNUMAKE} -f ${ws_path}/build/solaris/Makefile \
+${GNUMAKE} -f ${ws_path}/make/solaris/Makefile \
     $config GAMMADIR=${ws_path} $options

hotspot/make/solaris/makefiles/adlc.make

@@ -26,7 +26,7 @@
 # build directories.
 # It knows how to compile, link, and run the adlc.
 
-include $(GAMMADIR)/build/$(Platform_os_family)/makefiles/rules.make
+include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/rules.make
 
 # #########################################################################
 
@@ -154,7 +154,7 @@ endif
 # used to selectively update generated adlc files. This should
 # provide a nice compilation speed improvement.
 #
-ADLC_UPDATER_DIRECTORY = $(GAMMADIR)/build/$(OS)
+ADLC_UPDATER_DIRECTORY = $(GAMMADIR)/make/$(OS)
 ADLC_UPDATER = adlc_updater
 
 # This action refreshes all generated adlc files simultaneously.

hotspot/make/solaris/makefiles/buildtree.make

@@ -65,10 +65,10 @@ TESTFLAGS	= -Xbatch -showversion
 
 ### maye ARCH_XXX instead?
 ifdef USE_GCC
-PLATFORM_FILE	= $(GAMMADIR)/build/$(OS_FAMILY)/platform_$(BUILDARCH).gcc
+PLATFORM_FILE	= $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).gcc
 GCC_LIB         = /usr/local/lib
 else
-PLATFORM_FILE	= $(GAMMADIR)/build/$(OS_FAMILY)/platform_$(BUILDARCH)
+PLATFORM_FILE	= $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
 GCC_LIB         = 
 endif
 
@@ -114,7 +114,7 @@ TARGETS      = debug fastdebug jvmg optimized product profiled
 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
 
 # For dependencies and recursive makes.
-BUILDTREE_MAKE	= $(GAMMADIR)/build/$(OS_FAMILY)/makefiles/buildtree.make
+BUILDTREE_MAKE	= $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
 
 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \
         env.ksh env.csh .dbxrc test_gamma
@@ -136,19 +136,19 @@ endif
 ifndef HOTSPOT_BUILD_USER
   HOTSPOT_BUILD_USER := $(shell whoami)
 endif
-# Define HOTSPOT_VM_DISTRO based on settings in build/hotspot_distro
-# or build/closed/hotspot_distro.
+# Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro
+# or make/hotspot_distro.
 ifndef HOTSPOT_VM_DISTRO
   CLOSED_DIR_EXISTS := $(shell                \
-    if [ -d $(GAMMADIR)/build/closed ] ; then \
+    if [ -d $(GAMMADIR)/src/closed ] ; then \
       echo true;                              \
     else                                      \
       echo false;                             \
     fi)
   ifeq ($(CLOSED_DIR_EXISTS), true)
-    include $(GAMMADIR)/build/closed/hotspot_distro
+    include $(GAMMADIR)/make/hotspot_distro
   else
-    include $(GAMMADIR)/build/hotspot_distro
+    include $(GAMMADIR)/make/openjdk_distro
   endif
 endif
 
@@ -203,8 +203,8 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
 	    echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
 	    echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
 	) > $@
 
 flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
@@ -213,8 +213,8 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
 	$(BUILDTREE_COMMENT); \
 	echo; \
 	[ "$(TARGET)" = profiled ] && \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/optimized.make"; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
 	) > $@
 
 ../shared_dirs.lst:  $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
@@ -230,7 +230,7 @@ Makefile: $(BUILDTREE_MAKE)
 	echo; \
 	echo include flags.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/top.make"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/top.make"; \
 	) > $@
 
 vm.make: $(BUILDTREE_MAKE)
@@ -241,7 +241,7 @@ vm.make: $(BUILDTREE_MAKE)
 	echo include flags.make; \
 	echo include flags_vm.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(@F)"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
 	) > $@
 
 adlc.make: $(BUILDTREE_MAKE)
@@ -251,7 +251,7 @@ adlc.make: $(BUILDTREE_MAKE)
 	echo; \
 	echo include flags.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(@F)"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
 	) > $@
 
 jvmti.make: $(BUILDTREE_MAKE)
@@ -261,7 +261,7 @@ jvmti.make: $(BUILDTREE_MAKE)
 	echo; \
 	echo include flags.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(@F)"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
 	) > $@
 
 sa.make: $(BUILDTREE_MAKE)
@@ -271,7 +271,7 @@ sa.make: $(BUILDTREE_MAKE)
 	echo; \
 	echo include flags.make; \
 	echo; \
-	echo "include \$$(GAMMADIR)/build/$(OS_FAMILY)/makefiles/$(@F)"; \
+	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
 	) > $@
 
 env.ksh: $(BUILDTREE_MAKE)
@@ -351,7 +351,7 @@ test_gamma:  $(BUILDTREE_MAKE)
 	echo "then"; \
 	echo "  $(WRONG_DATA_MODE_MSG); exit 0;"; \
 	echo "fi"; \
-	echo 'CLASSPATH="$(GAMMADIR)/build/$(OS_FAMILY):$$CLASSPATH"'; \
+	echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \
 	echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
 	echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
 	) > $@

hotspot/make/solaris/makefiles/cscope.make

@@ -40,7 +40,7 @@ NAWK	= /usr/xpg4/bin/awk
 RM	= rm -f
 CS_TOP	= ../..
 
-CSDIRS	= $(CS_TOP)/src $(CS_TOP)/build
+CSDIRS	= $(CS_TOP)/src $(CS_TOP)/make
 CSINCS	= $(CSDIRS:%=-I%)
 
 CSCOPE		= cscope
@@ -60,7 +60,7 @@ ifndef	CSHEADERS
 RMCCHEADERS=	-o -name CClassHeaders
 endif
 
-# Use CS_GENERATED=x to include auto-generated files in the build directories.
+# Use CS_GENERATED=x to include auto-generated files in the make directories.
 ifdef	CS_GENERATED
 CS_ADD_GENERATED	= -o -name '*.incl'
 else
@@ -122,9 +122,9 @@ cscope cscope.out: cscope.files FORCE
 # relevant files first.
 cscope.files: .cscope.files.raw
 	echo "$(CSINCS)" > $@
-	-egrep -v "\.java|\/build\/"	$< >> $@
+	-egrep -v "\.java|\/make\/"	$< >> $@
 	-fgrep ".java"			$< >> $@
-	-fgrep "/build/"		$< >> $@
+	-fgrep "/make/"		$< >> $@
 
 .cscope.files.raw:  .nametable.files
 	-find $(CSDIRS) -type d \( $(CS_PRUNE) \) -prune -o \

hotspot/make/solaris/makefiles/debug.make

@@ -39,13 +39,13 @@ endif
 CFLAGS += $(DEBUG_CFLAGS/BYFILE)
 
 # Linker mapfiles
-MAPFILE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers \
-          $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-debug \
-          $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-nonproduct
+MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
+          $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug \
+          $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
 
 # This mapfile is only needed when compiling with dtrace support, 
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-$(TYPE)
+MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
 _JUNK_ := $(shell echo >&2 ""\
  "-------------------------------------------------------------------------\n" \

hotspot/make/solaris/makefiles/fastdebug.make

@@ -100,13 +100,13 @@ DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@)
 CFLAGS += $(DEBUG_CFLAGS/BYFILE)
 
 # Linker mapfiles
-MAPFILE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers \
-	  $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-debug \
-	  $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-nonproduct
+MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
+	  $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug \
+	  $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
 
 # This mapfile is only needed when compiling with dtrace support, 
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-$(TYPE)
+MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
 
 G_SUFFIX =

hotspot/make/solaris/makefiles/jvmg.make

@@ -42,13 +42,13 @@ CFLAGS += $(DEBUG_CFLAGS/BYFILE)
 # to inhibit the effect of the previous line on CFLAGS.
 
 # Linker mapfiles
-MAPFILE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers \
-          $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-debug \
-          $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-nonproduct
+MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
+          $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug \
+          $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
 
 # This mapfile is only needed when compiling with dtrace support,
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-$(TYPE)
+MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
 G_SUFFIX =
 VERSION = debug

hotspot/make/solaris/makefiles/jvmti.make

@@ -27,7 +27,7 @@
 #
 # It knows how to build and run the tools to generate jvmti.
 
-include $(GAMMADIR)/build/solaris/makefiles/rules.make
+include $(GAMMADIR)/make/solaris/makefiles/rules.make
 
 # #########################################################################
 

hotspot/make/solaris/makefiles/makedeps.make

@@ -22,7 +22,7 @@
 #  
 #
 
-include $(GAMMADIR)/build/solaris/makefiles/rules.make
+include $(GAMMADIR)/make/solaris/makefiles/rules.make
 
 COMPILE.JAVAC.FLAGS += -d $(OUTDIR)
 

hotspot/make/solaris/makefiles/optimized.make

@@ -43,12 +43,12 @@ CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
 
 # Linker mapfiles
 # NOTE: inclusion of nonproduct mapfile not necessary; read it for details
-MAPFILE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers \
-          $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-nonproduct
+MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
+          $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
 
 # This mapfile is only needed when compiling with dtrace support, 
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-$(TYPE)
+MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
 # Set the environment variable HOTSPARC_GENERIC to "true"
 # to inhibit the effect of the previous line on CFLAGS.

hotspot/make/solaris/makefiles/product.make

@@ -54,16 +54,16 @@ CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
 # Linker mapfiles
 # NOTE: inclusion of nonproduct mapfile not necessary; read it for details
 ifdef USE_GCC
-MAPFILE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers
+MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers
 else
-MAPFILE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers \
-          $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-nonproduct
+MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
+          $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
 
 # This mapfile is only needed when compiling with dtrace support, 
 # and mustn't be otherwise.
-MAPFILE_DTRACE = $(GAMMADIR)/build/solaris/makefiles/mapfile-vers-$(TYPE)
+MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
 
-REORDERFILE = $(GAMMADIR)/build/solaris/makefiles/reorder_$(TYPE)_$(BUILDARCH)
+REORDERFILE = $(GAMMADIR)/make/solaris/makefiles/reorder_$(TYPE)_$(BUILDARCH)
 endif
 
 # Don't strip in VM build; JDK build will strip libraries later