make/linux/makefiles/buildtree.make

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. 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.

@@ -111,11 +111,11 @@
 
 # Get things from the platform file.
 COMPILER        = $(shell sed -n 's/^compiler[  ]*=[    ]*//p' $(PLATFORM_FILE))
 
 SIMPLE_DIRS     = \
-        $(PLATFORM_DIR)/generated/incls \
+        $(PLATFORM_DIR)/generated/dependencies \
         $(PLATFORM_DIR)/generated/adfiles \
         $(PLATFORM_DIR)/generated/jvmtifiles
 
 TARGETS      = debug fastdebug jvmg optimized product profiled
 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))

@@ -195,15 +195,31 @@
         echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \
         echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
         echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
         echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
         echo; \
-        echo "Src_Dirs = \\"; \
+        echo "# Used for platform dispatching"; \
+        echo "TARGET_DEFINES  = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
+        echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \
+        echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \
+        echo "TARGET_DEFINES += -DTARGET_OS_ARCH_\$$(Platform_os_arch)"; \
+        echo "TARGET_DEFINES += -DTARGET_OS_ARCH_MODEL_\$$(Platform_os_arch_model)"; \
+        echo "TARGET_DEFINES += -DTARGET_COMPILER_\$$(Platform_compiler)"; \
+        echo "CFLAGS += \$$(TARGET_DEFINES)"; \
+        echo; \
+        echo "Src_Dirs_V = \\"; \
         sed 's/$$/ \\/;s|$(GAMMADIR)|$$(GAMMADIR)|' ../shared_dirs.lst; \
         echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \
         echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \
         echo "\$$(GAMMADIR)/src/os_cpu/$(OS_FAMILY)_$(ARCH)/vm"; \
+        echo; \
+        echo "Src_Dirs_I = \\"; \
+        echo "\$$(GAMMADIR)/src/share/vm \\"; \
+        echo "\$$(GAMMADIR)/src/share/vm/prims \\"; \
+        echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \
+        echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \
+        echo "\$$(GAMMADIR)/src/os_cpu/$(OS_FAMILY)_$(ARCH)/vm"; \
         [ -n "$(CFLAGS_BROWSE)" ] && \
             echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \
         [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
             echo && \
             echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \