Ignore:
Timestamp:
Feb 13, 2012, 10:07:12 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
1 deleted
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/hotspot/make/linux/Makefile

    r278 r309  
    2020# or visit www.oracle.com if you need additional information or have any
    2121# questions.
    22 # 
     22#
    2323#
    2424
    … …  
    4646#    make REMOTE="rsh -l me myotherlinuxbox"
    4747
    48 # Along with VM, Serviceability Agent (SA) is built for SA/JDI binding. 
    49 # JDI binding on SA produces two binaries: 
     48# Along with VM, Serviceability Agent (SA) is built for SA/JDI binding.
     49# JDI binding on SA produces two binaries:
    5050#  1. sa-jdi.jar       - This is build before building libjvm[_g].so
    5151#                        Please refer to ./makefiles/sa.make
    5252#  2. libsa[_g].so     - Native library for SA - This is built after
    5353#                        libjsig[_g].so (signal interposition library)
    54 #                        Please refer to ./makefiles/vm.make 
     54#                        Please refer to ./makefiles/vm.make
    5555# If $(GAMMADIR)/agent dir is not present, SA components are not built.
    5656
    … …  
    6262include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
    6363
    64 ifndef LP64
    6564ifndef CC_INTERP
    66 FORCE_TIERED=1
    67 endif
     65  ifndef FORCE_TIERED
     66    FORCE_TIERED=1
     67  endif
    6868endif
    6969
    … …  
    257257
    258258$(SUBDIRS_C2): $(BUILDTREE_MAKE)
    259 ifdef FORCE_TIERED
     259ifeq ($(FORCE_TIERED),1)
    260260        $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
    261261                $(BUILDTREE) VARIANT=tiered FORCE_TIERED=1

  • trunk/openjdk/hotspot/make/linux/adlc_updater

    r2 r309  
    1616  mv $1+ $1
    1717}
    18 [ -f $3/$1 ] && (fix_lines $2/$1 $3/$1; cmp -s $2/$1 $3/$1) || \
     18fix_lines $2/$1 $3/$1
     19[ -f $3/$1 ] && cmp -s $2/$1 $3/$1 || \
    1920( [ -f $3/$1 ] && echo Updating $3/$1 ; touch $2/made-change ; mv $2/$1 $3/$1 )

  • trunk/openjdk/hotspot/make/linux/makefiles/adlc.make

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    4343             $(GAMMADIR)/src/os_cpu/$(OS)_$(ARCH)/vm/$(OS)_$(Platform_arch_model).ad
    4444
    45 Src_Dirs += $(GAMMADIR)/src/share/vm/adlc
    46 
    4745EXEC    = $(OUTDIR)/adlc
    4846
    4947# set VPATH so make knows where to look for source files
    50 Src_Dirs_V = ${Src_Dirs} $(GENERATED)/incls
    51 VPATH    += $(Src_Dirs_V:%=%:)
     48Src_Dirs_V += $(GAMMADIR)/src/share/vm/adlc
     49VPATH += $(Src_Dirs_V:%=%:)
    5250
    5351# set INCLUDES for C preprocessor
    54 Src_Dirs_I = ${Src_Dirs} $(GENERATED)
     52Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED)
    5553INCLUDES += $(Src_Dirs_I:%=-I%)
    5654

  • trunk/openjdk/hotspot/make/linux/makefiles/amd64.make

    r278 r309  
    11#
    2 # Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2323#
    2424
    25 # Not included in includeDB because it has no dependencies
    26 Obj_Files += linux_x86_64.o
    27 
    2825# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
    2926OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)

  • trunk/openjdk/hotspot/make/linux/makefiles/build_vm_def.sh

    r278 r309  
    22
    33# If we're cross compiling use that path for nm
    4 if [ "$ALT_COMPILER_PATH" != "" ]; then
     4if [ "$CROSS_COMPILE_ARCH" != "" ]; then
    55NM=$ALT_COMPILER_PATH/nm
    66else

  • trunk/openjdk/hotspot/make/linux/makefiles/buildtree.make

    r278 r309  
    11#
    2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    3838# VARIANT       - core, compiler1, compiler2, or tiered
    3939# HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
    40 # HOTSPOT_BUILD_VERSION   - internal, PRTjob ID, JPRTjob ID
     40# HOTSPOT_BUILD_VERSION   - internal, internal-$(USER_RELEASE_SUFFIX) or empty
    4141# JRE_RELEASE_VERSION     - <major>.<minor>.<micro> (1.7.0)
    4242#
    … …  
    114114
    115115SIMPLE_DIRS     = \
    116         $(PLATFORM_DIR)/generated/incls \
     116        $(PLATFORM_DIR)/generated/dependencies \
    117117        $(PLATFORM_DIR)/generated/adfiles \
    118118        $(PLATFORM_DIR)/generated/jvmtifiles
    … …  
    125125
    126126BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \
    127         env.sh env.csh .dbxrc test_gamma
     127        env.sh env.csh jdkpath.sh .dbxrc test_gamma
    128128
    129129BUILDTREE_VARS  = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
    … …  
    198198        echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
    199199        echo; \
    200         echo "Src_Dirs = \\"; \
     200        echo "# Used for platform dispatching"; \
     201        echo "TARGET_DEFINES  = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
     202        echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \
     203        echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \
     204        echo "TARGET_DEFINES += -DTARGET_OS_ARCH_\$$(Platform_os_arch)"; \
     205        echo "TARGET_DEFINES += -DTARGET_OS_ARCH_MODEL_\$$(Platform_os_arch_model)"; \
     206        echo "TARGET_DEFINES += -DTARGET_COMPILER_\$$(Platform_compiler)"; \
     207        echo "CFLAGS += \$$(TARGET_DEFINES)"; \
     208        echo; \
     209        echo "Src_Dirs_V = \\"; \
    201210        sed 's/$$/ \\/;s|$(GAMMADIR)|$$(GAMMADIR)|' ../shared_dirs.lst; \
     211        echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \
     212        echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \
     213        echo "\$$(GAMMADIR)/src/os_cpu/$(OS_FAMILY)_$(ARCH)/vm"; \
     214        echo; \
     215        echo "Src_Dirs_I = \\"; \
     216        echo "\$$(GAMMADIR)/src/share/vm \\"; \
     217        echo "\$$(GAMMADIR)/src/share/vm/prims \\"; \
    202218        echo "\$$(GAMMADIR)/src/cpu/$(ARCH)/vm \\"; \
    203219        echo "\$$(GAMMADIR)/src/os/$(OS_FAMILY)/vm \\"; \
    … …  
    302318        sed -n 's/^\([A-Za-z_][A-Za-z0-9_]*\)=/setenv \1 /p' $?; \
    303319        ) > $@
     320
     321jdkpath.sh: $(BUILDTREE_MAKE)
     322        @echo Creating $@ ...
     323        $(QUIETLY) ( \
     324        $(BUILDTREE_COMMENT); \
     325        echo "JDK=${JAVA_HOME}"; \
     326        ) > $@     
    304327
    305328.dbxrc:  $(BUILDTREE_MAKE)

  • trunk/openjdk/hotspot/make/linux/makefiles/core.make

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2525# Sets make macros for making core version of VM
    2626
    27 # Note the effect on includeDB lists in top.make:
    28 # includeDB_compiler* and ad_<arch>.*pp are excluded from the build,
     27# Select which files to use (in top.make)
    2928TYPE=CORE
    3029

  • trunk/openjdk/hotspot/make/linux/makefiles/defs.make

    r278 r309  
    11#
    2 # Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#

  • trunk/openjdk/hotspot/make/linux/makefiles/gcc.make

    r278 r309  
    2626# CC, CPP & AS
    2727
    28 ifdef ALT_COMPILER_PATH
     28# When cross-compiling the ALT_COMPILER_PATH points
     29# to the cross-compilation toolset
     30ifdef CROSS_COMPILE_ARCH
    2931CPP = $(ALT_COMPILER_PATH)/g++
    3032CC  = $(ALT_COMPILER_PATH)/gcc
    … …  
    4345# check for precompiled headers support
    4446ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0"
     47# Allow the user to turn off precompiled headers from the command line.
     48ifneq ($(USE_PRECOMPILED_HEADER),0)
    4549USE_PRECOMPILED_HEADER=1
    4650PRECOMPILED_HEADER_DIR=.
    47 PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/incls/_precompiled.incl.gch
     51PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled.hpp
     52PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch
     53endif
    4854endif
    4955
    … …  
    143149ifneq "$(shell expr \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) = 3 \) \))" "0"
    144150OPT_CFLAGS/mulnode.o += -O0
     151endif
     152
     153# Flags for generating make dependency flags.
     154ifneq ("${CC_VER_MAJOR}", "2")
     155DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
     156endif
     157
     158# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
     159ifneq ($(USE_PRECOMPILED_HEADER),1)
     160CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
    145161endif
    146162

  • trunk/openjdk/hotspot/make/linux/makefiles/i486.make

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2424
    2525# TLS helper, assembled from .s file
    26 # Not included in includeDB because it has no dependencies
    27 Obj_Files += linux_x86_32.o
    2826
    2927# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized

  • trunk/openjdk/hotspot/make/linux/makefiles/jvmti.make

    r278 r309  
    11#
    2 # Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    3838JvmtiSrcDir = $(GAMMADIR)/src/share/vm/prims
    3939InterpreterSrcDir = $(GAMMADIR)/src/share/vm/interpreter
    40 Src_Dirs += $(JvmtiSrcDir)
    4140
    4241# set VPATH so make knows where to look for source files
    43 Src_Dirs_V = ${Src_Dirs}
    44 VPATH    += $(Src_Dirs_V:%=%:)
     42Src_Dirs_V += $(JvmtiSrcDir)
     43VPATH += $(Src_Dirs_V:%=%:)
    4544
    4645JvmtiGeneratedNames = \

  • trunk/openjdk/hotspot/make/linux/makefiles/launcher.make

    r278 r309  
    11#
    2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2525# Rules to build gamma launcher, used by vm.make
    2626
    27 # gamma[_g]: launcher
    2827
     28LAUNCHER_SCRIPT = hotspot
    2929LAUNCHER   = gamma
    30 LAUNCHER_G = $(LAUNCHER)$(G_SUFFIX)
    3130
    32 LAUNCHERDIR   = $(GAMMADIR)/src/os/$(Platform_os_family)/launcher
    33 LAUNCHERFLAGS = $(ARCHFLAG) \
     31LAUNCHERDIR   := $(GAMMADIR)/src/os/posix/launcher
     32LAUNCHERDIR_SHARE := $(GAMMADIR)/src/share/tools/launcher
     33LAUNCHERFLAGS := $(ARCHFLAG) \
    3434                -I$(LAUNCHERDIR) -I$(GAMMADIR)/src/share/vm/prims \
     35                -I$(LAUNCHERDIR_SHARE) \
    3536                -DFULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
     37                -DJDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \
     38                -DJDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\" \
    3639                -DARCH=\"$(LIBARCH)\" \
    3740                -DGAMMA \
    3841                -DLAUNCHER_TYPE=\"gamma\" \
    39                 -DLINK_INTO_$(LINK_INTO)
     42                -DLINK_INTO_$(LINK_INTO) \
     43                $(TARGET_DEFINES)
    4044
    4145ifeq ($(LINK_INTO),AOUT)
    … …  
    5660LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
    5761
    58 launcher.o: launcher.c $(LAUNCHERDIR)/java.c $(LAUNCHERDIR)/java_md.c
    59         $(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS)
     62LAUNCHER_OUT = launcher
    6063
    61 launcher.c:
    62         @echo Generating $@
    63         $(QUIETLY) { \
    64         echo '#define debug launcher_debug'; \
    65         echo '#include "java.c"'; \
    66         echo '#include "java_md.c"'; \
    67         } > $@
     64SUFFIXES += .d
    6865
    69 $(LAUNCHER): $(LAUNCHER.o) $(LIBJVM) $(LAUNCHER_MAPFILE)
    70         $(QUIETLY) { \
    71             echo Linking launcher...; \
    72             $(LINK_LAUNCHER/PRE_HOOK) \
    73             $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \
    74             $(LINK_LAUNCHER/POST_HOOK) \
    75             [ -f $(LAUNCHER_G) ] || { ln -s $@ $(LAUNCHER_G); }; \
    76         }
     66SOURCES := $(shell find $(LAUNCHERDIR) -name "*.c")
     67SOURCES_SHARE := $(shell find $(LAUNCHERDIR_SHARE) -name "*.c")
     68
     69OBJS := $(patsubst $(LAUNCHERDIR)/%.c,$(LAUNCHER_OUT)/%.o,$(SOURCES)) $(patsubst $(LAUNCHERDIR_SHARE)/%.c,$(LAUNCHER_OUT)/%.o,$(SOURCES_SHARE))
     70
     71DEPFILES := $(patsubst %.o,%.d,$(OBJS))
     72-include $(DEPFILES)
     73
     74$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c
     75        $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
     76        $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
     77
     78$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
     79        $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
     80        $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
     81
     82$(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
     83        $(QUIETLY) echo Linking launcher...
     84        $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)
     85        $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER)
     86        $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK)
     87
     88$(LAUNCHER): $(LAUNCHER_SCRIPT)
     89
     90$(LAUNCHER_SCRIPT): $(LAUNCHERDIR)/launcher.script
     91        $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@
     92        $(QUIETLY) chmod +x $@
     93

  • trunk/openjdk/hotspot/make/linux/makefiles/mapfile-vers-debug

    r278 r309  
    44
    55#
    6 # Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
     6# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
    77# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    88#

  • trunk/openjdk/hotspot/make/linux/makefiles/mapfile-vers-product

    r278 r309  
    44
    55#
    6 # Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
     6# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
    77# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    88#

  • trunk/openjdk/hotspot/make/linux/makefiles/product.make

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#

  • trunk/openjdk/hotspot/make/linux/makefiles/rules.make

    r278 r309  
    11#
    2 # Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    152152        @echo Compiling $<
    153153        $(QUIETLY) $(REMOVE_TARGET)
    154         $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
     154        $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
    155155else
    156156%.o: %.cpp
    … …  
    158158        $(QUIETLY) $(REMOVE_TARGET)
    159159        $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
    160            $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) -o $@ $< $(COMPILE_DONE), \
    161            $(COMPILE.CC) -o $@ $< $(COMPILE_DONE))
     160           $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
     161           $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
    162162endif
    163163
    … …  
    165165        @echo Assembling $<
    166166        $(QUIETLY) $(REMOVE_TARGET)
    167         $(QUIETLY) $(AS.S) -o $@ $< $(COMPILE_DONE)
     167        $(QUIETLY) $(AS.S) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
    168168
    169169%.s: %.cpp

  • trunk/openjdk/hotspot/make/linux/makefiles/sa.make

    r278 r309  
    11#
    2 # Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    4949AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
    5050
     51AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
     52AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
     53
    5154SA_CLASSDIR = $(GENERATED)/saclasses
    5255
    … …  
    8083          mkdir -p $(SA_CLASSDIR);        \
    8184        fi
    82 
    83         $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
    84         $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
    85 
     85       
     86# Note: When indented, make tries to execute the '$(shell' comment.
     87# In some environments, cmd processors have limited line length.
     88# To prevent the javac invocation in the next block from using
     89# a very long cmd line, we use javac's @file-list option. We
     90# generate the file lists using make's built-in 'foreach' control
     91# flow which also avoids cmd processor line length issues. Since
     92# the 'foreach' is done as part of make's macro expansion phase,
     93# the initialization of the lists is also done in the same phase
     94# using '$(shell rm ...' instead of using the more traditional
     95# 'rm ...' rule.
     96        $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
     97        $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
     98        $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
     99       
     100        $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
     101        $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
     102       
    86103        $(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
    87104        $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
    … …  
    102119        rm -rf $(SA_CLASSDIR)
    103120        rm -rf $(GENERATED)/sa-jdi.jar
     121        rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)

  • trunk/openjdk/hotspot/make/linux/makefiles/saproc.make

    r278 r309  
    11#
    2 # Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    5656# also, we don't build SA on Itanium, PPC, ARM or zero.
    5757
    58 checkAndBuildSA:
    59         $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "arm" -a "$(SRCARCH)" != "ppc" -a "$(SRCARCH)" != "zero" ] ; then \
    60            $(MAKE) -f vm.make $(LIBSAPROC); \
    61         fi
     58ifneq ($(wildcard $(AGENT_DIR)),)
     59ifneq ($(filter-out ia64 arm ppc zero,$(SRCARCH)),)
     60  BUILDLIBSAPROC = $(LIBSAPROC)
     61endif
     62endif
     63
    6264
    6365SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
    … …  
    8284        $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
    8385
    84 install_saproc: checkAndBuildSA
     86install_saproc: $(BUILDLIBSAPROC)
    8587        $(QUIETLY) if [ -e $(LIBSAPROC) ] ; then             \
    8688          echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)";     \
    … …  
    8890        fi
    8991
    90 .PHONY: checkAndBuildSA install_saproc
     92.PHONY: install_saproc

  • trunk/openjdk/hotspot/make/linux/makefiles/shark.make

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# Copyright 2008, 2010 Red Hat, Inc.
    44# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

  • trunk/openjdk/hotspot/make/linux/makefiles/sparc.make

    r278 r309  
    11#
    2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2323#
    2424
    25 # Not included in includeDB because it has no dependencies
    26 Obj_Files += linux_sparc.o
    27 

  • trunk/openjdk/hotspot/make/linux/makefiles/sparcWorks.make

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    7575OPT_CFLAGS/NOOPT=-xO0
    7676
     77# Flags for creating the dependency files.
     78ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
     79DEPFLAGS = -xMMD -xMF $(DEP_DIR)/$(@:%=%.d)
     80endif
     81
     82# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
     83CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
     84
    7785#------------------------------------------------------------------------
    7886# Linker flags

  • trunk/openjdk/hotspot/make/linux/makefiles/sparcv9.make

    r278 r309  
    11#
    2 # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    2222# 
    2323
    24 #
    25 # Not included in includeDB because it has no dependencies
    26 Obj_Files += linux_sparc.o
    27 
    2824# gcc 4.0 miscompiles this code in -m64
    2925OPT_CFLAGS/macro.o = -O0

  • trunk/openjdk/hotspot/make/linux/makefiles/top.make

    r278 r309  
    3232
    3333# It assumes the following flags are set:
    34 # CFLAGS Platform_file, Src_Dirs, SYSDEFS, AOUT, Obj_Files
     34# CFLAGS Platform_file, Src_Dirs_I, Src_Dirs_V, SYSDEFS, AOUT, Obj_Files
    3535
    3636# -- D. Ungar (5/97) from a file by Bill Bush
    … …  
    4646CDG         = cd $(GENERATED);
    4747
    48 # Pick up MakeDeps' sources and definitions
    49 include $(GAMMADIR)/make/$(Platform_os_family)/makefiles/makedeps.make
    50 MakeDepsClass = MakeDeps.class
    51 
    5248ifdef USE_PRECOMPILED_HEADER
    5349PrecompiledOption = -DUSE_PRECOMPILED_HEADER
    … …  
    5854endif
    5955
    60 MakeDeps    = $(RUN.JAVA) $(PrecompiledOption) -classpath $(GENERATED) MakeDeps
    61 
    62 Include_DBs/GC          = $(VM)/includeDB_gc \
    63                           $(VM)/includeDB_gc_parallel \
    64                           $(VM)/gc_implementation/includeDB_gc_parallelScavenge \
    65                           $(VM)/gc_implementation/includeDB_gc_concurrentMarkSweep \
    66                           $(VM)/gc_implementation/includeDB_gc_parNew \
    67                           $(VM)/gc_implementation/includeDB_gc_g1     \
    68                           $(VM)/gc_implementation/includeDB_gc_serial \
    69                           $(VM)/gc_implementation/includeDB_gc_shared
    70 
    71 Include_DBs/CORE        = $(VM)/includeDB_core   $(Include_DBs/GC) \
    72                           $(VM)/includeDB_jvmti \
    73                           $(VM)/includeDB_features
    74 Include_DBs/COMPILER1   = $(Include_DBs/CORE) $(VM)/includeDB_compiler1
    75 Include_DBs/COMPILER2   = $(Include_DBs/CORE) $(VM)/includeDB_compiler2
    76 Include_DBs/TIERED      = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
    77 Include_DBs/ZERO        = $(Include_DBs/CORE) $(VM)/includeDB_zero
    78 Include_DBs/SHARK       = $(Include_DBs/ZERO) $(VM)/includeDB_shark
    79 Include_DBs = $(Include_DBs/$(TYPE))
    80 
    8156Cached_plat = $(GENERATED)/platform.current
    82 Cached_db   = $(GENERATED)/includeDB.current
    83 
    84 Incremental_Lists = $(Cached_db)
    85 # list generation also creates $(GENERATED)/$(Cached_plat)
    86 
    8757
    8858AD_Dir   = $(GENERATED)/adfiles
    … …  
    10373
    10474
    105 # default target: make makeDeps, update lists, make vm
     75# default target: update lists, make vm
    10676# done in stages to force sequential order with parallel make
    10777#
    … …  
    11181
    11282# This is an explicit dependency for the sake of parallel makes.
    113 vm_build_preliminaries:  checks $(Incremental_Lists) $(AD_Files_If_Required) jvmti_stuff sa_stuff
     83vm_build_preliminaries:  checks $(Cached_plat) $(AD_Files_If_Required) jvmti_stuff sa_stuff
    11484        @# We need a null action here, so implicit rules don't get consulted.
    11585
    116 # make makeDeps: (and zap the cached db files to force a nonincremental run)
    117 
    118 $(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
    119         @$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
    120         @echo Removing $(Incremental_Lists) to force regeneration.
    121         @rm -f $(Incremental_Lists)
    122         @$(CDG) echo >$(Cached_plat)
    123 
    124 # make incremental_lists, if cached files out of date, run makeDeps
    125 
    126 $(Incremental_Lists): $(Include_DBs) $(Plat_File) $(GENERATED)/$(MakeDepsClass)
    127         $(CDG) cat $(Include_DBs) > $(GENERATED)/includeDB
    128         $(CDG) if [ ! -r incls ] ; then \
    129         mkdir incls ; \
    130         fi
    131         $(CDG) (echo $(CDG) echo $(MakeDeps) diffs UnixPlatform $(Cached_plat) $(Cached_db) $(Plat_File) $(GENERATED)/includeDB $(MakeDepsOptions)) > makeDeps.sh
    132         $(CDG) $(REMOTE) sh $(GENERATED)/makeDeps.sh
    133         $(CDG) cp includeDB    $(Cached_db)
     86$(Cached_plat): $(Plat_File)
    13487        $(CDG) cp $(Plat_File) $(Cached_plat)
    13588
    136 # symbolic target for command lines
    137 lists: $(Incremental_Lists)
    138         @: lists are now up to date
    139 
    14089# make AD files as necessary
    141 ad_stuff: $(Incremental_Lists) $(adjust-mflags)
     90ad_stuff: $(Cached_plat) $(adjust-mflags)
    14291        @$(MAKE) -f adlc.make $(MFLAGS-adjusted)
    14392
    14493# generate JVMTI files from the spec
    145 jvmti_stuff: $(Incremental_Lists) $(adjust-mflags)
     94jvmti_stuff: $(Cached_plat) $(adjust-mflags)
    14695        @$(MAKE) -f jvmti.make $(MFLAGS-adjusted)
    14796
    … …  
    170119        @$(MAKE) -f vm.make install
    171120
    172 # next rules support "make foo.[oi]"
     121# next rules support "make foo.[ois]"
    173122
    174123%.o %.i %.s:
    … …  
    180129clean:
    181130        rm -f $(GENERATED)/*.class
    182         $(MAKE) $(MFLAGS) $(GENERATED)/$(MakeDepsClass)
    183131        $(MAKE) -f vm.make $(MFLAGS) clean
    184132

  • trunk/openjdk/hotspot/make/linux/makefiles/vm.make

    r278 r309  
    3636
    3737GENERATED     = ../generated
    38 
    39 # read a generated file defining the set of .o's and the .o .h dependencies
    40 include $(GENERATED)/Dependencies
     38DEP_DIR       = $(GENERATED)/dependencies
     39
     40# reads the generated files defining the set of .o's and the .o .h dependencies
     41-include $(DEP_DIR)/*.d
    4142
    4243# read machine-specific adjustments (%%% should do this via buildtree.make?)
    … …  
    4849
    4950# set VPATH so make knows where to look for source files
    50 # Src_Dirs is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
    51 # The incls directory contains generated header file lists for inclusion.
     51# Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
    5252# The adfiles directory contains ad_<arch>.[ch]pp.
    5353# The jvmtifiles directory contains jvmti*.[ch]pp
    54 Src_Dirs_V = $(GENERATED)/adfiles $(GENERATED)/jvmtifiles ${Src_Dirs} $(GENERATED)/incls
    55 VPATH    += $(Src_Dirs_V:%=%:)
    56 
    57 # set INCLUDES for C preprocessor
    58 Src_Dirs_I = $(PRECOMPILED_HEADER_DIR) $(GENERATED)/adfiles $(GENERATED)/jvmtifiles ${Src_Dirs} $(GENERATED)
    59 INCLUDES += $(Src_Dirs_I:%=-I%)
     54Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles
     55VPATH += $(Src_Dirs_V:%=%:)
     56
     57# set INCLUDES for C preprocessor.
     58Src_Dirs_I += $(GENERATED)
     59# The order is important for the precompiled headers to work.
     60INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
    6061
    6162ifeq (${VERSION}, debug)
    … …  
    119120LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
    120121
     122CORE_PATHS := $(shell find $(GAMMADIR)/src/share/vm/* -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \))
     123CORE_PATHS += $(GAMMADIR)/src/os/$(Platform_os_family)/vm
     124CORE_PATHS += $(GAMMADIR)/src/cpu/$(Platform_arch)/vm
     125CORE_PATHS += $(GAMMADIR)/src/os_cpu/$(Platform_os_arch)/vm
     126CORE_PATHS += $(GENERATED)/jvmtifiles
     127
     128COMPILER1_PATHS := $(GAMMADIR)/src/share/vm/c1
     129
     130COMPILER2_PATHS := $(GAMMADIR)/src/share/vm/opto
     131COMPILER2_PATHS += $(GAMMADIR)/src/share/vm/libadt
     132COMPILER2_PATHS +=  $(GENERATED)/adfiles
     133
     134# Include dirs per type.
     135Src_Dirs/CORE      := $(CORE_PATHS)
     136Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
     137Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
     138Src_Dirs/TIERED    := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
     139Src_Dirs/ZERO      := $(CORE_PATHS)
     140Src_Dirs/SHARK     := $(CORE_PATHS)
     141Src_Dirs := $(Src_Dirs/$(TYPE))
     142
     143COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
     144COMPILER1_SPECIFIC_FILES := c1_\*
     145SHARK_SPECIFIC_FILES     := shark
     146ZERO_SPECIFIC_FILES      := zero
     147
     148# Always exclude these.
     149Src_Files_EXCLUDE := jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
     150
     151# Exclude per type.
     152Src_Files_EXCLUDE/CORE      := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
     153Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
     154Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
     155Src_Files_EXCLUDE/TIERED    := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
     156Src_Files_EXCLUDE/ZERO      := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
     157Src_Files_EXCLUDE/SHARK     := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES)
     158
     159Src_Files_EXCLUDE +=  $(Src_Files_EXCLUDE/$(TYPE))
     160
     161# Special handling of arch model.
     162ifeq ($(Platform_arch_model), x86_32)
     163Src_Files_EXCLUDE += \*x86_64\*
     164endif
     165ifeq ($(Platform_arch_model), x86_64)
     166Src_Files_EXCLUDE += \*x86_32\*
     167endif
     168
     169# Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
     170define findsrc
     171        $(notdir $(shell find $(1)/. ! -name . -prune \
     172                -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \
     173                -a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \)))
     174endef
     175
     176Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))
     177
     178Obj_Files = $(sort $(addsuffix .o,$(basename $(Src_Files))))
     179
    121180JVM_OBJ_FILES = $(Obj_Files)
    122181
    … …  
    181240
    182241# rule for building precompiled header
    183 $(PRECOMPILED_HEADER): $(Precompiled_Files)
     242$(PRECOMPILED_HEADER):
    184243        $(QUIETLY) echo Generating precompiled header $@
    185         $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)/incls
    186         $(QUIETLY) $(COMPILE.CC) -x c++-header -c $(GENERATED)/incls/_precompiled.incl -o $@ $(COMPILE_DONE)
     244        $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
     245        $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
    187246
    188247# making the library:
    … …  
    253312#----------------------------------------------------------------------
    254313
    255 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) checkAndBuildSA
     314build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
    256315
    257316install: install_jvm install_jsig install_saproc

  • trunk/openjdk/hotspot/make/linux/makefiles/zero.make

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33# Copyright 2009 Red Hat, Inc.
    44# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    2626# Setup for Zero (non-Shark) version of VM
    2727
    28 # Select which includeDB files to use (in top.make)
     28# Select which files to use (in top.make)
    2929TYPE = ZERO
    3030
Note: See TracChangeset for help on using the changeset viewer.