diff --git a/hotspot/.hgignore b/hotspot/.hgignore index 8c4cff4cd1f8685e8aab6e2c95f8e35d63a77143..ca1b0b21ee28363f9db52bbf650c3bbf1dba9d8b 100644 --- a/hotspot/.hgignore +++ b/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/ diff --git a/hotspot/build/windows/projectfiles/tiered/vm.def b/hotspot/build/windows/projectfiles/tiered/vm.def deleted file mode 100644 index 4475c606215cfeb811754d0177ce5742a5c9c117..0000000000000000000000000000000000000000 --- a/hotspot/build/windows/projectfiles/tiered/vm.def +++ /dev/null @@ -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). -; diff --git a/hotspot/make/defs.make b/hotspot/make/defs.make index f3e686ae54edf9a3ad8633a75c058d94cf29f84a..056d90c484667668d6fe3b9fce57a7b2c911bcee 100644 --- a/hotspot/make/defs.make +++ b/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. diff --git a/hotspot/make/hotspot_distro b/hotspot/make/hotspot_distro new file mode 100644 index 0000000000000000000000000000000000000000..9b111a2b3ec6e986f00097e749b60ca86a5f0a41 --- /dev/null +++ b/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 diff --git a/hotspot/make/jprt.properties b/hotspot/make/jprt.properties index 1e9f5fb6413f075f418068e4e39b0b4801ca04de..fd5a75de04236ba1b405ac59966c457e1c160cc9 100644 --- a/hotspot/make/jprt.properties +++ b/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}, \ diff --git a/hotspot/build/linux/Makefile b/hotspot/make/linux/Makefile similarity index 94% rename from hotspot/build/linux/Makefile rename to hotspot/make/linux/Makefile index 106344f0dbea23257b46d2dbfa5c6c32d73b753a..0e1ee65277a0c2e0652e846adff887ac53f6245c 100644 --- a/hotspot/build/linux/Makefile +++ b/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 #------------------------------------------------------------------------------- diff --git a/hotspot/build/linux/Queens.class b/hotspot/make/linux/Queens.class similarity index 100% rename from hotspot/build/linux/Queens.class rename to hotspot/make/linux/Queens.class diff --git a/hotspot/build/linux/README b/hotspot/make/linux/README similarity index 100% rename from hotspot/build/linux/README rename to hotspot/make/linux/README diff --git a/hotspot/build/linux/adlc_updater b/hotspot/make/linux/adlc_updater similarity index 100% rename from hotspot/build/linux/adlc_updater rename to hotspot/make/linux/adlc_updater diff --git a/hotspot/build/linux/build.sh b/hotspot/make/linux/build.sh similarity index 94% rename from hotspot/build/linux/build.sh rename to hotspot/make/linux/build.sh index a8b2630e3cfd141d12668af703b959dd84321a80..4239c6dcbe943ec98dd4355b4852f80336247608 100644 --- a/hotspot/build/linux/build.sh +++ b/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} diff --git a/hotspot/build/linux/makefiles/adjust-mflags.sh b/hotspot/make/linux/makefiles/adjust-mflags.sh similarity index 100% rename from hotspot/build/linux/makefiles/adjust-mflags.sh rename to hotspot/make/linux/makefiles/adjust-mflags.sh diff --git a/hotspot/build/linux/makefiles/adlc.make b/hotspot/make/linux/makefiles/adlc.make similarity index 98% rename from hotspot/build/linux/makefiles/adlc.make rename to hotspot/make/linux/makefiles/adlc.make index 9ed67794f07e7720ea662c85914b12ef7edec1ac..16e48c84ed52a698957e880d3e49e039496e97ae 100644 --- a/hotspot/build/linux/makefiles/adlc.make +++ b/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. diff --git a/hotspot/build/linux/makefiles/amd64.make b/hotspot/make/linux/makefiles/amd64.make similarity index 100% rename from hotspot/build/linux/makefiles/amd64.make rename to hotspot/make/linux/makefiles/amd64.make diff --git a/hotspot/build/linux/makefiles/buildtree.make b/hotspot/make/linux/makefiles/buildtree.make similarity index 89% rename from hotspot/build/linux/makefiles/buildtree.make rename to hotspot/make/linux/makefiles/buildtree.make index a71aa64f12e71c3fa454b5e81d312eb649ec2cea..54a30d2ad0a25fceed9f1f1261e4271b15812758 100644 --- a/hotspot/build/linux/makefiles/buildtree.make +++ b/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'; \ ) > $@ diff --git a/hotspot/build/linux/makefiles/compiler1.make b/hotspot/make/linux/makefiles/compiler1.make similarity index 100% rename from hotspot/build/linux/makefiles/compiler1.make rename to hotspot/make/linux/makefiles/compiler1.make diff --git a/hotspot/build/linux/makefiles/compiler2.make b/hotspot/make/linux/makefiles/compiler2.make similarity index 100% rename from hotspot/build/linux/makefiles/compiler2.make rename to hotspot/make/linux/makefiles/compiler2.make diff --git a/hotspot/build/linux/makefiles/core.make b/hotspot/make/linux/makefiles/core.make similarity index 100% rename from hotspot/build/linux/makefiles/core.make rename to hotspot/make/linux/makefiles/core.make diff --git a/hotspot/build/linux/makefiles/cscope.make b/hotspot/make/linux/makefiles/cscope.make similarity index 98% rename from hotspot/build/linux/makefiles/cscope.make rename to hotspot/make/linux/makefiles/cscope.make index 149da2658700e09cfb6323b2c924652bbd170e91..a5b3c24078b3836e95bf107a81c5b8c9d67acfbc 100644 --- a/hotspot/build/linux/makefiles/cscope.make +++ b/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 \ diff --git a/hotspot/build/linux/makefiles/debug.make b/hotspot/make/linux/makefiles/debug.make similarity index 96% rename from hotspot/build/linux/makefiles/debug.make rename to hotspot/make/linux/makefiles/debug.make index 0ef44d6200acc831737c5782d1c47d0a3100cd7a..75bb950891dda197d09e43774ed0c79066dd9485 100644 --- a/hotspot/build/linux/makefiles/debug.make +++ b/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" \ diff --git a/hotspot/build/linux/makefiles/defs.make b/hotspot/make/linux/makefiles/defs.make similarity index 100% rename from hotspot/build/linux/makefiles/defs.make rename to hotspot/make/linux/makefiles/defs.make diff --git a/hotspot/build/linux/makefiles/dtrace.make b/hotspot/make/linux/makefiles/dtrace.make similarity index 100% rename from hotspot/build/linux/makefiles/dtrace.make rename to hotspot/make/linux/makefiles/dtrace.make diff --git a/hotspot/build/linux/makefiles/fastdebug.make b/hotspot/make/linux/makefiles/fastdebug.make similarity index 97% rename from hotspot/build/linux/makefiles/fastdebug.make rename to hotspot/make/linux/makefiles/fastdebug.make index 628f8bb99ba877f827664b79ea3567336358d113..c7ae47ac96600a8583e5023c9e84bf03034f4054 100644 --- a/hotspot/build/linux/makefiles/fastdebug.make +++ b/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 diff --git a/hotspot/build/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make similarity index 100% rename from hotspot/build/linux/makefiles/gcc.make rename to hotspot/make/linux/makefiles/gcc.make diff --git a/hotspot/build/linux/makefiles/hp.make b/hotspot/make/linux/makefiles/hp.make similarity index 100% rename from hotspot/build/linux/makefiles/hp.make rename to hotspot/make/linux/makefiles/hp.make diff --git a/hotspot/build/linux/makefiles/hp1.make b/hotspot/make/linux/makefiles/hp1.make similarity index 100% rename from hotspot/build/linux/makefiles/hp1.make rename to hotspot/make/linux/makefiles/hp1.make diff --git a/hotspot/build/linux/makefiles/i486.make b/hotspot/make/linux/makefiles/i486.make similarity index 100% rename from hotspot/build/linux/makefiles/i486.make rename to hotspot/make/linux/makefiles/i486.make diff --git a/hotspot/make/linux/makefiles/ia64.make b/hotspot/make/linux/makefiles/ia64.make new file mode 100644 index 0000000000000000000000000000000000000000..b7c3aa27777312542efe93db2e89fbf1c4103467 --- /dev/null +++ b/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 diff --git a/hotspot/build/linux/makefiles/jsig.make b/hotspot/make/linux/makefiles/jsig.make similarity index 100% rename from hotspot/build/linux/makefiles/jsig.make rename to hotspot/make/linux/makefiles/jsig.make diff --git a/hotspot/build/linux/makefiles/jvmg.make b/hotspot/make/linux/makefiles/jvmg.make similarity index 96% rename from hotspot/build/linux/makefiles/jvmg.make rename to hotspot/make/linux/makefiles/jvmg.make index dcdb2e82bb56676199b88a1b6e69a537c34dfc14..9bf70b45e1b7fc134726d5cd136621c8540680f7 100644 --- a/hotspot/build/linux/makefiles/jvmg.make +++ b/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 diff --git a/hotspot/build/linux/makefiles/jvmti.make b/hotspot/make/linux/makefiles/jvmti.make similarity index 98% rename from hotspot/build/linux/makefiles/jvmti.make rename to hotspot/make/linux/makefiles/jvmti.make index d00e773aea1cdfd0c9ade3566f5329358c9d5f40..a73624857f8ce949bb5b14a900be3bae409fb8a9 100644 --- a/hotspot/build/linux/makefiles/jvmti.make +++ b/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 # ######################################################################### diff --git a/hotspot/build/linux/makefiles/launcher.make b/hotspot/make/linux/makefiles/launcher.make similarity index 100% rename from hotspot/build/linux/makefiles/launcher.make rename to hotspot/make/linux/makefiles/launcher.make diff --git a/hotspot/build/linux/makefiles/makedeps.make b/hotspot/make/linux/makefiles/makedeps.make similarity index 97% rename from hotspot/build/linux/makefiles/makedeps.make rename to hotspot/make/linux/makefiles/makedeps.make index d503926456ecc9863039f4f9f2f9340dd2cd9006..7bb452ace3329aafc10a4559ef2608bf759a2ac7 100644 --- a/hotspot/build/linux/makefiles/makedeps.make +++ b/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) diff --git a/hotspot/build/linux/makefiles/mapfile-vers-debug b/hotspot/make/linux/makefiles/mapfile-vers-debug similarity index 100% rename from hotspot/build/linux/makefiles/mapfile-vers-debug rename to hotspot/make/linux/makefiles/mapfile-vers-debug diff --git a/hotspot/build/linux/makefiles/mapfile-vers-jsig b/hotspot/make/linux/makefiles/mapfile-vers-jsig similarity index 100% rename from hotspot/build/linux/makefiles/mapfile-vers-jsig rename to hotspot/make/linux/makefiles/mapfile-vers-jsig diff --git a/hotspot/build/linux/makefiles/mapfile-vers-product b/hotspot/make/linux/makefiles/mapfile-vers-product similarity index 100% rename from hotspot/build/linux/makefiles/mapfile-vers-product rename to hotspot/make/linux/makefiles/mapfile-vers-product diff --git a/hotspot/build/linux/makefiles/optimized.make b/hotspot/make/linux/makefiles/optimized.make similarity index 96% rename from hotspot/build/linux/makefiles/optimized.make rename to hotspot/make/linux/makefiles/optimized.make index d85775f6c6a477e1dc53c3e64ace3049d994a558..0d6aff8e91d1a04ed63c79d83f059673a6ca5d46 100644 --- a/hotspot/build/linux/makefiles/optimized.make +++ b/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 diff --git a/hotspot/build/linux/makefiles/product.make b/hotspot/make/linux/makefiles/product.make similarity index 96% rename from hotspot/build/linux/makefiles/product.make rename to hotspot/make/linux/makefiles/product.make index 6b6ccab740b62e1ba63b7edae2567e116b35b901..a128c1101fa04ee56420edb6dc7244a7128b895d 100644 --- a/hotspot/build/linux/makefiles/product.make +++ b/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 diff --git a/hotspot/build/linux/makefiles/profiled.make b/hotspot/make/linux/makefiles/profiled.make similarity index 100% rename from hotspot/build/linux/makefiles/profiled.make rename to hotspot/make/linux/makefiles/profiled.make diff --git a/hotspot/build/linux/makefiles/rules.make b/hotspot/make/linux/makefiles/rules.make similarity index 100% rename from hotspot/build/linux/makefiles/rules.make rename to hotspot/make/linux/makefiles/rules.make diff --git a/hotspot/build/linux/makefiles/sa.make b/hotspot/make/linux/makefiles/sa.make similarity index 97% rename from hotspot/build/linux/makefiles/sa.make rename to hotspot/make/linux/makefiles/sa.make index 83551b87a4ed405cd2fd0de0a679dd326f2a16d1..41843c5887d87117cc6fd3856465a38cc2dea80b 100644 --- a/hotspot/build/linux/makefiles/sa.make +++ b/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 diff --git a/hotspot/build/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make similarity index 100% rename from hotspot/build/linux/makefiles/saproc.make rename to hotspot/make/linux/makefiles/saproc.make diff --git a/hotspot/make/linux/makefiles/sparc.make b/hotspot/make/linux/makefiles/sparc.make new file mode 100644 index 0000000000000000000000000000000000000000..a86f9f7b6f5c0be01b15e2325a5f719487e34a02 --- /dev/null +++ b/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 + diff --git a/hotspot/build/linux/makefiles/sparcWorks.make b/hotspot/make/linux/makefiles/sparcWorks.make similarity index 100% rename from hotspot/build/linux/makefiles/sparcWorks.make rename to hotspot/make/linux/makefiles/sparcWorks.make diff --git a/hotspot/make/linux/makefiles/sparcv9.make b/hotspot/make/linux/makefiles/sparcv9.make new file mode 100644 index 0000000000000000000000000000000000000000..7aad864e51c063d46152e3c41d72355ae07879b7 --- /dev/null +++ b/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 diff --git a/hotspot/build/linux/makefiles/tiered.make b/hotspot/make/linux/makefiles/tiered.make similarity index 100% rename from hotspot/build/linux/makefiles/tiered.make rename to hotspot/make/linux/makefiles/tiered.make diff --git a/hotspot/build/linux/makefiles/top.make b/hotspot/make/linux/makefiles/top.make similarity index 97% rename from hotspot/build/linux/makefiles/top.make rename to hotspot/make/linux/makefiles/top.make index 5da9a12d04fd508a755a72b30cd939ab1b533242..f0aa13576d0f624cdb04dda71699a1f514b6e6e7 100644 --- a/hotspot/build/linux/makefiles/top.make +++ b/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 $@+ diff --git a/hotspot/build/linux/makefiles/vm.make b/hotspot/make/linux/makefiles/vm.make similarity index 99% rename from hotspot/build/linux/makefiles/vm.make rename to hotspot/make/linux/makefiles/vm.make index 567e6779145f92161ac3fdfe843ac8d0a8f56fb9..0612cb159ed04e00c105d2935638de2269c3ba72 100644 --- a/hotspot/build/linux/makefiles/vm.make +++ b/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 diff --git a/hotspot/build/linux/platform_amd64 b/hotspot/make/linux/platform_amd64 similarity index 100% rename from hotspot/build/linux/platform_amd64 rename to hotspot/make/linux/platform_amd64 diff --git a/hotspot/build/linux/platform_amd64.suncc b/hotspot/make/linux/platform_amd64.suncc similarity index 100% rename from hotspot/build/linux/platform_amd64.suncc rename to hotspot/make/linux/platform_amd64.suncc diff --git a/hotspot/build/linux/platform_i486 b/hotspot/make/linux/platform_i486 similarity index 100% rename from hotspot/build/linux/platform_i486 rename to hotspot/make/linux/platform_i486 diff --git a/hotspot/build/linux/platform_i486.suncc b/hotspot/make/linux/platform_i486.suncc similarity index 100% rename from hotspot/build/linux/platform_i486.suncc rename to hotspot/make/linux/platform_i486.suncc diff --git a/hotspot/make/linux/platform_ia64 b/hotspot/make/linux/platform_ia64 new file mode 100644 index 0000000000000000000000000000000000000000..7474e5bf92345b42478f304000932bec3825cbdc --- /dev/null +++ b/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 diff --git a/hotspot/build/linux/platform_sparc b/hotspot/make/linux/platform_sparc similarity index 100% rename from hotspot/build/linux/platform_sparc rename to hotspot/make/linux/platform_sparc diff --git a/hotspot/build/hotspot_distro b/hotspot/make/openjdk_distro similarity index 100% rename from hotspot/build/hotspot_distro rename to hotspot/make/openjdk_distro diff --git a/hotspot/build/sa.files b/hotspot/make/sa.files similarity index 100% rename from hotspot/build/sa.files rename to hotspot/make/sa.files diff --git a/hotspot/build/solaris/Makefile b/hotspot/make/solaris/Makefile similarity index 94% rename from hotspot/build/solaris/Makefile rename to hotspot/make/solaris/Makefile index 0a7615aa794de845759fa8712ac4756cc2ff427b..0751fe9eb53a9c3431df0122f0c2a043bf5f7c20 100644 --- a/hotspot/build/solaris/Makefile +++ b/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 #------------------------------------------------------------------------------- diff --git a/hotspot/build/solaris/Queens.class b/hotspot/make/solaris/Queens.class similarity index 100% rename from hotspot/build/solaris/Queens.class rename to hotspot/make/solaris/Queens.class diff --git a/hotspot/build/solaris/adlc_updater b/hotspot/make/solaris/adlc_updater similarity index 100% rename from hotspot/build/solaris/adlc_updater rename to hotspot/make/solaris/adlc_updater diff --git a/hotspot/build/solaris/build.sh b/hotspot/make/solaris/build.sh similarity index 97% rename from hotspot/build/solaris/build.sh rename to hotspot/make/solaris/build.sh index 57920f388ba952432f98bbcaa4be71ef611f8594..bb8d175758c164de9f4252dc7b0ccb0188b52c71 100644 --- a/hotspot/build/solaris/build.sh +++ b/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 diff --git a/hotspot/build/solaris/makefiles/adjust-mflags.sh b/hotspot/make/solaris/makefiles/adjust-mflags.sh similarity index 100% rename from hotspot/build/solaris/makefiles/adjust-mflags.sh rename to hotspot/make/solaris/makefiles/adjust-mflags.sh diff --git a/hotspot/build/solaris/makefiles/adlc.make b/hotspot/make/solaris/makefiles/adlc.make similarity index 98% rename from hotspot/build/solaris/makefiles/adlc.make rename to hotspot/make/solaris/makefiles/adlc.make index 467c7d499ed1c9a4f266ece806c6cb555722749a..b67ae554da0f3f32a5d114ce268737e8b9863ef9 100644 --- a/hotspot/build/solaris/makefiles/adlc.make +++ b/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. diff --git a/hotspot/build/solaris/makefiles/amd64.make b/hotspot/make/solaris/makefiles/amd64.make similarity index 100% rename from hotspot/build/solaris/makefiles/amd64.make rename to hotspot/make/solaris/makefiles/amd64.make diff --git a/hotspot/build/solaris/makefiles/buildtree.make b/hotspot/make/solaris/makefiles/buildtree.make similarity index 90% rename from hotspot/build/solaris/makefiles/buildtree.make rename to hotspot/make/solaris/makefiles/buildtree.make index 84d2beb9ed2470f9c73447277d7118528c97c7aa..1fb22360dcab83bf2ada59ea25eee1a2e25515f4 100644 --- a/hotspot/build/solaris/makefiles/buildtree.make +++ b/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'; \ ) > $@ diff --git a/hotspot/build/solaris/makefiles/compiler1.make b/hotspot/make/solaris/makefiles/compiler1.make similarity index 100% rename from hotspot/build/solaris/makefiles/compiler1.make rename to hotspot/make/solaris/makefiles/compiler1.make diff --git a/hotspot/build/solaris/makefiles/compiler2.make b/hotspot/make/solaris/makefiles/compiler2.make similarity index 100% rename from hotspot/build/solaris/makefiles/compiler2.make rename to hotspot/make/solaris/makefiles/compiler2.make diff --git a/hotspot/build/solaris/makefiles/core.make b/hotspot/make/solaris/makefiles/core.make similarity index 100% rename from hotspot/build/solaris/makefiles/core.make rename to hotspot/make/solaris/makefiles/core.make diff --git a/hotspot/build/solaris/makefiles/cscope.make b/hotspot/make/solaris/makefiles/cscope.make similarity index 96% rename from hotspot/build/solaris/makefiles/cscope.make rename to hotspot/make/solaris/makefiles/cscope.make index 20644ec81512471a0a707749503b10ca462cac86..725925e567b8359413bd5845e963632bbbea4917 100644 --- a/hotspot/build/solaris/makefiles/cscope.make +++ b/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 \ diff --git a/hotspot/build/solaris/makefiles/debug.make b/hotspot/make/solaris/makefiles/debug.make similarity index 88% rename from hotspot/build/solaris/makefiles/debug.make rename to hotspot/make/solaris/makefiles/debug.make index f2a2786ecf682384b4e8e81f812e2ae06fe55023..d759910be9e83335bc6840f5ca8fed7986345735 100644 --- a/hotspot/build/solaris/makefiles/debug.make +++ b/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" \ diff --git a/hotspot/build/solaris/makefiles/defs.make b/hotspot/make/solaris/makefiles/defs.make similarity index 100% rename from hotspot/build/solaris/makefiles/defs.make rename to hotspot/make/solaris/makefiles/defs.make diff --git a/hotspot/build/solaris/makefiles/dtrace.make b/hotspot/make/solaris/makefiles/dtrace.make similarity index 100% rename from hotspot/build/solaris/makefiles/dtrace.make rename to hotspot/make/solaris/makefiles/dtrace.make diff --git a/hotspot/build/solaris/makefiles/fastdebug.make b/hotspot/make/solaris/makefiles/fastdebug.make similarity index 94% rename from hotspot/build/solaris/makefiles/fastdebug.make rename to hotspot/make/solaris/makefiles/fastdebug.make index 7f16a0e655b944bee759d5a1f5573e127a7b7fc9..0329b4c36783168994fa21419e780aebc4f47fff 100644 --- a/hotspot/build/solaris/makefiles/fastdebug.make +++ b/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 = diff --git a/hotspot/build/solaris/makefiles/gcc.make b/hotspot/make/solaris/makefiles/gcc.make similarity index 100% rename from hotspot/build/solaris/makefiles/gcc.make rename to hotspot/make/solaris/makefiles/gcc.make diff --git a/hotspot/build/solaris/makefiles/hp.make b/hotspot/make/solaris/makefiles/hp.make similarity index 100% rename from hotspot/build/solaris/makefiles/hp.make rename to hotspot/make/solaris/makefiles/hp.make diff --git a/hotspot/build/solaris/makefiles/hp1.make b/hotspot/make/solaris/makefiles/hp1.make similarity index 100% rename from hotspot/build/solaris/makefiles/hp1.make rename to hotspot/make/solaris/makefiles/hp1.make diff --git a/hotspot/build/solaris/makefiles/i486.make b/hotspot/make/solaris/makefiles/i486.make similarity index 100% rename from hotspot/build/solaris/makefiles/i486.make rename to hotspot/make/solaris/makefiles/i486.make diff --git a/hotspot/build/solaris/makefiles/jsig.make b/hotspot/make/solaris/makefiles/jsig.make similarity index 100% rename from hotspot/build/solaris/makefiles/jsig.make rename to hotspot/make/solaris/makefiles/jsig.make diff --git a/hotspot/build/solaris/makefiles/jvmg.make b/hotspot/make/solaris/makefiles/jvmg.make similarity index 87% rename from hotspot/build/solaris/makefiles/jvmg.make rename to hotspot/make/solaris/makefiles/jvmg.make index ee0e4616a3c3153ba75a7e804310c0ae35488ac0..24a3510d4a50810c905d196b4f50685c75726dfa 100644 --- a/hotspot/build/solaris/makefiles/jvmg.make +++ b/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 diff --git a/hotspot/build/solaris/makefiles/jvmti.make b/hotspot/make/solaris/makefiles/jvmti.make similarity index 98% rename from hotspot/build/solaris/makefiles/jvmti.make rename to hotspot/make/solaris/makefiles/jvmti.make index ba93d87975ca8784a609c37d0c61ee1256c577d4..876714eb55df90d6d970be15c85bb5739b9f22ad 100644 --- a/hotspot/build/solaris/makefiles/jvmti.make +++ b/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 # ######################################################################### diff --git a/hotspot/build/solaris/makefiles/kernel.make b/hotspot/make/solaris/makefiles/kernel.make similarity index 100% rename from hotspot/build/solaris/makefiles/kernel.make rename to hotspot/make/solaris/makefiles/kernel.make diff --git a/hotspot/build/solaris/makefiles/launcher.make b/hotspot/make/solaris/makefiles/launcher.make similarity index 100% rename from hotspot/build/solaris/makefiles/launcher.make rename to hotspot/make/solaris/makefiles/launcher.make diff --git a/hotspot/build/solaris/makefiles/makedeps.make b/hotspot/make/solaris/makefiles/makedeps.make similarity index 97% rename from hotspot/build/solaris/makefiles/makedeps.make rename to hotspot/make/solaris/makefiles/makedeps.make index 71c8f455bcc0c23b786378237ca526b0c198704a..12b01a7da9668256bc02cb51ef7e012e8447ac56 100644 --- a/hotspot/build/solaris/makefiles/makedeps.make +++ b/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) diff --git a/hotspot/build/solaris/makefiles/mapfile-vers b/hotspot/make/solaris/makefiles/mapfile-vers similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers rename to hotspot/make/solaris/makefiles/mapfile-vers diff --git a/hotspot/build/solaris/makefiles/mapfile-vers-COMPILER1 b/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1 similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers-COMPILER1 rename to hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1 diff --git a/hotspot/build/solaris/makefiles/mapfile-vers-COMPILER2 b/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2 similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers-COMPILER2 rename to hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2 diff --git a/hotspot/build/solaris/makefiles/mapfile-vers-CORE b/hotspot/make/solaris/makefiles/mapfile-vers-CORE similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers-CORE rename to hotspot/make/solaris/makefiles/mapfile-vers-CORE diff --git a/hotspot/build/solaris/makefiles/mapfile-vers-TIERED b/hotspot/make/solaris/makefiles/mapfile-vers-TIERED similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers-TIERED rename to hotspot/make/solaris/makefiles/mapfile-vers-TIERED diff --git a/hotspot/build/solaris/makefiles/mapfile-vers-debug b/hotspot/make/solaris/makefiles/mapfile-vers-debug similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers-debug rename to hotspot/make/solaris/makefiles/mapfile-vers-debug diff --git a/hotspot/build/solaris/makefiles/mapfile-vers-jsig b/hotspot/make/solaris/makefiles/mapfile-vers-jsig similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers-jsig rename to hotspot/make/solaris/makefiles/mapfile-vers-jsig diff --git a/hotspot/build/solaris/makefiles/mapfile-vers-jvm_db b/hotspot/make/solaris/makefiles/mapfile-vers-jvm_db similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers-jvm_db rename to hotspot/make/solaris/makefiles/mapfile-vers-jvm_db diff --git a/hotspot/build/solaris/makefiles/mapfile-vers-jvm_dtrace b/hotspot/make/solaris/makefiles/mapfile-vers-jvm_dtrace similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers-jvm_dtrace rename to hotspot/make/solaris/makefiles/mapfile-vers-jvm_dtrace diff --git a/hotspot/build/solaris/makefiles/mapfile-vers-nonproduct b/hotspot/make/solaris/makefiles/mapfile-vers-nonproduct similarity index 100% rename from hotspot/build/solaris/makefiles/mapfile-vers-nonproduct rename to hotspot/make/solaris/makefiles/mapfile-vers-nonproduct diff --git a/hotspot/build/solaris/makefiles/optimized.make b/hotspot/make/solaris/makefiles/optimized.make similarity index 91% rename from hotspot/build/solaris/makefiles/optimized.make rename to hotspot/make/solaris/makefiles/optimized.make index 31323ed12a66cb82cc46d7941250462906300b68..4e8f6484790395f51ee37e677f60530a4d16647a 100644 --- a/hotspot/build/solaris/makefiles/optimized.make +++ b/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. diff --git a/hotspot/build/solaris/makefiles/product.make b/hotspot/make/solaris/makefiles/product.make similarity index 88% rename from hotspot/build/solaris/makefiles/product.make rename to hotspot/make/solaris/makefiles/product.make index 2bc592702d2fe7de3a70a95122fc5b6917eed429..d2e78c6646a5a7ebf4d1db9dc79380ce1144a085 100644 --- a/hotspot/build/solaris/makefiles/product.make +++ b/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 diff --git a/hotspot/build/solaris/makefiles/profiled.make b/hotspot/make/solaris/makefiles/profiled.make similarity index 100% rename from hotspot/build/solaris/makefiles/profiled.make rename to hotspot/make/solaris/makefiles/profiled.make diff --git a/hotspot/build/solaris/makefiles/reorder_COMPILER1_i486 b/hotspot/make/solaris/makefiles/reorder_COMPILER1_i486 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_COMPILER1_i486 rename to hotspot/make/solaris/makefiles/reorder_COMPILER1_i486 diff --git a/hotspot/build/solaris/makefiles/reorder_COMPILER1_sparc b/hotspot/make/solaris/makefiles/reorder_COMPILER1_sparc similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_COMPILER1_sparc rename to hotspot/make/solaris/makefiles/reorder_COMPILER1_sparc diff --git a/hotspot/build/solaris/makefiles/reorder_COMPILER1_sparcv9 b/hotspot/make/solaris/makefiles/reorder_COMPILER1_sparcv9 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_COMPILER1_sparcv9 rename to hotspot/make/solaris/makefiles/reorder_COMPILER1_sparcv9 diff --git a/hotspot/build/solaris/makefiles/reorder_COMPILER2_amd64 b/hotspot/make/solaris/makefiles/reorder_COMPILER2_amd64 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_COMPILER2_amd64 rename to hotspot/make/solaris/makefiles/reorder_COMPILER2_amd64 diff --git a/hotspot/build/solaris/makefiles/reorder_COMPILER2_i486 b/hotspot/make/solaris/makefiles/reorder_COMPILER2_i486 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_COMPILER2_i486 rename to hotspot/make/solaris/makefiles/reorder_COMPILER2_i486 diff --git a/hotspot/build/solaris/makefiles/reorder_COMPILER2_sparc b/hotspot/make/solaris/makefiles/reorder_COMPILER2_sparc similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_COMPILER2_sparc rename to hotspot/make/solaris/makefiles/reorder_COMPILER2_sparc diff --git a/hotspot/build/solaris/makefiles/reorder_COMPILER2_sparcv9 b/hotspot/make/solaris/makefiles/reorder_COMPILER2_sparcv9 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_COMPILER2_sparcv9 rename to hotspot/make/solaris/makefiles/reorder_COMPILER2_sparcv9 diff --git a/hotspot/build/solaris/makefiles/reorder_CORE_amd64 b/hotspot/make/solaris/makefiles/reorder_CORE_amd64 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_CORE_amd64 rename to hotspot/make/solaris/makefiles/reorder_CORE_amd64 diff --git a/hotspot/build/solaris/makefiles/reorder_CORE_i486 b/hotspot/make/solaris/makefiles/reorder_CORE_i486 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_CORE_i486 rename to hotspot/make/solaris/makefiles/reorder_CORE_i486 diff --git a/hotspot/build/solaris/makefiles/reorder_CORE_sparc b/hotspot/make/solaris/makefiles/reorder_CORE_sparc similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_CORE_sparc rename to hotspot/make/solaris/makefiles/reorder_CORE_sparc diff --git a/hotspot/build/solaris/makefiles/reorder_CORE_sparcv9 b/hotspot/make/solaris/makefiles/reorder_CORE_sparcv9 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_CORE_sparcv9 rename to hotspot/make/solaris/makefiles/reorder_CORE_sparcv9 diff --git a/hotspot/build/solaris/makefiles/reorder_TIERED_amd64 b/hotspot/make/solaris/makefiles/reorder_TIERED_amd64 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_TIERED_amd64 rename to hotspot/make/solaris/makefiles/reorder_TIERED_amd64 diff --git a/hotspot/build/solaris/makefiles/reorder_TIERED_i486 b/hotspot/make/solaris/makefiles/reorder_TIERED_i486 similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_TIERED_i486 rename to hotspot/make/solaris/makefiles/reorder_TIERED_i486 diff --git a/hotspot/build/solaris/makefiles/reorder_TIERED_sparc b/hotspot/make/solaris/makefiles/reorder_TIERED_sparc similarity index 100% rename from hotspot/build/solaris/makefiles/reorder_TIERED_sparc rename to hotspot/make/solaris/makefiles/reorder_TIERED_sparc diff --git a/hotspot/build/solaris/makefiles/rules.make b/hotspot/make/solaris/makefiles/rules.make similarity index 100% rename from hotspot/build/solaris/makefiles/rules.make rename to hotspot/make/solaris/makefiles/rules.make diff --git a/hotspot/build/solaris/makefiles/sa.make b/hotspot/make/solaris/makefiles/sa.make similarity index 97% rename from hotspot/build/solaris/makefiles/sa.make rename to hotspot/make/solaris/makefiles/sa.make index dc1f159a093e5ccefe2f9cc019422247615f2178..1143688394e8d8afdd94b33ef76f40e5752ceea2 100644 --- a/hotspot/build/solaris/makefiles/sa.make +++ b/hotspot/make/solaris/makefiles/sa.make @@ -28,9 +28,9 @@ # This makefile is used to build Serviceability Agent java code # and generate JNI header file for native methods. -include $(GAMMADIR)/build/solaris/makefiles/rules.make +include $(GAMMADIR)/make/solaris/makefiles/rules.make AGENT_DIR = $(GAMMADIR)/agent -include $(GAMMADIR)/build/sa.files +include $(GAMMADIR)/make/sa.files GENERATED = ../generated # tools.jar is needed by the JDI - SA binding diff --git a/hotspot/build/solaris/makefiles/saproc.make b/hotspot/make/solaris/makefiles/saproc.make similarity index 100% rename from hotspot/build/solaris/makefiles/saproc.make rename to hotspot/make/solaris/makefiles/saproc.make diff --git a/hotspot/build/solaris/makefiles/sparc.make b/hotspot/make/solaris/makefiles/sparc.make similarity index 100% rename from hotspot/build/solaris/makefiles/sparc.make rename to hotspot/make/solaris/makefiles/sparc.make diff --git a/hotspot/build/solaris/makefiles/sparcWorks.make b/hotspot/make/solaris/makefiles/sparcWorks.make similarity index 100% rename from hotspot/build/solaris/makefiles/sparcWorks.make rename to hotspot/make/solaris/makefiles/sparcWorks.make diff --git a/hotspot/build/solaris/makefiles/sparcv9.make b/hotspot/make/solaris/makefiles/sparcv9.make similarity index 100% rename from hotspot/build/solaris/makefiles/sparcv9.make rename to hotspot/make/solaris/makefiles/sparcv9.make diff --git a/hotspot/build/solaris/makefiles/tiered.make b/hotspot/make/solaris/makefiles/tiered.make similarity index 100% rename from hotspot/build/solaris/makefiles/tiered.make rename to hotspot/make/solaris/makefiles/tiered.make diff --git a/hotspot/build/solaris/makefiles/top.make b/hotspot/make/solaris/makefiles/top.make similarity index 97% rename from hotspot/build/solaris/makefiles/top.make rename to hotspot/make/solaris/makefiles/top.make index 14c9acd38ac8379f5034a3ff0c4aba36fe02ae68..5a883565ada9ab90ef88a574927f21abf580ce63 100644 --- a/hotspot/build/solaris/makefiles/top.make +++ b/hotspot/make/solaris/makefiles/top.make @@ -45,7 +45,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 MakeDeps = $(RUN.JAVA) -classpath . MakeDeps @@ -150,7 +150,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 $@+ diff --git a/hotspot/build/solaris/makefiles/vm.make b/hotspot/make/solaris/makefiles/vm.make similarity index 99% rename from hotspot/build/solaris/makefiles/vm.make rename to hotspot/make/solaris/makefiles/vm.make index c1fa4643129ad4dc7e40443cf3a256b57fe3b9c3..93ebf89446510e9ce31cb8fc8f49f764413bb7d8 100644 --- a/hotspot/build/solaris/makefiles/vm.make +++ b/hotspot/make/solaris/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 diff --git a/hotspot/build/solaris/platform_amd64 b/hotspot/make/solaris/platform_amd64 similarity index 100% rename from hotspot/build/solaris/platform_amd64 rename to hotspot/make/solaris/platform_amd64 diff --git a/hotspot/build/solaris/platform_amd64.gcc b/hotspot/make/solaris/platform_amd64.gcc similarity index 100% rename from hotspot/build/solaris/platform_amd64.gcc rename to hotspot/make/solaris/platform_amd64.gcc diff --git a/hotspot/build/solaris/platform_i486 b/hotspot/make/solaris/platform_i486 similarity index 100% rename from hotspot/build/solaris/platform_i486 rename to hotspot/make/solaris/platform_i486 diff --git a/hotspot/build/solaris/platform_i486.gcc b/hotspot/make/solaris/platform_i486.gcc similarity index 100% rename from hotspot/build/solaris/platform_i486.gcc rename to hotspot/make/solaris/platform_i486.gcc diff --git a/hotspot/build/solaris/platform_sparc b/hotspot/make/solaris/platform_sparc similarity index 100% rename from hotspot/build/solaris/platform_sparc rename to hotspot/make/solaris/platform_sparc diff --git a/hotspot/build/solaris/platform_sparc.gcc b/hotspot/make/solaris/platform_sparc.gcc similarity index 100% rename from hotspot/build/solaris/platform_sparc.gcc rename to hotspot/make/solaris/platform_sparc.gcc diff --git a/hotspot/build/solaris/platform_sparcv9 b/hotspot/make/solaris/platform_sparcv9 similarity index 100% rename from hotspot/build/solaris/platform_sparcv9 rename to hotspot/make/solaris/platform_sparcv9 diff --git a/hotspot/build/solaris/platform_sparcv9.gcc b/hotspot/make/solaris/platform_sparcv9.gcc similarity index 100% rename from hotspot/build/solaris/platform_sparcv9.gcc rename to hotspot/make/solaris/platform_sparcv9.gcc diff --git a/hotspot/build/solaris/reorder.sh b/hotspot/make/solaris/reorder.sh similarity index 97% rename from hotspot/build/solaris/reorder.sh rename to hotspot/make/solaris/reorder.sh index 598f3ebbc38672d7a32a34141b8ea8116c215dd4..925b0a2407cf2e42bf85a886ea0e6da7d032fff5 100644 --- a/hotspot/build/solaris/reorder.sh +++ b/hotspot/make/solaris/reorder.sh @@ -55,8 +55,8 @@ test_setup() { echo "" echo "TEST_SETUP $1 $2" echo "" - libreldir=${ALT_OUTPUTDIR:-../../../build/solaris-$arch5}/reorder - libabsdir=${ALT_OUTPUTDIR:-$sdk_ws/build/solaris-$arch5}/reorder + libreldir=${ALT_OUTPUTDIR:-../../../make/solaris-$arch5}/reorder + libabsdir=${ALT_OUTPUTDIR:-$sdk_ws/make/solaris-$arch5}/reorder ( cd $sdk_ws/make/tools/reorder ; gnumake $libreldir/$arch5/libmcount.so ) if [ "${arch3}" = "i386" ] ; then # On Solaris/x86 we need to remove the symbol _mcount from the command @@ -271,11 +271,11 @@ jre=$sdk/jre arch3=`uname -p` # Arch name as used in Hotspot build: (eg. i486) -# /export/hotspot/build/solaris/solaris_${arch4}_compiler1 +# /export/hotspot/make/solaris/solaris_${arch4}_compiler1 arch4=$arch3 # Arch name as used in SDK build (eg. i586): -# /export/tiger/build/solaris-${arch3} +# /export/tiger/make/solaris-${arch3} arch5=$arch3 # Tweak for 64-bit sparc builds. At least they all agree. diff --git a/hotspot/build/test/Queens.java b/hotspot/make/test/Queens.java similarity index 100% rename from hotspot/build/test/Queens.java rename to hotspot/make/test/Queens.java diff --git a/hotspot/build/windows/README b/hotspot/make/windows/README similarity index 100% rename from hotspot/build/windows/README rename to hotspot/make/windows/README diff --git a/hotspot/build/windows/build.bat b/hotspot/make/windows/build.bat similarity index 91% rename from hotspot/build/windows/build.bat rename to hotspot/make/windows/build.bat index 7b7329b2098a105a71d7c9d5d5b4d759d093cf28..36d4ec6b48017d1168202203d6ae67a1f9c583fd 100644 --- a/hotspot/build/windows/build.bat +++ b/hotspot/make/windows/build.bat @@ -86,11 +86,11 @@ echo. goto usage :build -nmake -f %3/build/windows/build.make Variant=%2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION="%5" %1 +nmake -f %3/make/windows/build.make Variant=%2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION="%5" %1 goto end :build_adlc -nmake -f %3/build/windows/build.make Variant=compiler2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION=%5 ADLC_ONLY=1 %1 +nmake -f %3/make/windows/build.make Variant=compiler2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION=%5 ADLC_ONLY=1 %1 goto end :usage diff --git a/hotspot/build/windows/build.make b/hotspot/make/windows/build.make similarity index 92% rename from hotspot/build/windows/build.make rename to hotspot/make/windows/build.make index c5e48e1715d3da548ae2b3531158119135cc71b0..a871a849eb19922f62c2e86d6c3e7a4703efd0e6 100644 --- a/hotspot/build/windows/build.make +++ b/hotspot/make/windows/build.make @@ -118,13 +118,13 @@ VARIANT_TEXT=Kernel # !include "$(WorkSpace)/make/hotspot_version" -# 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 -!if exists($(WorkSpace)\build\closed) -!include $(WorkSpace)\build\closed\hotspot_distro +!if exists($(WorkSpace)\src\closed) +!include $(WorkSpace)\make\hotspot_distro !else -!include $(WorkSpace)\build\hotspot_distro +!include $(WorkSpace)\make\openjdk_distro !endif !endif @@ -242,24 +242,24 @@ defaultTarget: product # product release optimized: checks $(variantDir) $(variantDir)\local.make sanity cd $(variantDir) - nmake -nologo -f $(WorkSpace)\build\windows\makefiles\top.make BUILD_FLAVOR=product ARCH=$(ARCH) + nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=product ARCH=$(ARCH) # The debug or jvmg (all the same thing) is an optional build debug jvmg: checks $(variantDir) $(variantDir)\local.make sanity cd $(variantDir) - nmake -nologo -f $(WorkSpace)\build\windows\makefiles\top.make BUILD_FLAVOR=debug ARCH=$(ARCH) + nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=debug ARCH=$(ARCH) fastdebug: checks $(variantDir) $(variantDir)\local.make sanity cd $(variantDir) - nmake -nologo -f $(WorkSpace)\build\windows\makefiles\top.make BUILD_FLAVOR=fastdebug ARCH=$(ARCH) + nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=fastdebug ARCH=$(ARCH) develop: checks $(variantDir) $(variantDir)\local.make sanity cd $(variantDir) - nmake -nologo -f $(WorkSpace)\build\windows\makefiles\top.make BUILD_FLAVOR=product DEVELOP=1 ARCH=$(ARCH) + nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=product DEVELOP=1 ARCH=$(ARCH) sanity: @ echo; @ cd $(variantDir) - @ nmake -nologo -f $(WorkSpace)\build\windows\makefiles\sanity.make + @ nmake -nologo -f $(WorkSpace)\make\windows\makefiles\sanity.make @ cd .. @ echo; @@ -293,7 +293,7 @@ $(variantDir)\local.make: checks @ echo BUILDARCH=$(BUILDARCH) >> $@ @ echo Platform_arch=$(Platform_arch) >> $@ @ echo Platform_arch_model=$(Platform_arch_model) >> $@ - @ sh $(WorkSpace)/build/windows/get_msc_ver.sh >> $@ + @ sh $(WorkSpace)/make/windows/get_msc_ver.sh >> $@ checks: checkVariant checkWorkSpace checkSA diff --git a/hotspot/build/windows/build_vm_def.sh b/hotspot/make/windows/build_vm_def.sh similarity index 96% rename from hotspot/build/windows/build_vm_def.sh rename to hotspot/make/windows/build_vm_def.sh index 4ccdb67d2812d2128b65c68e110bff281be9ccfa..98e65150a6546af5e0e75ba8f51e42b1e77dffea 100644 --- a/hotspot/build/windows/build_vm_def.sh +++ b/hotspot/make/windows/build_vm_def.sh @@ -24,7 +24,7 @@ # This shell script builds a vm.def file for the current VM variant. # The .def file exports vtbl symbols which allow the Serviceability -# Agent to run on Windows. See build/windows/projectfiles/*/vm.def +# Agent to run on Windows. See make/windows/projectfiles/*/vm.def # for more information. # # The script expects to be executed in the directory containing all of diff --git a/hotspot/build/windows/create.bat b/hotspot/make/windows/create.bat similarity index 97% rename from hotspot/build/windows/create.bat rename to hotspot/make/windows/create.bat index 71ad50d0bd64d2c3836e3e03246bde05129c6bde..a5a481ff7bde4daeb993e0beb096c5709e835460 100644 --- a/hotspot/build/windows/create.bat +++ b/hotspot/make/windows/create.bat @@ -69,7 +69,7 @@ set HotSpotBuildSpace=%2 set HotSpotJDKDist=%3 REM figure out MSC version -for /F %%i in ('sh %HotSpotWorkSpace%/build/windows/get_msc_ver.sh') do set %%i +for /F %%i in ('sh %HotSpotWorkSpace%/make/windows/get_msc_ver.sh') do set %%i echo ************************************************************** if "%MSC_VER%" == "1200" ( @@ -126,7 +126,7 @@ REM This is now safe to do. :copyfiles for /D %%i in (compiler1, compiler2, tiered, core, kernel) do ( if NOT EXIST %HotSpotBuildSpace%\%%i mkdir %HotSpotBuildSpace%\%%i -copy %HotSpotWorkSpace%\build\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\ > NUL +copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\ > NUL ) REM force regneration of ProjectFile diff --git a/hotspot/build/windows/cross_build.bat b/hotspot/make/windows/cross_build.bat similarity index 95% rename from hotspot/build/windows/cross_build.bat rename to hotspot/make/windows/cross_build.bat index ef362caa07e6e3d953e4ea5906b20870e610fae5..42e0fb147d78a048c7f7c71c2f63a880f5806e55 100644 --- a/hotspot/build/windows/cross_build.bat +++ b/hotspot/make/windows/cross_build.bat @@ -40,7 +40,7 @@ SET OLDINCLUDE=%INCLUDE% SET OLDLIB=%LIB% SET OLDPATH=%PATH% call "%MSVCDir%\Bin\VCVARS32" -call %2\build\windows\build %1 adlc %2 %3 %4 +call %2\make\windows\build %1 adlc %2 %3 %4 SET INCLUDE=%OLDINCLUDE% SET LIB=%OLDLIB% SET PATH=%OLDPATH% @@ -52,7 +52,7 @@ SET MSSdk=C:\Program Files\Microsoft SDK :setenv2 call "%MSSdk%\SetEnv.bat" /XP64 SET ALT_ADLC_PATH=%CD%\windows_i486_compiler2\generated -call %2\build\windows\build %1 compiler2 %2 %3 %4 +call %2\make\windows\build %1 compiler2 %2 %3 %4 SET INCLUDE=%OLDINCLUDE% SET LIB=%OLDLIB% SET PATH=%OLDPATH% diff --git a/hotspot/build/windows/get_msc_ver.sh b/hotspot/make/windows/get_msc_ver.sh similarity index 100% rename from hotspot/build/windows/get_msc_ver.sh rename to hotspot/make/windows/get_msc_ver.sh diff --git a/hotspot/build/windows/jvmexp.lcf b/hotspot/make/windows/jvmexp.lcf similarity index 100% rename from hotspot/build/windows/jvmexp.lcf rename to hotspot/make/windows/jvmexp.lcf diff --git a/hotspot/build/windows/jvmexp_g.lcf b/hotspot/make/windows/jvmexp_g.lcf similarity index 100% rename from hotspot/build/windows/jvmexp_g.lcf rename to hotspot/make/windows/jvmexp_g.lcf diff --git a/hotspot/build/windows/makefiles/adlc.make b/hotspot/make/windows/makefiles/adlc.make similarity index 98% rename from hotspot/build/windows/makefiles/adlc.make rename to hotspot/make/windows/makefiles/adlc.make index 8dee8c3e6dda6063d129bdf956daf2a6c246307a..f7665667fb147530c7cd7c36af49129eecaa3ae1 100644 --- a/hotspot/build/windows/makefiles/adlc.make +++ b/hotspot/make/windows/makefiles/adlc.make @@ -22,7 +22,7 @@ # # -!include $(WorkSpace)/build/windows/makefiles/compile.make +!include $(WorkSpace)/make/windows/makefiles/compile.make # Rules for building adlc.exe diff --git a/hotspot/build/windows/makefiles/compile.make b/hotspot/make/windows/makefiles/compile.make similarity index 100% rename from hotspot/build/windows/makefiles/compile.make rename to hotspot/make/windows/makefiles/compile.make diff --git a/hotspot/build/windows/makefiles/debug.make b/hotspot/make/windows/makefiles/debug.make similarity index 88% rename from hotspot/build/windows/makefiles/debug.make rename to hotspot/make/windows/makefiles/debug.make index de7924173e5530c5e81a355e54f6093061d686b7..7ea4aae9486800163e92defbbe693c9ae499f3b0 100644 --- a/hotspot/build/windows/makefiles/debug.make +++ b/hotspot/make/windows/makefiles/debug.make @@ -35,7 +35,7 @@ default:: _build_pch_file.obj $(AOUT) checkAndBuildSA CPP_FLAGS=$(CPP_FLAGS) $(DEBUG_OPT_OPTION) -!include $(WorkSpace)/build/windows/makefiles/vm.make +!include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make !include $(GENERATED)/Dependencies @@ -46,10 +46,10 @@ HS_BUILD_ID=$(HS_BUILD_VER)-debug $(Res_Files): FORCE $(AOUT): $(Res_Files) $(Obj_Files) - sh $(WorkSpace)/build/windows/build_vm_def.sh + sh $(WorkSpace)/make/windows/build_vm_def.sh $(LINK) @<< $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) << -!include $(WorkSpace)/build/windows/makefiles/shared.make -!include $(WorkSpace)/build/windows/makefiles/sa.make +!include $(WorkSpace)/make/windows/makefiles/shared.make +!include $(WorkSpace)/make/windows/makefiles/sa.make diff --git a/hotspot/build/windows/makefiles/defs.make b/hotspot/make/windows/makefiles/defs.make similarity index 97% rename from hotspot/build/windows/makefiles/defs.make rename to hotspot/make/windows/makefiles/defs.make index 1e1ab9fba47540974eb91f932cf71ac40c21707f..19d49f17af6183df4132b3ba3a25ab0b75e7f246 100644 --- a/hotspot/build/windows/makefiles/defs.make +++ b/hotspot/make/windows/makefiles/defs.make @@ -26,7 +26,7 @@ # Include the top level defs.make under make directory instead of this one. # This file is included into make/defs.make. # On windows it is only used to construct parameters for -# build/windows/build.make when make/Makefile is used to build VM. +# make/windows/build.make when make/Makefile is used to build VM. SLASH_JAVA ?= J: PATH_SEP = ; @@ -112,7 +112,7 @@ else ABS_OUTPUTDIR := $(subst /,\\,$(shell $(CD) $(OUTPUTDIR);$(PWD))) ABS_BOOTDIR := $(subst /,\\,$(shell $(CD) $(BOOTDIR);$(PWD))) ABS_GAMMADIR := $(subst /,\\,$(shell $(CD) $(GAMMADIR);$(PWD))) - ABS_OS_MAKEFILE := $(subst /,\\,$(shell $(CD) $(HS_BUILD_DIR)/$(OSNAME);$(PWD))/build.make) + ABS_OS_MAKEFILE := $(subst /,\\,$(shell $(CD) $(HS_MAKE_DIR)/$(OSNAME);$(PWD))/build.make) endif # Disable building SA on windows until we are sure diff --git a/hotspot/build/windows/makefiles/fastdebug.make b/hotspot/make/windows/makefiles/fastdebug.make similarity index 88% rename from hotspot/build/windows/makefiles/fastdebug.make rename to hotspot/make/windows/makefiles/fastdebug.make index dcbacdc9449d7a5b898e9d16a20b55f92a8d364d..cb6901bce2f73b52c7f9e3bcd037d80bfc989b27 100644 --- a/hotspot/build/windows/makefiles/fastdebug.make +++ b/hotspot/make/windows/makefiles/fastdebug.make @@ -35,7 +35,7 @@ default:: _build_pch_file.obj $(AOUT) checkAndBuildSA CPP_FLAGS=$(CPP_FLAGS) $(FASTDEBUG_OPT_OPTION) -!include $(WorkSpace)/build/windows/makefiles/vm.make +!include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make !include $(GENERATED)/Dependencies @@ -46,10 +46,10 @@ HS_BUILD_ID=$(HS_BUILD_VER)-fastdebug $(Res_Files): FORCE $(AOUT): $(Res_Files) $(Obj_Files) - sh $(WorkSpace)/build/windows/build_vm_def.sh + sh $(WorkSpace)/make/windows/build_vm_def.sh $(LINK) @<< $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) << -!include $(WorkSpace)/build/windows/makefiles/shared.make -!include $(WorkSpace)/build/windows/makefiles/sa.make +!include $(WorkSpace)/make/windows/makefiles/shared.make +!include $(WorkSpace)/make/windows/makefiles/sa.make diff --git a/hotspot/build/windows/makefiles/generated.make b/hotspot/make/windows/makefiles/generated.make similarity index 90% rename from hotspot/build/windows/makefiles/generated.make rename to hotspot/make/windows/makefiles/generated.make index 8def591058dc7a4c248c8074f9490cd24534053c..7eff90d1681c66f5c956ee7fc60c95a3450f0d66 100644 --- a/hotspot/build/windows/makefiles/generated.make +++ b/hotspot/make/windows/makefiles/generated.make @@ -23,15 +23,15 @@ # !include ../local.make -!include $(WorkSpace)/build/windows/makefiles/makedeps.make +!include $(WorkSpace)/make/windows/makefiles/makedeps.make !include local.make # Pick up rules for building JVMTI (JSR-163) JvmtiOutDir=jvmtifiles -!include $(WorkSpace)/build/windows/makefiles/jvmti.make +!include $(WorkSpace)/make/windows/makefiles/jvmti.make # Pick up rules for building SA -!include $(WorkSpace)/build/windows/makefiles/sa.make +!include $(WorkSpace)/make/windows/makefiles/sa.make !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") default:: includeDB.current Dependencies incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) @@ -83,7 +83,7 @@ includeDB.current Dependencies: classes/MakeDeps.class $(IncludeDBs) cat $(IncludeDBs) > includeDB if exist incls rmdir /s /q incls mkdir incls - $(RUN_JAVA) -Djava.class.path=classes MakeDeps WinGammaPlatform$(VcVersion) $(WorkSpace)/build/windows/platform_$(BUILDARCH) includeDB $(MakeDepsOptions) + $(RUN_JAVA) -Djava.class.path=classes MakeDeps WinGammaPlatform$(VcVersion) $(WorkSpace)/make/windows/platform_$(BUILDARCH) includeDB $(MakeDepsOptions) rm -f includeDB.current cp includeDB includeDB.current @@ -94,8 +94,8 @@ classes/MakeDeps.class: $(MakeDepsSources) !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") -!include $(WorkSpace)/build/windows/makefiles/adlc.make +!include $(WorkSpace)/make/windows/makefiles/adlc.make !endif -!include $(WorkSpace)/build/windows/makefiles/shared.make +!include $(WorkSpace)/make/windows/makefiles/shared.make diff --git a/hotspot/build/windows/makefiles/jvmti.make b/hotspot/make/windows/makefiles/jvmti.make similarity index 98% rename from hotspot/build/windows/makefiles/jvmti.make rename to hotspot/make/windows/makefiles/jvmti.make index 3bd5ce6e2f36a20adafbce25bd13ca781865c67f..74600a11f77f5dd49a17ee7fd5edf8cc94de3745 100644 --- a/hotspot/build/windows/makefiles/jvmti.make +++ b/hotspot/make/windows/makefiles/jvmti.make @@ -27,7 +27,7 @@ # # It knows how to build and run the tools to generate jvmti. -!include $(WorkSpace)/build/windows/makefiles/rules.make +!include $(WorkSpace)/make/windows/makefiles/rules.make # ######################################################################### diff --git a/hotspot/build/windows/makefiles/makedeps.make b/hotspot/make/windows/makefiles/makedeps.make similarity index 97% rename from hotspot/build/windows/makefiles/makedeps.make rename to hotspot/make/windows/makefiles/makedeps.make index f82f4264858cfdc71a4afcbf1c6b0f9208b2bb11..e3164313d7e273281ed6251914bc3eb5b709911d 100644 --- a/hotspot/build/windows/makefiles/makedeps.make +++ b/hotspot/make/windows/makefiles/makedeps.make @@ -22,7 +22,7 @@ # # -!include $(WorkSpace)/build/windows/makefiles/rules.make +!include $(WorkSpace)/make/windows/makefiles/rules.make # This is used externally by both batch and IDE builds, so can't # reference any of the HOTSPOTWORKSPACE, HOTSPOTBUILDSPACE, @@ -30,7 +30,7 @@ # # NOTE: unfortunately the MakeDepsSources list must be kept # synchronized between this and the Solaris version -# (build/solaris/makefiles/makedeps.make). +# (make/solaris/makefiles/makedeps.make). MakeDepsSources=\ $(WorkSpace)\src\share\tools\MakeDeps\Database.java \ @@ -119,7 +119,7 @@ MakeDepsIDEOptions=\ -additionalFile includeDB_gc_shared \ -additionalFile includeDB_gc_serial \ -additionalGeneratedFile $(HOTSPOTBUILDSPACE)\%f\%b vm.def \ - -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\build\windows\build_vm_def.sh" \ + -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh" \ $(MakeDepsIncludesPRIVATE) # Add in build-specific options diff --git a/hotspot/build/windows/makefiles/product.make b/hotspot/make/windows/makefiles/product.make similarity index 89% rename from hotspot/build/windows/makefiles/product.make rename to hotspot/make/windows/makefiles/product.make index d6fe73d125b91ae3765db97dbfbea56ab1ec7451..a2887cfcef3ae808b758432eb8aa4656c228671a 100644 --- a/hotspot/build/windows/makefiles/product.make +++ b/hotspot/make/windows/makefiles/product.make @@ -38,7 +38,7 @@ RELEASE= RC_FLAGS=$(RC_FLAGS) /D "NDEBUG" -!include $(WorkSpace)/build/windows/makefiles/vm.make +!include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make !include $(GENERATED)/Dependencies @@ -56,11 +56,11 @@ $(AOUT): $(Res_Files) $(Obj_Files) << !else $(AOUT): $(Res_Files) $(Obj_Files) - sh $(WorkSpace)/build/windows/build_vm_def.sh + sh $(WorkSpace)/make/windows/build_vm_def.sh $(LINK) @<< $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) << !endif -!include $(WorkSpace)/build/windows/makefiles/shared.make -!include $(WorkSpace)/build/windows/makefiles/sa.make +!include $(WorkSpace)/make/windows/makefiles/shared.make +!include $(WorkSpace)/make/windows/makefiles/sa.make diff --git a/hotspot/build/windows/makefiles/rules.make b/hotspot/make/windows/makefiles/rules.make similarity index 100% rename from hotspot/build/windows/makefiles/rules.make rename to hotspot/make/windows/makefiles/rules.make diff --git a/hotspot/build/windows/makefiles/sa.make b/hotspot/make/windows/makefiles/sa.make similarity index 97% rename from hotspot/build/windows/makefiles/sa.make rename to hotspot/make/windows/makefiles/sa.make index 0c649dcaf9458672967c08b1ead8b23b02683bbc..216c44fc870143696605522030457f52099d3b8a 100644 --- a/hotspot/build/windows/makefiles/sa.make +++ b/hotspot/make/windows/makefiles/sa.make @@ -33,8 +33,8 @@ checkAndBuildSA:: !else # This first part is used to build sa-jdi.jar -!include $(WorkSpace)/build/windows/makefiles/rules.make -!include $(WorkSpace)/build/sa.files +!include $(WorkSpace)/make/windows/makefiles/rules.make +!include $(WorkSpace)/make/sa.files GENERATED = ..\generated diff --git a/hotspot/build/windows/makefiles/sanity.make b/hotspot/make/windows/makefiles/sanity.make similarity index 100% rename from hotspot/build/windows/makefiles/sanity.make rename to hotspot/make/windows/makefiles/sanity.make diff --git a/hotspot/build/windows/makefiles/shared.make b/hotspot/make/windows/makefiles/shared.make similarity index 93% rename from hotspot/build/windows/makefiles/shared.make rename to hotspot/make/windows/makefiles/shared.make index 4e2b04d6f173f0d3b7cab0601e2afded2e55b20d..a5055045e826a0987c0e0c3b5d2e6e3d3c49651a 100644 --- a/hotspot/build/windows/makefiles/shared.make +++ b/hotspot/make/windows/makefiles/shared.make @@ -40,7 +40,7 @@ $(SUBDIRS): FORCE @if not exist $@ mkdir $@ @if not exist $@\local.make echo # Empty > $@\local.make @echo nmake $(ACTION) in $(DIR)\$@ - cd $@ && $(MAKE) /NOLOGO /f $(WorkSpace)\build\windows\makefiles\$@.make $(ACTION) DIR=$(DIR)\$@ BUILD_FLAVOR=$(BUILD_FLAVOR) + cd $@ && $(MAKE) /NOLOGO /f $(WorkSpace)\make\windows\makefiles\$@.make $(ACTION) DIR=$(DIR)\$@ BUILD_FLAVOR=$(BUILD_FLAVOR) !endif # Creates the needed directory diff --git a/hotspot/build/windows/makefiles/top.make b/hotspot/make/windows/makefiles/top.make similarity index 95% rename from hotspot/build/windows/makefiles/top.make rename to hotspot/make/windows/makefiles/top.make index 1ff6e1f4eec7cb63024ca118142c9bad19a36c5c..679e5692efcb913ab46a3cd87feb7034e65a182d 100644 --- a/hotspot/build/windows/makefiles/top.make +++ b/hotspot/make/windows/makefiles/top.make @@ -30,5 +30,5 @@ SUBDIRS=generated SUBDIRS=generated $(BUILD_FLAVOR) !endif -!include $(WorkSpace)/build/windows/makefiles/shared.make +!include $(WorkSpace)/make/windows/makefiles/shared.make diff --git a/hotspot/build/windows/makefiles/vm.make b/hotspot/make/windows/makefiles/vm.make similarity index 100% rename from hotspot/build/windows/makefiles/vm.make rename to hotspot/make/windows/makefiles/vm.make diff --git a/hotspot/build/windows/platform_amd64 b/hotspot/make/windows/platform_amd64 similarity index 100% rename from hotspot/build/windows/platform_amd64 rename to hotspot/make/windows/platform_amd64 diff --git a/hotspot/build/windows/platform_i486 b/hotspot/make/windows/platform_i486 similarity index 100% rename from hotspot/build/windows/platform_i486 rename to hotspot/make/windows/platform_i486 diff --git a/hotspot/make/windows/platform_ia64 b/hotspot/make/windows/platform_ia64 new file mode 100644 index 0000000000000000000000000000000000000000..ca269b499fdf46915616d04f8cbab0cc24372270 --- /dev/null +++ b/hotspot/make/windows/platform_ia64 @@ -0,0 +1,12 @@ +// Platform file for Itanium Windows platform $Revision: 1.0 $ + +os_family = win32 + +arch = ia64 + +os_arch = win32_ia64 + +compiler = visCPP + +gnu_dis_arch = ia64 + diff --git a/hotspot/build/windows/projectfiles/common/Makefile b/hotspot/make/windows/projectfiles/common/Makefile similarity index 95% rename from hotspot/build/windows/projectfiles/common/Makefile rename to hotspot/make/windows/projectfiles/common/Makefile index b016cba8bf92c9aacf34d36a4e9df4044a1970e2..1b4a5bf734308a92761ded6aabec3d68efa1d73d 100644 --- a/hotspot/build/windows/projectfiles/common/Makefile +++ b/hotspot/make/windows/projectfiles/common/Makefile @@ -36,13 +36,13 @@ BootStrapDir=$(JAVA_HOME) !endif !endif -!include $(HOTSPOTWORKSPACE)/build/windows/makefiles/makedeps.make +!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/makedeps.make # Pick up rules for building JVMTI (JSR-163) JvmtiOutDir=$(HOTSPOTBUILDSPACE)\jvmtifiles -!include $(HOTSPOTWORKSPACE)/build/windows/makefiles/jvmti.make +!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/jvmti.make -Platform=$(HOTSPOTWORKSPACE)/build/windows/platform_$(BUILDARCH) +Platform=$(HOTSPOTWORKSPACE)/make/windows/platform_$(BUILDARCH) default:: $(AdditionalTargets) $(JvmtiGeneratedFiles) @@ -83,13 +83,13 @@ IncludeDBs = $(IncludeDBs_compiler1) !if "$(Variant)" == "compiler2" IncludeDBs = $(IncludeDBs_compiler2) # Pick up rules for building adlc -!include $(HOTSPOTWORKSPACE)/build/windows/makefiles/adlc.make +!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make !endif !if "$(Variant)" == "tiered" IncludeDBs = $(IncludeDBs_tiered) # Pick up rules for building adlc -!include $(HOTSPOTWORKSPACE)/build/windows/makefiles/adlc.make +!include $(HOTSPOTWORKSPACE)/make/windows/makefiles/adlc.make !endif !if "$(Variant)" == "core" diff --git a/hotspot/build/windows/projectfiles/compiler1/Makefile b/hotspot/make/windows/projectfiles/compiler1/Makefile similarity index 93% rename from hotspot/build/windows/projectfiles/compiler1/Makefile rename to hotspot/make/windows/projectfiles/compiler1/Makefile index 1cddb034fe2e46920376b937bf4cf84af335b696..e189845fd58066613485562b43ebe20be1cf742f 100644 --- a/hotspot/build/windows/projectfiles/compiler1/Makefile +++ b/hotspot/make/windows/projectfiles/compiler1/Makefile @@ -25,4 +25,4 @@ Variant=compiler1 !include local.make -!include $(HOTSPOTWORKSPACE)/build/windows/projectfiles/common/Makefile +!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile diff --git a/hotspot/build/windows/projectfiles/compiler1/vm.def b/hotspot/make/windows/projectfiles/compiler1/vm.def similarity index 54% rename from hotspot/build/windows/projectfiles/compiler1/vm.def rename to hotspot/make/windows/projectfiles/compiler1/vm.def index 4475c606215cfeb811754d0177ce5742a5c9c117..7811a1fc9bb64de8f67b31e970e811e42f202421 100644 --- a/hotspot/build/windows/projectfiles/compiler1/vm.def +++ b/hotspot/make/windows/projectfiles/compiler1/vm.def @@ -1,7 +1,7 @@ ; ; 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" +; make\windows\build_vm_def.sh and +; make\windows\makefiles\makedeps.make (esp. the "-prelink" ; options). ; diff --git a/hotspot/build/windows/projectfiles/compiler1/vm.dsw b/hotspot/make/windows/projectfiles/compiler1/vm.dsw similarity index 100% rename from hotspot/build/windows/projectfiles/compiler1/vm.dsw rename to hotspot/make/windows/projectfiles/compiler1/vm.dsw diff --git a/hotspot/build/windows/projectfiles/compiler2/ADLCompiler.dsp b/hotspot/make/windows/projectfiles/compiler2/ADLCompiler.dsp similarity index 100% rename from hotspot/build/windows/projectfiles/compiler2/ADLCompiler.dsp rename to hotspot/make/windows/projectfiles/compiler2/ADLCompiler.dsp diff --git a/hotspot/build/windows/projectfiles/compiler2/ADLCompiler.dsw b/hotspot/make/windows/projectfiles/compiler2/ADLCompiler.dsw similarity index 100% rename from hotspot/build/windows/projectfiles/compiler2/ADLCompiler.dsw rename to hotspot/make/windows/projectfiles/compiler2/ADLCompiler.dsw diff --git a/hotspot/build/windows/projectfiles/compiler2/Makefile b/hotspot/make/windows/projectfiles/compiler2/Makefile similarity index 94% rename from hotspot/build/windows/projectfiles/compiler2/Makefile rename to hotspot/make/windows/projectfiles/compiler2/Makefile index eca41f04d5d54101a273a0471a844f6c1a01b368..567f02030eed7664048fd0d836d132ed7d9e6f13 100644 --- a/hotspot/build/windows/projectfiles/compiler2/Makefile +++ b/hotspot/make/windows/projectfiles/compiler2/Makefile @@ -26,4 +26,4 @@ Variant=compiler2 !include local.make AdditionalTargets=incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp -!include $(HOTSPOTWORKSPACE)/build/windows/projectfiles/common/Makefile +!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile diff --git a/hotspot/build/windows/projectfiles/compiler2/vm.def b/hotspot/make/windows/projectfiles/compiler2/vm.def similarity index 54% rename from hotspot/build/windows/projectfiles/compiler2/vm.def rename to hotspot/make/windows/projectfiles/compiler2/vm.def index 4475c606215cfeb811754d0177ce5742a5c9c117..7811a1fc9bb64de8f67b31e970e811e42f202421 100644 --- a/hotspot/build/windows/projectfiles/compiler2/vm.def +++ b/hotspot/make/windows/projectfiles/compiler2/vm.def @@ -1,7 +1,7 @@ ; ; 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" +; make\windows\build_vm_def.sh and +; make\windows\makefiles\makedeps.make (esp. the "-prelink" ; options). ; diff --git a/hotspot/build/windows/projectfiles/compiler2/vm.dsw b/hotspot/make/windows/projectfiles/compiler2/vm.dsw similarity index 100% rename from hotspot/build/windows/projectfiles/compiler2/vm.dsw rename to hotspot/make/windows/projectfiles/compiler2/vm.dsw diff --git a/hotspot/build/windows/projectfiles/core/Makefile b/hotspot/make/windows/projectfiles/core/Makefile similarity index 93% rename from hotspot/build/windows/projectfiles/core/Makefile rename to hotspot/make/windows/projectfiles/core/Makefile index 243188b20add1650ccea4abd16809d9005de1935..e42986de410bf0cc477ccb9c1eadf86e49685d6f 100644 --- a/hotspot/build/windows/projectfiles/core/Makefile +++ b/hotspot/make/windows/projectfiles/core/Makefile @@ -25,4 +25,4 @@ Variant=core !include local.make -!include $(HOTSPOTWORKSPACE)/build/windows/projectfiles/common/Makefile +!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile diff --git a/hotspot/build/windows/projectfiles/core/vm.def b/hotspot/make/windows/projectfiles/core/vm.def similarity index 54% rename from hotspot/build/windows/projectfiles/core/vm.def rename to hotspot/make/windows/projectfiles/core/vm.def index 4475c606215cfeb811754d0177ce5742a5c9c117..7811a1fc9bb64de8f67b31e970e811e42f202421 100644 --- a/hotspot/build/windows/projectfiles/core/vm.def +++ b/hotspot/make/windows/projectfiles/core/vm.def @@ -1,7 +1,7 @@ ; ; 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" +; make\windows\build_vm_def.sh and +; make\windows\makefiles\makedeps.make (esp. the "-prelink" ; options). ; diff --git a/hotspot/build/windows/projectfiles/core/vm.dsw b/hotspot/make/windows/projectfiles/core/vm.dsw similarity index 100% rename from hotspot/build/windows/projectfiles/core/vm.dsw rename to hotspot/make/windows/projectfiles/core/vm.dsw diff --git a/hotspot/build/windows/projectfiles/kernel/Makefile b/hotspot/make/windows/projectfiles/kernel/Makefile similarity index 93% rename from hotspot/build/windows/projectfiles/kernel/Makefile rename to hotspot/make/windows/projectfiles/kernel/Makefile index 2ba53d245dd5cc7ebebf0e23ef3e8b3b5f14cf2f..0f8508e431ecc4baad944fc715c83d7023f97590 100644 --- a/hotspot/build/windows/projectfiles/kernel/Makefile +++ b/hotspot/make/windows/projectfiles/kernel/Makefile @@ -25,4 +25,4 @@ Variant=compiler1 !include local.make -!include $(HOTSPOTWORKSPACE)/build/windows/projectfiles/common/Makefile +!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile diff --git a/hotspot/build/windows/projectfiles/kernel/vm.def b/hotspot/make/windows/projectfiles/kernel/vm.def similarity index 54% rename from hotspot/build/windows/projectfiles/kernel/vm.def rename to hotspot/make/windows/projectfiles/kernel/vm.def index 4475c606215cfeb811754d0177ce5742a5c9c117..7811a1fc9bb64de8f67b31e970e811e42f202421 100644 --- a/hotspot/build/windows/projectfiles/kernel/vm.def +++ b/hotspot/make/windows/projectfiles/kernel/vm.def @@ -1,7 +1,7 @@ ; ; 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" +; make\windows\build_vm_def.sh and +; make\windows\makefiles\makedeps.make (esp. the "-prelink" ; options). ; diff --git a/hotspot/build/windows/projectfiles/kernel/vm.dsw b/hotspot/make/windows/projectfiles/kernel/vm.dsw similarity index 100% rename from hotspot/build/windows/projectfiles/kernel/vm.dsw rename to hotspot/make/windows/projectfiles/kernel/vm.dsw diff --git a/hotspot/build/windows/projectfiles/tiered/ADLCompiler.dsp b/hotspot/make/windows/projectfiles/tiered/ADLCompiler.dsp similarity index 100% rename from hotspot/build/windows/projectfiles/tiered/ADLCompiler.dsp rename to hotspot/make/windows/projectfiles/tiered/ADLCompiler.dsp diff --git a/hotspot/build/windows/projectfiles/tiered/ADLCompiler.dsw b/hotspot/make/windows/projectfiles/tiered/ADLCompiler.dsw similarity index 100% rename from hotspot/build/windows/projectfiles/tiered/ADLCompiler.dsw rename to hotspot/make/windows/projectfiles/tiered/ADLCompiler.dsw diff --git a/hotspot/build/windows/projectfiles/tiered/Makefile b/hotspot/make/windows/projectfiles/tiered/Makefile similarity index 94% rename from hotspot/build/windows/projectfiles/tiered/Makefile rename to hotspot/make/windows/projectfiles/tiered/Makefile index f92d249109b409791f60d106b41c379b1010280b..1aaae59680dcc68068d555d21ed2f9427d9dca7c 100644 --- a/hotspot/build/windows/projectfiles/tiered/Makefile +++ b/hotspot/make/windows/projectfiles/tiered/Makefile @@ -26,4 +26,4 @@ Variant=tiered !include local.make AdditionalTargets=incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp -!include $(HOTSPOTWORKSPACE)/build/windows/projectfiles/common/Makefile +!include $(HOTSPOTWORKSPACE)/make/windows/projectfiles/common/Makefile diff --git a/hotspot/make/windows/projectfiles/tiered/vm.def b/hotspot/make/windows/projectfiles/tiered/vm.def new file mode 100644 index 0000000000000000000000000000000000000000..7811a1fc9bb64de8f67b31e970e811e42f202421 --- /dev/null +++ b/hotspot/make/windows/projectfiles/tiered/vm.def @@ -0,0 +1,7 @@ +; +; This .DEF file is a placeholder for one which is automatically +; generated during the build process. See +; make\windows\build_vm_def.sh and +; make\windows\makefiles\makedeps.make (esp. the "-prelink" +; options). +; diff --git a/hotspot/build/windows/projectfiles/tiered/vm.dsw b/hotspot/make/windows/projectfiles/tiered/vm.dsw similarity index 100% rename from hotspot/build/windows/projectfiles/tiered/vm.dsw rename to hotspot/make/windows/projectfiles/tiered/vm.dsw