Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

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

Location:
trunk/openjdk
Files:
132 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/hotspot/make/Makefile

    r245 r278  
    11#
    2 # Copyright 2005-2010 Sun Microsystems, Inc.  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#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222#
    2323#
    … …  
    8686KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
    8787ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
     88SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
    8889
    8990# JDK directory list
    … …  
    9192
    9293all:           all_product all_fastdebug
     94ifndef BUILD_CLIENT_ONLY
    9395all_product:   product product1 productkernel docs export_product
    9496all_fastdebug: fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
    9597all_debug:     jvmg jvmg1 jvmgkernel docs export_debug
     98else
     99all_product:   product1 docs export_product
     100all_fastdebug: fastdebug1 docs export_fastdebug
     101all_debug:     jvmg1 docs export_debug
     102endif
    96103all_optimized: optimized optimized1 optimizedkernel docs export_optimized
    97104
    … …  
    102109all_optimizedzero: optimizedzero docs export_optimized
    103110
     111allshark:           all_productshark all_fastdebugshark
     112all_productshark:   productshark docs export_product
     113all_fastdebugshark: fastdebugshark docs export_fastdebug
     114all_debugshark:     jvmgshark docs export_debug
     115all_optimizedshark: optimizedshark docs export_optimized
     116
    104117# Do everything
    105118world:         all create_jdk
    … …  
    131144        $(CD) $(GAMMADIR)/make; \
    132145        $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
     146
     147$(SHARK_VM_TARGETS):
     148        $(CD) $(GAMMADIR)/make; \
     149        $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
    133150
    134151# Build compiler1 (client) rule, different for platforms
    … …  
    197214                $(MAKE) -f $(ABS_OS_MAKEFILE) \
    198215                        $(MAKE_ARGS) $(VM_TARGET)
     216
     217generic_buildshark:
     218        $(MKDIR) -p $(OUTPUTDIR)
     219        $(CD) $(OUTPUTDIR); \
     220                $(MAKE) -f $(ABS_OS_MAKEFILE) \
     221                        $(MAKE_ARGS) $(VM_TARGET)
    199222
    200223# Export file rule
    … …  
    229252KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
    230253ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
     254SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
    231255C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
    232256C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
    233257KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
    234258ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
     259SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
    235260
    236261# Misc files and generated files need to come from C1 or C2 area
    237262ifeq ($(ZERO_BUILD), true)
     263ifeq ($(SHARK_BUILD), true)
     264  MISC_DIR=$(SHARK_DIR)
     265  GEN_DIR=$(SHARK_BASE_DIR)/generated
     266else
    238267  MISC_DIR=$(ZERO_DIR)
    239268  GEN_DIR=$(ZERO_BASE_DIR)/generated
     269endif
    240270else
    241271ifeq ($(ARCH_DATA_MODEL), 32)
    … …  
    311341ifneq ($(filter-out windows os2,$(OSNAME)),)
    312342  ifeq ($(ZERO_BUILD), true)
     343    ifeq ($(SHARK_BUILD), true)
     344$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so
     345        $(install-file)
     346$(EXPORT_SERVER_DIR)/%.so:       $(SHARK_DIR)/%.so
     347        $(install-file)
     348    else
    313349$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
    314350        $(install-file)
    315351$(EXPORT_SERVER_DIR)/%.so:       $(ZERO_DIR)/%.so
    316352        $(install-file)
    317   else
     353    endif
     354  else
     355$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C1_DIR)/%.so
     356        $(install-file)
    318357$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
    319358        $(install-file)
    … …  
    369408        $(RM) -r $(KERNEL_DIR)
    370409        $(RM) -r $(ZERO_DIR)
     410        $(RM) -r $(SHARK_DIR)
    371411clean_export:
    372412        $(RM) -r $(EXPORT_PATH)

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

    r40 r278  
    11#
    2 # Copyright 2006-2010 Sun Microsystems, Inc.  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#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222#
    2323#
    … …  
    202202  # Use uname output for SRCARCH, but deal with platform differences. If ARCH
    203203  # is not explicitly listed below, it is treated as x86.
    204   SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 zero,$(ARCH)))
     204  SRCARCH     = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc zero,$(ARCH)))
    205205  ARCH/       = x86
    206206  ARCH/sparc  = sparc
    … …  
    209209  ARCH/amd64  = x86
    210210  ARCH/x86_64 = x86
     211  ARCH/ppc64  = ppc
     212  ARCH/ppc    = ppc
     213  ARCH/arm    = arm
    211214  ARCH/zero   = zero
    212215
    … …  
    233236  LIBARCH/sparcv9 = sparcv9
    234237  LIBARCH/ia64    = ia64
     238  LIBARCH/ppc64   = ppc
     239  LIBARCH/ppc     = ppc
     240  LIBARCH/arm     = arm
    235241  LIBARCH/zero    = $(ZERO_LIBARCH)
    236242

  • trunk/openjdk/hotspot/make/hotspot_distro

    r2 r278  
    11#
    2 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222#
    2323
    … …  
    2929# Don't put quotes (fail windows build).
    3030HOTSPOT_VM_DISTRO=Java HotSpot(TM)
    31 COMPANY_NAME=Sun Microsystems, Inc.
     31COMPANY_NAME=Oracle Corporation
    3232PRODUCT_NAME=Java(TM) Platform SE

  • trunk/openjdk/hotspot/make/hotspot_version

    r2 r278  
    11#
    2 # Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222#
    2323
    … …  
    3232
    3333# Don't put quotes (fail windows build).
    34 HOTSPOT_VM_COPYRIGHT=Copyright 2009
     34HOTSPOT_VM_COPYRIGHT=Copyright 2010
    3535
    36 HS_MAJOR_VER=16
     36HS_MAJOR_VER=19
    3737HS_MINOR_VER=0
    38 HS_BUILD_NUMBER=13
     38HS_BUILD_NUMBER=09
    3939
    4040JDK_MAJOR_VER=1

  • trunk/openjdk/hotspot/make/jprt.gmk

    r2 r278  
    11#
    2 # Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    3030endif
    3131
     32ifeq ($(OSNAME),windows)
     33  ZIPFLAGS=-q
     34else
     35  # store symbolic links as the link
     36  ZIPFLAGS=-q -y
     37endif
     38
    3239jprt_build_product: all_product copy_product_jdk export_product_jdk
    3340        ( $(CD) $(JDK_IMAGE_DIR) && \
    34           $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
     41          $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
    3542
    3643jprt_build_fastdebug: all_fastdebug copy_fastdebug_jdk export_fastdebug_jdk
    3744        ( $(CD) $(JDK_IMAGE_DIR)/fastdebug && \
    38           $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
     45          $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
    3946
    4047jprt_build_debug: all_debug copy_debug_jdk export_debug_jdk
    4148        ( $(CD) $(JDK_IMAGE_DIR)/debug && \
    42           $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
     49          $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
    4350
    4451.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug

  • trunk/openjdk/hotspot/make/jprt.properties

    r2 r278  
    11#
    2 # Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222#
    2323#
    … …  
    4040
    4141#jprt.tools.default.release=${jprt.submit.release}
    42 jprt.tools.default.release=jdk6u18
    43 
     42jprt.tools.default.release=jdk6perf
     43
     44# Disable syncing the source after builds and tests are done.
     45
     46jprt.sync.push=false
    4447
    4548# Define the Solaris platforms we want for the various releases
    … …  
    5154jprt.my.solaris.sparc.jdk6u14=solaris_sparc_5.8
    5255jprt.my.solaris.sparc.jdk6u18=solaris_sparc_5.8
     56jprt.my.solaris.sparc.jdk6u20=solaris_sparc_5.8
    5357jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
    5458
    … …  
    5963jprt.my.solaris.sparcv9.jdk6u14=solaris_sparcv9_5.8
    6064jprt.my.solaris.sparcv9.jdk6u18=solaris_sparcv9_5.8
     65jprt.my.solaris.sparcv9.jdk6u20=solaris_sparcv9_5.8
    6166jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
    6267
    … …  
    6772jprt.my.solaris.i586.jdk6u14=solaris_i586_5.8
    6873jprt.my.solaris.i586.jdk6u18=solaris_i586_5.8
     74jprt.my.solaris.i586.jdk6u20=solaris_i586_5.8
    6975jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
    7076
    … …  
    7581jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10
    7682jprt.my.solaris.x64.jdk6u18=solaris_x64_5.10
     83jprt.my.solaris.x64.jdk6u20=solaris_x64_5.10
    7784jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
    7885
    … …  
    8390jprt.my.linux.i586.jdk6u14=linux_i586_2.4
    8491jprt.my.linux.i586.jdk6u18=linux_i586_2.4
     92jprt.my.linux.i586.jdk6u20=linux_i586_2.4
    8593jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
    8694
    … …  
    9199jprt.my.linux.x64.jdk6u14=linux_x64_2.4
    92100jprt.my.linux.x64.jdk6u18=linux_x64_2.4
     101jprt.my.linux.x64.jdk6u20=linux_x64_2.4
    93102jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
    94103
    … …  
    99108jprt.my.windows.i586.jdk6u14=windows_i586_5.0
    100109jprt.my.windows.i586.jdk6u18=windows_i586_5.0
     110jprt.my.windows.i586.jdk6u20=windows_i586_5.0
    101111jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
    102112
    … …  
    107117jprt.my.windows.x64.jdk6u14=windows_x64_5.2
    108118jprt.my.windows.x64.jdk6u18=windows_x64_5.2
     119jprt.my.windows.x64.jdk6u20=windows_x64_5.2
    109120jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
    110121

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  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#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    169169#       productzero     zero            <os>_<arch>_zero/product
    170170#
     171#       debugshark      shark           <os>_<arch>_shark/debug
     172#       fastdebugshark  shark           <os>_<arch>_shark/fastdebug
     173#       jvmgshark       shark           <os>_<arch>_shark/jvmg
     174#       optimizedshark  shark           <os>_<arch>_shark/optimized
     175#       profiledshark   shark           <os>_<arch>_shark/profiled
     176#       productshark    shark           <os>_<arch>_shark/product
     177#
    171178# What you get with each target:
    172179#
    … …  
    192199SUBDIRS_CORE      = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
    193200SUBDIRS_ZERO      = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
     201SUBDIRS_SHARK     = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
    194202
    195203TARGETS_C2        = $(TARGETS)
    … …  
    198206TARGETS_CORE      = $(addsuffix core,$(TARGETS))
    199207TARGETS_ZERO      = $(addsuffix zero,$(TARGETS))
     208TARGETS_SHARK     = $(addsuffix shark,$(TARGETS))
    200209
    201210BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
    … …  
    214223        @echo "  $(TARGETS_CORE)"
    215224        @echo "  $(TARGETS_ZERO)"
     225        @echo "  $(TARGETS_SHARK)"
    216226
    217227checks: check_os_version check_j2se_version
    … …  
    267277        $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
    268278
     279$(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
     280        $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
     281        $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
     282
    269283platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
    270284        $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
    … …  
    305319ifdef INSTALL
    306320        cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
     321endif
     322
     323$(TARGETS_SHARK):  $(SUBDIRS_SHARK)
     324        cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
     325        cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
     326ifdef INSTALL
     327        cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
    307328endif
    308329
    … …  
    312333treecore:  $(SUBDIRS_CORE)
    313334treezero:  $(SUBDIRS_ZERO)
     335treeshark: $(SUBDIRS_SHARK)
    314336
    315337# Doc target.  This is the same for all build options.
    … …  
    328350zero: jvmgzero productzero
    329351
     352shark: jvmgshark productshark
     353
    330354clean_docs:
    331355        rm -rf $(SUBDIR_DOCS)
    332356
    333 clean_compiler1 clean_compiler2 clean_core clean_zero:
     357clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark:
    334358        rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
    335359
    336 clean:  clean_compiler2 clean_compiler1 clean_core clean_zero clean_docs
     360clean:  clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_docs
    337361
    338362include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make
    … …  
    340364#-------------------------------------------------------------------------------
    341365
    342 .PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO)
    343 .PHONY: tree tree1 treecore treezero
    344 .PHONY: all compiler1 compiler2 core zero
    345 .PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero docs clean_docs
     366.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK)
     367.PHONY: tree tree1 treecore treezero treeshark
     368.PHONY: all compiler1 compiler2 core zero shark
     369.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs
    346370.PHONY: checks check_os_version check_j2se_version

  • trunk/openjdk/hotspot/make/linux/README

    r2 r278  
    1 Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
     1Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    22DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33 
    … …  
    1616Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1717 
    18 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    19 CA 95054 USA or visit www.sun.com if you need additional information or
    20 have any questions.
     18Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     19or visit www.oracle.com if you need additional information or have any
     20questions.
    2121
    2222________________________________________________________________________

  • trunk/openjdk/hotspot/make/linux/build.sh

    r2 r278  
    11#! /bin/sh
    22#
    3 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     3# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    44# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55#
    … …  
    1818# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919#
    20 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 # CA 95054 USA or visit www.sun.com if you need additional information or
    22 # have any questions.
     20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21# or visit www.oracle.com if you need additional information or have any
     22# questions.
    2323# 
    2424#

  • trunk/openjdk/hotspot/make/linux/makefiles/adjust-mflags.sh

    r2 r278  
    11#! /bin/sh
    22#
    3 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     3# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    44# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55#
    … …  
    1818# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919#
    20 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 # CA 95054 USA or visit www.sun.com if you need additional information or
    22 # have any questions.
     20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21# or visit www.oracle.com if you need additional information or have any
     22# questions.
    2323# 
    2424#

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

    r2 r278  
    11#
    2 # Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    128128TEMPDIR := $(OUTDIR)/mktmp$(shell echo $$$$)
    129129
     130# Debuggable by default
     131CFLAGS += -g
     132
    130133# Pass -D flags into ADLC.
    131134ADLCFLAGS += $(SYSDEFS)
    … …  
    136139# Normally, debugging is done directly on the ad_<arch>*.cpp files.
    137140# But -g will put #line directives in those files pointing back to <arch>.ad.
    138 #ADLCFLAGS += -g
     141# Some builds of gcc 3.2 have a bug that gets tickled by the extra #line directives
     142# so skip it for 3.2 and ealier.
     143ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
     144ADLCFLAGS += -g
     145endif
    139146
    140147ifdef LP64

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

    r2 r278  
    11#
    2 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    340340        echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
    341341
     342CROSS_COMPILING_MSG = \
     343        echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run."
     344
    342345test_gamma:  $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
    343346        @echo Creating $@ ...
    … …  
    346349        $(BUILDTREE_COMMENT); \
    347350        echo '. ./env.sh'; \
     351        echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \
    348352        echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
    349353        echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    3939 "----------------------------------------------------------------------\n")
    4040
    41 G_SUFFIX =
     41G_SUFFIX = _g
    4242VERSION = debug
    4343SYSDEFS += -DASSERT -DDEBUG

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

    r2 r278  
    11#
    2 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    9999endif
    100100
     101# ARM
     102ifeq ($(ARCH), arm)
     103  ARCH_DATA_MODEL  = 32
     104  PLATFORM         = linux-arm
     105  VM_PLATFORM      = linux_arm
     106  HS_ARCH          = arm
     107endif
     108
     109# PPC
     110ifeq ($(ARCH), ppc)
     111  ARCH_DATA_MODEL  = 32
     112  PLATFORM         = linux-ppc
     113  VM_PLATFORM      = linux_ppc
     114  HS_ARCH          = ppc
     115endif
     116
    101117JDK_INCLUDE_SUBDIR=linux
    102118
    … …  
    105121
    106122EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
     123
     124# client and server subdirectories have symbolic links to ../libjsig.so
     125EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
    107126EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
     127
     128ifndef BUILD_CLIENT_ONLY
    108129EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
    109 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
    110130EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
     131endif
     132
    111133ifneq ($(ZERO_BUILD), true)
    112134  ifeq ($(ARCH_DATA_MODEL), 32)
    113135    EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
    114136    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
    115     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
    116137    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
    117     EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
    118     EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
    119   else
    120     ifeq ($(ARCH),ia64)
    121       else
    122         EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
    123         EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
    124     endif
    125138  endif
    126139endif
     140
     141# Serviceability Binaries
     142# No SA Support for PPC, IA64, ARM or zero
     143ADD_SA_BINARIES/x86   = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
     144                        $(EXPORT_LIB_DIR)/sa-jdi.jar
     145ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
     146                        $(EXPORT_LIB_DIR)/sa-jdi.jar
     147ADD_SA_BINARIES/ppc   =
     148ADD_SA_BINARIES/ia64  =
     149ADD_SA_BINARIES/arm   =
     150ADD_SA_BINARIES/zero  =
     151
     152EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
     153
     154

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    5959MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
    6060
    61 G_SUFFIX =
     61G_SUFFIX = _g
    6262VERSION = optimized
    6363SYSDEFS += -DASSERT -DFASTDEBUG

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

    r2 r278  
    11#
    2 # Copyright 1999-2009 Sun Microsystems, Inc.  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#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2626# CC, CPP & AS
    2727
     28ifdef ALT_COMPILER_PATH
     29CPP = $(ALT_COMPILER_PATH)/g++
     30CC  = $(ALT_COMPILER_PATH)/gcc
     31else
    2832CPP = g++
    2933CC  = gcc
     34endif
     35
    3036AS  = $(CC) -c
    3137
    … …  
    5561ifeq ($(ZERO_BUILD), true)
    5662CFLAGS += $(LIBFFI_CFLAGS)
     63endif
     64ifeq ($(SHARK_BUILD), true)
     65CFLAGS += $(LLVM_CFLAGS)
    5766endif
    5867CFLAGS += $(VM_PICFLAG)
    … …  
    6877ARCHFLAG/sparc   = -m32 -mcpu=v9
    6978ARCHFLAG/sparcv9 = -m64 -mcpu=v9
     79ARCHFLAG/arm     =  -fsigned-char
    7080ARCHFLAG/zero    = $(ZERO_ARCHFLAG)
     81ifndef E500V2
     82ARCHFLAG/ppc     =  -mcpu=powerpc
     83endif
    7184
    7285CFLAGS     += $(ARCHFLAG)
    … …  
    7588ASFLAGS    += $(ARCHFLAG)
    7689
     90ifdef E500V2
     91CFLAGS += -DE500V2
     92endif
     93
    7794# Use C++ Interpreter
    7895ifdef CC_INTERP
    7996  CFLAGS += -DCC_INTERP
     97endif
     98
     99# Build for embedded targets
     100ifdef JAVASE_EMBEDDED
     101  CFLAGS += -DJAVASE_EMBEDDED
    80102endif
    81103
    … …  
    172194DEBUG_CFLAGS/ia64  = -g
    173195DEBUG_CFLAGS/amd64 = -g
     196DEBUG_CFLAGS/arm   = -g
     197DEBUG_CFLAGS/ppc   = -g
    174198DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
    175199ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
    … …  
    182206  CFLAGS += $(DEBUG_CFLAGS)
    183207endif
     208
     209# If we are building HEADLESS, pass on to VM
     210# so it can set the java.awt.headless property
     211ifdef HEADLESS
     212CFLAGS += -DHEADLESS
     213endif
     214
     215# We are building Embedded for a small device
     216# favor code space over speed
     217ifdef MINIMIZE_RAM_USAGE
     218CFLAGS += -DMINIMIZE_RAM_USAGE
     219endif

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2626
    2727# libjsig[_g].so: signal interposition library
    28 JSIG = jsig$(G_SUFFIX)
     28JSIG = jsig
    2929LIBJSIG = lib$(JSIG).so
     30
     31JSIG_G    = $(JSIG)$(G_SUFFIX)
     32LIBJSIG_G = lib$(JSIG_G).so
    3033
    3134JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
    … …  
    4750endif
    4851
    49 # DEBUG_BINARIES overrides everything, use full -g debug information
    50 ifeq ($(DEBUG_BINARIES), true)
    51   JSIG_DEBUG_CFLAGS = -g
    52 endif
    53 
    5452$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
    5553        @echo Making signal interposition lib...
    5654        $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
    5755                         $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
     56        $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
    5857
    5958install_jsig: $(LIBJSIG)

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    3636MAPFILE = $(GAMMADIR)/make/linux/makefiles/mapfile-vers-debug
    3737
    38 G_SUFFIX =
     38G_SUFFIX = _g
    3939VERSION = debug
    4040SYSDEFS += -DASSERT -DDEBUG

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

    r2 r278  
    11#
    2 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2626
    2727# gamma[_g]: launcher
    28 LAUNCHER = gamma$(G_SUFFIX)
     28
     29LAUNCHER   = gamma
     30LAUNCHER_G = $(LAUNCHER)$(G_SUFFIX)
    2931
    3032LAUNCHERDIR   = $(GAMMADIR)/src/os/$(Platform_os_family)/launcher
    … …  
    7173            $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \
    7274            $(LINK_LAUNCHER/POST_HOOK) \
     75            [ -f $(LAUNCHER_G) ] || { ln -s $@ $(LAUNCHER_G); }; \
    7376        }

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

    r2 r278  
    11#
    2 # Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    44
    55#
    6 # Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
     6# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
    77# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    88#
    … …  
    2121# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2222#
    23 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    24 # CA 95054 USA or visit www.sun.com if you need additional information or
    25 # have any questions.
     23# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     24# or visit www.oracle.com if you need additional information or have any
     25# questions.
    2626# 
    2727#
    … …  
    291291                # This is for Forte Analyzer profiling support.
    292292                AsyncGetCallTrace;
     293
     294                # INSERT VTABLE SYMBOLS HERE
     295
    293296        local:
    294297                *;

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

    r2 r278  
    22
    33#
    4 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

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

    r2 r278  
    44
    55#
    6 # Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
     6# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
    77# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    88#
    … …  
    2121# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2222#
    23 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    24 # CA 95054 USA or visit www.sun.com if you need additional information or
    25 # have any questions.
     23# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     24# or visit www.oracle.com if you need additional information or have any
     25# questions.
    2626# 
    2727#
    … …  
    286286                # This is for Forte Analyzer profiling support.
    287287                AsyncGetCallTrace;
     288
     289                # INSERT VTABLE SYMBOLS HERE
     290
    288291        local:
    289292                *;

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    4747# use -g to strip library as -x will discard its symbol table; -x is fine for
    4848# executables.
    49 STRIP = strip
     49ifdef CROSS_COMPILE_ARCH
     50  STRIP = $(ALT_COMPILER_PATH)/strip
     51else
     52  STRIP = strip
     53endif
    5054STRIP_LIBJVM = $(STRIP) -g $@ || exit 1;
    5155STRIP_AOUT   = $(STRIP) -x $@ || exit 1;

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    4141SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
    4242
     43# TODO: if it's a modules image, check if SA module is installed.
     44MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
     45
    4346# gnumake 3.78.1 does not accept the *s that
    4447# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
    … …  
    5356
    5457# if $(AGENT_DIR) does not exist, we don't build SA
    55 # also, we don't build SA on Itanium or zero.
     58# also, we don't build SA on Itanium, PowerPC, ARM or zero.
    5659
    5760all:
    58         if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
     61        if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
     62             -a "$(SRCARCH)" != "arm" \
     63             -a "$(SRCARCH)" != "ppc" \
     64             -a "$(SRCARCH)" != "zero" ] ; then \
    5965           $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
    6066        fi
    … …  
    6672          exit 1; \
    6773        fi
    68         $(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \
     74        $(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \
    6975          echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
    7076          echo ""; \

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

    r2 r278  
    11#
    2 # Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2626
    2727# libsaproc[_g].so: serviceability agent
    28 SAPROC = saproc$(G_SUFFIX)
     28
     29SAPROC = saproc
    2930LIBSAPROC = lib$(SAPROC).so
     31
     32SAPROC_G = $(SAPROC)$(G_SUFFIX)
     33LIBSAPROC_G = lib$(SAPROC_G).so
    3034
    3135AGENT_DIR = $(GAMMADIR)/agent
    … …  
    5054
    5155# if $(AGENT_DIR) does not exist, we don't build SA
    52 # also, we don't build SA on Itanium or zero.
     56# also, we don't build SA on Itanium, PPC, ARM or zero.
    5357
    5458checkAndBuildSA:
    55         $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "zero" ] ; then \
     59        $(QUIETLY) if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" -a "$(SRCARCH)" != "arm" -a "$(SRCARCH)" != "ppc" -a "$(SRCARCH)" != "zero" ] ; then \
    5660           $(MAKE) -f vm.make $(LIBSAPROC); \
    5761        fi
    … …  
    7680                   -o $@                                                \
    7781                   -lthread_db
     82        $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
    7883
    7984install_saproc: checkAndBuildSA

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323

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

    r2 r278  
    11#
    2 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  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#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    7676Include_DBs/TIERED      = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2
    7777Include_DBs/ZERO        = $(Include_DBs/CORE) $(VM)/includeDB_zero
     78Include_DBs/SHARK       = $(Include_DBs/ZERO) $(VM)/includeDB_shark
    7879Include_DBs = $(Include_DBs/$(TYPE))
    7980

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  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#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    9999# Extra flags from gnumake's invocation or environment
    100100CFLAGS += $(EXTRA_CFLAGS)
     101LFLAGS += $(EXTRA_CFLAGS)
    101102
    102103LIBS += -lm -ldl -lpthread
    … …  
    114115# JVM
    115116
    116 JVM    = jvm$(G_SUFFIX)
    117 LIBJVM = lib$(JVM).so
     117JVM      = jvm
     118LIBJVM   = lib$(JVM).so
     119LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
    118120
    119121JVM_OBJ_FILES = $(Obj_Files)
    … …  
    121123vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
    122124
    123 mapfile : $(MAPFILE)
     125mapfile : $(MAPFILE) vm.def
    124126        rm -f $@
    125         cat $^ > $@
     127        awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE")  \
     128                 { system ("cat vm.def"); }             \
     129               else                                     \
     130                 { print $$0 }                          \
     131             }' > $@ < $(MAPFILE)
    126132
    127133mapfile_reorder : mapfile $(REORDERFILE)
    … …  
    129135        cat $^ > $@
    130136
    131 ifeq ($(ZERO_LIBARCH), ppc64)
     137vm.def: $(Res_Files) $(Obj_Files)
     138        sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
     139
     140ifeq ($(SHARK_BUILD), true)
    132141  STATIC_CXX = false
    133142else
    134   STATIC_CXX = true
     143  ifeq ($(ZERO_LIBARCH), ppc64)
     144    STATIC_CXX = false
     145  else
     146    STATIC_CXX = true
     147  endif
    135148endif
    136149
    … …  
    159172ifeq ($(ZERO_BUILD), true)
    160173  LIBS_VM += $(LIBFFI_LIBS)
     174endif
     175ifeq ($(SHARK_BUILD), true)
     176  LFLAGS_VM += $(LLVM_LDFLAGS)
     177  LIBS_VM   += $(LLVM_LIBS)
    161178endif
    162179
    … …  
    202219            $(LINK_LIB.CC/POST_HOOK)                                    \
    203220            rm -f $@.1; ln -s $@ $@.1;                                  \
    204             if [ -x /usr/sbin/selinuxenabled ] ; then                   \
    205               /usr/sbin/selinuxenabled;                                 \
    206               if [ $$? = 0 ] ; then                                     \
    207                 /usr/bin/chcon -t textrel_shlib_t $@;                   \
    208                 if [ $$? != 0 ]; then                                   \
    209                   echo "ERROR: Cannot chcon $@";                        \
    210                 fi                                                      \
    211               fi                                                        \
    212             fi                                                          \
     221            [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
     222            if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then                    \
     223              if [ -x /usr/sbin/selinuxenabled ] ; then                 \
     224                /usr/sbin/selinuxenabled;                               \
     225                if [ $$? = 0 ] ; then                                   \
     226                  /usr/bin/chcon -t textrel_shlib_t $@;                 \
     227                  if [ $$? != 0 ]; then                                 \
     228                    echo "ERROR: Cannot chcon $@";                      \
     229                  fi                                                    \
     230                fi                                                      \
     231              fi                                                        \
     232            fi                                                          \
    213233        }
    214234

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, 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.
    … …  
    1818# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919#
    20 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 # CA 95054 USA or visit www.sun.com if you need additional information or
    22 # have any questions.
     20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21# or visit www.oracle.com if you need additional information or have any
     22# questions.
    2323# 
    2424#

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

    r2 r278  
    11#
    2 # Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
    33# Copyright 2007, 2008 Red Hat, Inc.
    44# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    … …  
    1818# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919#
    20 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 # CA 95054 USA or visit www.sun.com if you need additional information or
    22 # have any questions.
     20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21# or visit www.oracle.com if you need additional information or have any
     22# questions.
    2323#
    2424#

  • trunk/openjdk/hotspot/make/openjdk_distro

    r2 r278  
    11#
    2 # Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222#
    2323

  • trunk/openjdk/hotspot/make/pic.make

    r2 r278  
    11#
    2 # Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/sa.files

    r2 r278  
    11#
    2 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/scm.make

    r2 r278  
    11#
    2 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222#
    2323

  • trunk/openjdk/hotspot/make/solaris/Makefile

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/build.sh

    r2 r278  
    11#! /bin/sh
    22#
    3 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     3# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    44# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55#
    … …  
    1818# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919#
    20 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 # CA 95054 USA or visit www.sun.com if you need additional information or
    22 # have any questions.
     20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21# or visit www.oracle.com if you need additional information or have any
     22# questions.
    2323# 
    2424#

  • trunk/openjdk/hotspot/make/solaris/makefiles/adjust-mflags.sh

    r2 r278  
    11#! /bin/sh
    22#
    3 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     3# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    44# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55#
    … …  
    1818# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919#
    20 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 # CA 95054 USA or visit www.sun.com if you need additional information or
    22 # have any questions.
     20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21# or visit www.oracle.com if you need additional information or have any
     22# questions.
    2323# 
    2424#

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

    r2 r278  
    11#
    2 # Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    148148TEMPDIR := $(OUTDIR)/mktmp$(shell echo $$$$)
    149149
     150# Debuggable by default
     151CFLAGS += -g
     152
    150153# Pass -D flags into ADLC.
    151154ADLCFLAGS += $(SYSDEFS)
    … …  
    156159# Normally, debugging is done directly on the ad_<arch>*.cpp files.
    157160# But -g will put #line directives in those files pointing back to <arch>.ad.
    158 #ADLCFLAGS += -g
     161ADLCFLAGS += -g
    159162
    160163ifdef LP64

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

    r2 r278  
    11#
    2 # Copyright 2004-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222#
    2323#
    … …  
    3434ifeq ("${Platform_compiler}", "sparcWorks")
    3535
    36 # Temporary until C++ compiler is fixed
    37 
    38 # _lwp_create_interpose must have a frame
    39 OPT_CFLAGS/os_solaris_x86_64.o = -xO1
    40 
    4136# Temporary until SS10 C++ compiler is fixed
    4237OPT_CFLAGS/generateOptoStub.o = -xO2
    43 OPT_CFLAGS/thread.o = -xO2
    4438
    4539else

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

    r2 r278  
    11#
    2 # Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/makefiles/compiler1.make

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/makefiles/compiler2.make

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/makefiles/cscope.make

    r2 r278  
    11#
    2 # Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/makefiles/debug.make

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    5555 "-------------------------------------------------------------------------\n")
    5656
    57 G_SUFFIX =
     57G_SUFFIX = _g
    5858VERSION = debug
    5959SYSDEFS += -DASSERT -DDEBUG

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

    r2 r278  
    11#
    2 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    6666
    6767EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
     68
     69# client and server subdirectories have symbolic links to ../libjsig.so
     70EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
     71
    6872EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
     73ifneq ($(BUILD_CLIENT_ONLY),true)
    6974EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
    70 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
    7175EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
    7276EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.so
    7377EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.so
     78endif
    7479ifeq ($(ARCH_DATA_MODEL), 32)
    7580  EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
    7681  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
    77   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
    7882  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
    7983  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so
    80   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so
    81   ifeq ($(ARCH),sparc)
     84  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so
     85  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so
     86  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so
     87  ifneq ($(BUILD_CLIENT_ONLY), true)
    8288    EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so
    83     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so
    8489    EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so
    85     EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so
    8690  endif
    8791endif

  • trunk/openjdk/hotspot/make/solaris/makefiles/dtrace.make

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2525# Rules to build jvm_db/dtrace, used by vm.make
    2626
    27 # we build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
    28 # but not for CORE configuration
     27# We build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
     28# but not for CORE or KERNEL configurations.
    2929
    3030ifneq ("${TYPE}", "CORE")
    … …  
    3838else
    3939
    40 
    4140JVM_DB = libjvm_db
    42 LIBJVM_DB = libjvm$(G_SUFFIX)_db.so
     41LIBJVM_DB = libjvm_db.so
     42LIBJVM_DB_G = libjvm$(G_SUFFIX)_db.so
    4343
    4444JVM_DTRACE = jvm_dtrace
    45 LIBJVM_DTRACE = libjvm$(G_SUFFIX)_dtrace.so
     45LIBJVM_DTRACE = libjvm_dtrace.so
     46LIBJVM_DTRACE_G = libjvm$(G_SUFFIX)_dtrace.so
    4647
    4748JVMOFFS = JvmOffsets
    … …  
    7879else
    7980LFLAGS_JVM_DB += -mt $(PICFLAG) -xnolib
    80 LFLAGS_JVM_DTRACE += -mt $(PICFLAG) -xnolib
     81LFLAGS_JVM_DTRACE += -mt $(PICFLAG) -xnolib -ldl
    8182endif
    8283
    … …  
    8788
    8889XLIBJVM_DB = 64/$(LIBJVM_DB)
     90XLIBJVM_DB_G = 64/$(LIBJVM_DB_G)
    8991XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE)
     92XLIBJVM_DTRACE_G = 64/$(LIBJVM_DTRACE_G)
    9093
    9194$(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
    … …  
    9497        $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \
    9598                $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
     99        [ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); }
     100
    96101$(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
    97102        @echo Making $@
    … …  
    99104        $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \
    100105                $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
     106        [ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); }
     107
    101108endif # ifneq ("${ISA}","${BUILDARCH}")
    102109
    … …  
    143150        $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
    144151                $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
     152        [ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); }
    145153
    146154$(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
    … …  
    148156        $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I.  \
    149157                $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
     158        [ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); }
    150159
    151160$(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \

  • trunk/openjdk/hotspot/make/solaris/makefiles/fastdebug.make

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    3737OPT_CFLAGS/SLOWER = -xO2
    3838
    39 # Problem with SS12 compiler, dtrace doesn't like the .o files  (bug 6693876)
    4039ifeq ($(COMPILER_REV_NUMERIC), 509)
    41   # To avoid jvm98 crash
    42   OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER)
    43   # Not clear this workaround could be skipped in some cases.
    44   OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER)
    45   OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER)
    46   OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER)
    47 endif
     40# To avoid jvm98 crash
     41OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER)
     42endif # COMPILER_NUMERIC_REV == 509
     43
     44ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
     45# dtrace cannot handle tail call optimization (6672627, 6693876)
     46OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
     47endif # COMPILER_NUMERIC_REV >= 509
    4848
    4949ifeq ($(COMPILER_REV_NUMERIC), 505)
    … …  
    9191OPT_CFLAGS/ciEnv.o = $(OPT_CFLAGS) -xinline=no%__1cFciEnvbFpost_compiled_method_load_event6MpnHnmethod__v_
    9292
    93 
    9493# (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
    9594
    … …  
    116115MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
    117116
    118 
    119 G_SUFFIX =
     117G_SUFFIX = _g
    120118VERSION = optimized
    121119SYSDEFS += -DASSERT -DFASTDEBUG -DCHECK_UNHANDLED_OOPS

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

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/makefiles/hp.make

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/makefiles/hp1.make

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    3434#
    3535ifeq ("${Platform_compiler}", "sparcWorks")
    36 
    37 # _lwp_create_interpose must have a frame
    38 OPT_CFLAGS/os_solaris_x86.o = -xO1
    39 else
    40 
    41 ifeq ("${Platform_compiler}", "gcc")
    42 # gcc
    43 # _lwp_create_interpose must have a frame
    44 OPT_CFLAGS/os_solaris_x86.o = -fno-omit-frame-pointer
    45 #
    46 else
    47 # error
    48 _JUNK2_ := $(shell echo >&2 \
    49        "*** ERROR: this compiler is not yet supported by this code base!")
    50         @exit 1
    51 endif
    52 endif
    53 
    54 ifeq ("${Platform_compiler}", "sparcWorks")
    5536# ILD is gone as of SS11 (5.8), not supported in SS10 (5.7)
    5637ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 507), 1)

  • trunk/openjdk/hotspot/make/solaris/makefiles/jsig.make

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2626
    2727# libjsig[_g].so: signal interposition library
    28 JSIG = jsig$(G_SUFFIX)
    29 LIBJSIG = lib$(JSIG).so
     28JSIG      = jsig
     29LIBJSIG   = lib$(JSIG).so
     30
     31JSIG_G    = $(JSIG)$(G_SUFFIX)
     32LIBJSIG_G = lib$(JSIG_G).so
    3033
    3134JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
    … …  
    4750        $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
    4851                         $(LFLAGS_JSIG) -o $@ $< -ldl
     52        [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
    4953
    5054install_jsig: $(LIBJSIG)

  • trunk/openjdk/hotspot/make/solaris/makefiles/jvmg.make

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    5252MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
    5353
    54 G_SUFFIX =
     54G_SUFFIX = _g
    5555VERSION = debug
    5656SYSDEFS += -DASSERT -DDEBUG

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

    r2 r278  
    11#
    2 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/makefiles/kernel.make

    r2 r278  
    11#
    2 # Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#   
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#   
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2626
    2727# gamma[_g]: launcher
    28 LAUNCHER = gamma$(G_SUFFIX)
     28LAUNCHER   = gamma
     29LAUNCHER_G = $(LAUNCHER)$(G_SUFFIX)
    2930
    3031LAUNCHERDIR   = $(GAMMADIR)/src/os/$(Platform_os_family)/launcher
    … …  
    8081
    8182$(LAUNCHER): $(LAUNCHER.o) $(LIBJVM) $(LAUNCHER_MAPFILE)
     83ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
     84        @echo Linking launcher...
     85        $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)
    8286        $(QUIETLY) \
    83         case "$(CFLAGS_BROWSE)" in \
    84         -sbfast|-xsbfast) \
    85             ;; \
    86         *) \
    87             echo Linking launcher...; \
    88             $(LINK_LAUNCHER/PRE_HOOK) \
    89             $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \
    90             $(LINK_LAUNCHER/POST_HOOK) \
    91             ;; \
    92         esac
     87        $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER)
     88        $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK)
     89        [ -f $(LAUNCHER_G) ] || ln -s $@ $(LAUNCHER_G)
     90endif # filter -sbfast -xsbfast
     91

  • trunk/openjdk/hotspot/make/solaris/makefiles/makedeps.make

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/makefiles/mapfile-vers

    r2 r278  
    44
    55#
    6 # Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
     6# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
    77# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    88#
    … …  
    2121# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2222#
    23 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    24 # CA 95054 USA or visit www.sun.com if you need additional information or
    25 # have any questions.
     23# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     24# or visit www.oracle.com if you need additional information or have any
     25# questions.
    2626# 
    2727#

  • trunk/openjdk/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1

    r2 r278  
    22
    33#
    4 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

  • trunk/openjdk/hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2

    r2 r278  
    22
    33#
    4 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

  • trunk/openjdk/hotspot/make/solaris/makefiles/mapfile-vers-CORE

    r2 r278  
    22
    33#
    4 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

  • trunk/openjdk/hotspot/make/solaris/makefiles/mapfile-vers-TIERED

    r2 r278  
    22
    33#
    4 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

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

    r2 r278  
    22
    33#
    4 # Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

  • trunk/openjdk/hotspot/make/solaris/makefiles/mapfile-vers-jsig

    r2 r278  
    22
    33#
    4 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

  • trunk/openjdk/hotspot/make/solaris/makefiles/mapfile-vers-jvm_db

    r2 r278  
    22
    33#
    4 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

  • trunk/openjdk/hotspot/make/solaris/makefiles/mapfile-vers-jvm_dtrace

    r2 r278  
    22
    33#
    4 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

  • trunk/openjdk/hotspot/make/solaris/makefiles/mapfile-vers-nonproduct

    r2 r278  
    22
    33#
    4 # Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
     4# Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
    55# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66#
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424# 
    2525#

  • trunk/openjdk/hotspot/make/solaris/makefiles/optimized.make

    r2 r278  
    11#
    2 # Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    3333ifeq ("${Platform_compiler}", "sparcWorks")
    3434
    35 # Problem with SS12 compiler, dtrace doesn't like the .o files  (bug 6693876)
    36 ifeq ($(COMPILER_REV_NUMERIC),509)
    37   # Not clear this workaround could be skipped in some cases.
    38   OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g
    39   OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g
    40   OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g
    41 endif
     35ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
     36# dtrace cannot handle tail call optimization (6672627, 6693876)
     37OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
     38endif # COMPILER_NUMERIC_REV >= 509
    4239
    4340# Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12)

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    4141ifeq ("${Platform_compiler}", "sparcWorks")
    4242
    43 # Problem with SS12 compiler, dtrace doesn't like the .o files  (bug 6693876)
    44 ifeq ($(COMPILER_REV_NUMERIC),509)
    45   # Not clear this workaround could be skipped in some cases.
    46   OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g
    47   OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g
    48   OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g
    49 endif
     43ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
     44# dtrace cannot handle tail call optimization (6672627, 6693876)
     45OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
     46endif # COMPILER_NUMERIC_REV >= 509
    5047
    5148# Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12)

  • trunk/openjdk/hotspot/make/solaris/makefiles/profiled.make

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    3636# tools.jar is needed by the JDI - SA binding
    3737SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
     38
     39# TODO: if it's a modules image, check if SA module is installed.
     40MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
    3841
    3942# gnumake 3.78.1 does not accept the *s that
    … …  
    6063           exit 1; \
    6164        fi
    62         $(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \
     65        $(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \
    6366          echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
    6467          echo ""; \

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2626
    2727# libsaproc[_g].so: serviceability agent
    28 SAPROC = saproc$(G_SUFFIX)
     28
     29SAPROC = saproc
    2930LIBSAPROC = lib$(SAPROC).so
     31
     32SAPROC_G = $(SAPROC)$(G_SUFFIX)
     33LIBSAPROC_G = lib$(SAPROC_G).so
    3034
    3135AGENT_DIR = $(GAMMADIR)/agent
    … …  
    7074                   -o $@                                                \
    7175                   -ldl -ldemangle -lthread -lc
     76        [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
    7277
    7378install_saproc: checkAndBuildSA

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

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1998-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    4949ifeq ($(JRE_RELEASE_VER),1.6.0)
    5050  # Validated compiler for JDK6 is SS11 (5.8)
    51   VALIDATED_COMPILER_REV   := 5.8
    52   VALIDATED_C_COMPILER_REV := 5.8
    53 else
    54   # Validated compiler for JDK7 is SS12 (5.9)
    55   VALIDATED_COMPILER_REV   := 5.9
    56   VALIDATED_C_COMPILER_REV := 5.9
    57 endif
    58 
    59 # Warning messages about not using the above validated version
    60 ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := ${VALIDATED_COMPILER_REV}
    61 ifneq (${COMPILER_REV},${ENFORCE_COMPILER_REV})
    62 dummy_target_to_enforce_compiler_rev:=\
    63 $(shell echo >&2 WARNING: You are using CC version ${COMPILER_REV} \
    64 and should be using version ${ENFORCE_COMPILER_REV}. Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this warning.)
    65 endif
    66 
    67 ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := ${VALIDATED_C_COMPILER_REV}
    68 ifneq (${C_COMPILER_REV},${ENFORCE_C_COMPILER_REV})
    69 dummy_target_to_enforce_c_compiler_rev:=\
    70 $(shell echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} \
    71 and should be using version ${ENFORCE_C_COMPILER_REV}. Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this warning.)
     51  VALIDATED_COMPILER_REVS   := 5.8
     52  VALIDATED_C_COMPILER_REVS := 5.8
     53else
     54  # Validated compilers for JDK7 are SS12 (5.9) or SS12 update 1 (5.10)
     55  VALIDATED_COMPILER_REVS   := 5.9 5.10
     56  VALIDATED_C_COMPILER_REVS := 5.9 5.10
     57endif
     58
     59# Warning messages about not using the above validated versions
     60ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS})
     61ifeq ($(filter ${ENFORCE_COMPILER_REV},${COMPILER_REV}),)
     62PRINTABLE_CC_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_COMPILER_REV})
     63dummy_var_to_enforce_compiler_rev := $(shell \
     64        echo >&2 WARNING: You are using CC version ${COMPILER_REV} and \
     65        should be using version ${PRINTABLE_CC_REVS}.; \
     66        echo >&2 Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this \
     67        warning.)
     68endif
     69
     70ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := $(strip ${VALIDATED_C_COMPILER_REVS})
     71ifeq ($(filter ${ENFORCE_C_COMPILER_REV},${C_COMPILER_REV}),)
     72PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_C_COMPILER_REV})
     73dummy_var_to_enforce_c_compiler_rev := $(shell \
     74        echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} and \
     75        should be using version ${PRINTABLE_C_REVS}.; \
     76        echo >&2 Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this \
     77        warning.)
    7278endif
    7379
    … …  
    141147
    142148#################################################
     149# Begin current (>=5.9) Forte compiler options #
     150#################################################
     151
     152ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
     153ifeq ($(Platform_arch), x86)
     154OPT_CFLAGS/NO_TAIL_CALL_OPT  = -Wu,-O~yz
     155OPT_CCFLAGS/NO_TAIL_CALL_OPT = -Qoption ube -O~yz
     156OPT_CFLAGS/stubGenerator_x86_32.o = $(OPT_CFLAGS) -xspace
     157OPT_CFLAGS/stubGenerator_x86_64.o = $(OPT_CFLAGS) -xspace
     158endif # Platform_arch == x86
     159ifeq ("${Platform_arch}", "sparc")
     160OPT_CFLAGS/stubGenerator_sparc.o = $(OPT_CFLAGS) -xspace
     161endif
     162endif # COMPILER_REV_NUMERIC >= 509
     163
     164#################################################
    143165# Begin current (>=5.6) Forte compiler options #
    144166#################################################
    … …  
    182204ifeq ("${Platform_arch_model}", "x86_32")
    183205
    184 OPT_CFLAGS=-xtarget=pentium $(EXTRA_OPT_CFLAGS)
    185 
    186 # UBE (CC 5.5) has bug 4923569 with -xO4
    187 OPT_CFLAGS+=-xO3
     206OPT_CFLAGS=-xtarget=pentium -xO4 $(EXTRA_OPT_CFLAGS)
    188207
    189208endif # 32bit x86
    … …  
    282301endif
    283302
    284 CFLAGS += $(GAMMADIR)/src/os_cpu/solaris_sparc/vm/solaris_sparc.il
    285 
    286303endif # sparc
    287304
    … …  
    294311OPT_CFLAGS+=-xO3
    295312
    296 CFLAGS += $(GAMMADIR)/src/os_cpu/solaris_x86/vm/solaris_x86_32.il
    297 
    298313endif # 32bit x86
    299314
    300315# no more exceptions
    301316CFLAGS/NOEX=-noex
     317
     318# Inline functions
     319CFLAGS += $(GAMMADIR)/src/os_cpu/solaris_${Platform_arch}/vm/solaris_${Platform_arch_model}.il
    302320
    303321# Reduce code bloat by reverting back to 5.0 behavior for static initializers
    … …  
    313331PICFLAG/BYFILE  = $(PICFLAG/$@)$(PICFLAG/DEFAULT$(PICFLAG/$@))
    314332
     333# Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
     334MAPFLAG = -M FILENAME
     335
     336# Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
     337SONAMEFLAG = -h SONAME
     338
     339# Build shared library
     340SHARED_FLAG = -G
     341
    315342# Would be better if these weren't needed, since we link with CC, but
    316343# at present removing them causes run-time errors
    … …  
    454481
    455482# Special global options for SS12
    456 ifeq ($(COMPILER_REV_NUMERIC),509)
     483ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
    457484  # There appears to be multiple issues with the new Dwarf2 debug format, so
    458485  #   we tell the compiler to use the older 'stabs' debug format all the time.

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

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/solaris/makefiles/tiered.make

    r2 r278  
    11#
    2 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    109109LIBS += -lsocket -lsched -ldl $(LIBM) -lCrun -lthread -ldoor -lc
    110110else
     111ifeq ($(COMPILER_REV_NUMERIC), 502)
     112# SC6.1 has it's own libm.so: specifying anything else provokes a name conflict.
     113LIBS += -ldl -lthread -lsocket -lm -lsched -ldoor
     114else
    111115LIBS += -ldl -lthread -lsocket $(LIBM) -lsched -ldoor
    112 endif
     116endif # 502
     117endif # 505
    113118else
    114119LIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc
    115 endif
     120endif # sparcWorks
    116121
    117122# By default, link the *.o into the library, not the executable.
    … …  
    127132# JVM
    128133
    129 JVM    = jvm$(G_SUFFIX)
    130 LIBJVM = lib$(JVM).so
     134JVM      = jvm
     135LIBJVM   = lib$(JVM).so
     136LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
    131137
    132138JVM_OBJ_FILES = $(Obj_Files) $(DTRACE_OBJS)
    … …  
    169175# making the library:
    170176$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE)
    171         $(QUIETLY) \
    172         case "$(CFLAGS_BROWSE)" in \
    173         -sbfast|-xsbfast) \
    174             ;; \
    175         *) \
    176             echo Linking vm...;                                                  \
    177             $(LINK_LIB.CC/PRE_HOOK)                                              \
    178             $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM);                \
    179             $(LINK_LIB.CC/POST_HOOK)                                             \
    180             rm -f $@.1; ln -s $@ $@.1;                                           \
    181             ;; \
    182         esac
     177ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
     178        @echo Linking vm...
     179        $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK)
     180        $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM)
     181        $(QUIETLY) $(LINK_LIB.CC/POST_HOOK)
     182        $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
     183        $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
     184        $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
     185endif # filter -sbfast -xsbfast
     186
    183187
    184188DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)

  • trunk/openjdk/hotspot/make/solaris/reorder.sh

    r2 r278  
    11#!/bin/sh -x
    22#
    3 # Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
     3# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
    44# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55#
    … …  
    1818# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919#
    20 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 # CA 95054 USA or visit www.sun.com if you need additional information or
    22 # have any questions.
     20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21# or visit www.oracle.com if you need additional information or have any
     22# questions.
    2323# 
    2424#

  • trunk/openjdk/hotspot/make/templates/bsd-header

    r2 r278  
    1 Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
     1Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
    22
    33Redistribution and use in source and binary forms, with or without
    … …  
    1212    documentation and/or other materials provided with the distribution.
    1313
    14   - Neither the name of Sun Microsystems nor the names of its
     14  - Neither the name of Oracle nor the names of its
    1515    contributors may be used to endorse or promote products derived
    1616    from this software without specific prior written permission.

  • trunk/openjdk/hotspot/make/templates/gpl-cp-header

    r2 r278  
    1 Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
     1Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
    22DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33
    44This code is free software; you can redistribute it and/or modify it
    55under the terms of the GNU General Public License version 2 only, as
    6 published by the Free Software Foundation.  Sun designates this
     6published by the Free Software Foundation.  Oracle designates this
    77particular file as subject to the "Classpath" exception as provided
    8 by Sun in the LICENSE file that accompanied this code.
     8by Oracle in the LICENSE file that accompanied this code.
    99
    1010This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1818Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919
    20 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 CA 95054 USA or visit www.sun.com if you need additional information or
    22 have any questions.
     20Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21or visit www.oracle.com if you need additional information or have any
     22questions.

  • trunk/openjdk/hotspot/make/templates/gpl-header

    r2 r278  
    1 Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
     1Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
    22DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33
    … …  
    1616Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1717
    18 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    19 CA 95054 USA or visit www.sun.com if you need additional information or
    20 have any questions.
     18Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     19or visit www.oracle.com if you need additional information or have any
     20questions.

  • trunk/openjdk/hotspot/make/test/Queens.java

    r2 r278  
    11/*
    2  * Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    1717 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818 *
    19  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20  * CA 95054 USA or visit www.sun.com if you need additional information or
    21  * have any questions.
     19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20 * or visit www.oracle.com if you need additional information or have any
     21 * questions.
    2222 *
    2323 */

  • trunk/openjdk/hotspot/make/windows/README

    r2 r278  
    1 Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
     1Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
    22DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33 
    … …  
    1616Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1717 
    18 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    19 CA 95054 USA or visit www.sun.com if you need additional information or
    20 have any questions.
     18Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     19or visit www.oracle.com if you need additional information or have any
     20questions.
    2121
    2222________________________________________________________________________________

  • trunk/openjdk/hotspot/make/windows/build.bat

    r2 r278  
    11@echo off
    22REM
    3 REM Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
     3REM Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    44REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55REM
    … …  
    1818REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919REM
    20 REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 REM CA 95054 USA or visit www.sun.com if you need additional information or
    22 REM have any questions.
     20REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21REM or visit www.oracle.com if you need additional information or have any
     22REM questions.
    2323REM 
    2424REM
    … …  
    2828REM Since we don't have uname and we could be cross-compiling,
    2929REM Use the compiler to determine which ARCH we are building
     30REM
     31REM Note: Running this batch file from the Windows command shell requires
     32REM that "grep" be accessible on the PATH. An MKS install does this.
    3033REM
    3134cl 2>&1 | grep "IA-64" >NUL
    … …  
    5861if "%1" == "debug"     goto test1
    5962if "%1" == "fastdebug" goto test1
     63if "%1" == "tree"      goto test1
    6064goto usage
    6165
    6266:test1
    6367if "%2" == "core"      goto test2
    64 if "%2" == "kernel"   goto test2
     68if "%2" == "kernel"    goto test2
    6569if "%2" == "compiler1" goto test2
    6670if "%2" == "compiler2" goto test2
    … …  
    7175
    7276:test2
     77if "%1" == "tree"      goto build_tree
    7378REM check_j2se_version
    7479REM jvmti.make requires J2SE 1.4.x or newer.
    … …  
    9499goto end
    95100
     101:build_tree
     102nmake -f %3/make/windows/build.make Variant=%2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION="%5" %1
     103goto end
     104
    96105:usage
    97106echo Usage: build flavor version workspace bootstrap_dir [build_id] [windbg_home]
    … …  
    101110echo version is "core", "kernel", "compiler1", "compiler2", or "tiered",
    102111echo workspace is source directory without trailing slash,
    103 echo bootstrap_dir is a full path to echo a JDK in which bin/java
    104 echo   and bin/javac are present and working, and echo build_id is an
     112echo bootstrap_dir is a full path to a JDK in which bin/java
     113echo   and bin/javac are present and working, and build_id is an
    105114echo   optional build identifier displayed by java -version
     115exit /b 1
    106116
    107117:end
     118exit /b %errorlevel%

  • trunk/openjdk/hotspot/make/windows/build.make

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2727# environment variables (Variant, WorkSpace, BootStrapDir, BuildUser, HOTSPOT_BUILD_VERSION)
    2828# are passed in as command line arguments.
     29
     30# Note: Running nmake or build.bat from the Windows command shell requires
     31# that "sh" be accessible on the PATH. An MKS install does this.
    2932
    3033# SA components are built if BUILD_WIN_SA=1 is specified.
    … …  
    233236        cd $(variantDir)
    234237        nmake -nologo -f $(WorkSpace)\make\windows\makefiles\top.make BUILD_FLAVOR=product DEVELOP=1 ARCH=$(ARCH)
     238
     239# target to create just the directory structure
     240tree: checks $(variantDir) $(variantDir)\local.make sanity
     241        mkdir $(variantDir)\product
     242        mkdir $(variantDir)\debug
     243        mkdir $(variantDir)\fastdebug
    235244
    236245sanity:

  • trunk/openjdk/hotspot/make/windows/build_vm_def.sh

    r2 r278  
    11#
    2 # Copyright 2000-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    5959
    6060if [ "x$LINK_VER" != "x800" -a  "x$LINK_VER" != "x900" ]; then
    61 $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
     61$DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
    6262else
    6363# Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def
    6464$DUMPBIN /OUT:vm3.def /symbols *.obj
    65 "$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
     65"$CAT" vm3.def | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
    6666"$RM" -f vm3.def
    6767fi

  • trunk/openjdk/hotspot/make/windows/create.bat

    r2 r278  
    11@echo off
    22REM
    3 REM Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
     3REM Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
    44REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55REM
    … …  
    1818REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919REM
    20 REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 REM CA 95054 USA or visit www.sun.com if you need additional information or
    22 REM have any questions.
     20REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21REM or visit www.oracle.com if you need additional information or have any
     22REM questions.
    2323REM 
    2424REM
    … …  
    3636REM Since we don't have uname and we could be cross-compiling,
    3737REM Use the compiler to determine which ARCH we are building
     38REM
     39REM Note: Running this batch file from the Windows command shell requires
     40REM that "grep" be accessible on the PATH. An MKS install does this.
    3841REM
    3942cl 2>&1 | grep "IA-64" >NUL

  • trunk/openjdk/hotspot/make/windows/cross_build.bat

    r2 r278  
    11@echo off
    22REM
    3 REM Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     3REM Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    44REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55REM
    … …  
    1818REM Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919REM
    20 REM Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 REM CA 95054 USA or visit www.sun.com if you need additional information or
    22 REM have any questions.
     20REM Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21REM or visit www.oracle.com if you need additional information or have any
     22REM questions.
    2323REM 
    2424REM

  • trunk/openjdk/hotspot/make/windows/get_msc_ver.sh

    r2 r278  
    11#
    2 # Copyright 2005-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
     24
     25set -e
    2426
    2527# This shell script echoes "MSC_VER=<munged version of cl>"
    … …  
    3941
    4042if [ "x$HotSpotMksHome" != "x" ]; then
    41  MKS_HOME="$HotSpotMksHome"
     43  TOOL_DIR="$HotSpotMksHome"
    4244else
    43  SH=`which sh`
    44  MKS_HOME=`dirname "$SH"`
     45  # HotSpotMksHome is not set so use the directory that contains "sh".
     46  # This works with both MKS and Cygwin.
     47  SH=`which sh`
     48  TOOL_DIR=`dirname "$SH"`
    4549fi
    4650
    47 HEAD="$MKS_HOME/head"
    48 ECHO="$MKS_HOME/echo"
    49 EXPR="$MKS_HOME/expr"
    50 CUT="$MKS_HOME/cut"
    51 SED="$MKS_HOME/sed"
     51DIRNAME="$TOOL_DIR/dirname"
     52HEAD="$TOOL_DIR/head"
     53ECHO="$TOOL_DIR/echo"
     54EXPR="$TOOL_DIR/expr"
     55CUT="$TOOL_DIR/cut"
     56SED="$TOOL_DIR/sed"
    5257
    5358if [ "x$FORCE_MSC_VER" != "x" ]; then
    … …  
    7176  echo "LINK_VER=$FORCE_LINK_VER"
    7277else
    73   LINK_VER_RAW=`link 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'`
     78  # use the "link" command that is co-located with the "cl" command
     79  cl_cmd=`which cl`
     80  if [ "x$cl_cmd" != "x" ]; then
     81    link_cmd=`$DIRNAME "$cl_cmd"`/link
     82  else
     83    # which can't find "cl" so just use which ever "link" we find
     84    link_cmd="link"
     85  fi
     86  LINK_VER_RAW=`"$link_cmd" 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'`
    7487  LINK_VER_MAJOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f1`
    7588  LINK_VER_MINOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f2`

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

    r2 r278  
    11#
    2 # Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/makefiles/compile.make

    r2 r278  
    11#
    2 # Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    9393#      1400 is for VS2005
    9494#      1500 is for VS2008
     95#      1600 is for VS2010
    9596#    Do not confuse this MSC_VER with the predefined macro _MSC_VER that the
    9697#    compiler provides, when MSC_VER==1399, _MSC_VER will be 1400.
    … …  
    122123COMPILER_NAME=VS2008
    123124!endif
     125!if "$(MSC_VER)" == "1600"
     126COMPILER_NAME=VS2010
     127!endif
    124128!endif
    125129
    … …  
    174178
    175179!if "$(COMPILER_NAME)" == "VS2008"
     180PRODUCT_OPT_OPTION   = /O2 /Oy-
     181FASTDEBUG_OPT_OPTION = /O2 /Oy-
     182DEBUG_OPT_OPTION     = /Od
     183GX_OPTION = /EHsc
     184LINK_FLAGS = /manifest $(LINK_FLAGS)
     185# Manifest Tool - used in VS2005 and later to adjust manifests stored
     186# as resources inside build artifacts.
     187MT=mt.exe
     188!endif
     189
     190!if "$(COMPILER_NAME)" == "VS2010"
    176191PRODUCT_OPT_OPTION   = /O2 /Oy-
    177192FASTDEBUG_OPT_OPTION = /O2 /Oy-

  • trunk/openjdk/hotspot/make/windows/makefiles/debug.make

    r2 r278  
    11#
    2 # Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    3333
    3434# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
     35ifeq ($(ARCH_DATA_MODEL),32)
     36  ARCH_DATA_MODEL=32
     37  PLATFORM=windows-i586
     38  VM_PLATFORM=windows_i486
     39  HS_ARCH=x86
     40  MAKE_ARGS += ARCH=x86
     41  MAKE_ARGS += BUILDARCH=i486
     42  MAKE_ARGS += Platform_arch=x86
     43  MAKE_ARGS += Platform_arch_model=x86_32
     44endif
     45
    3546ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),)
    3647  ARCH_DATA_MODEL=32
    … …  
    4455endif
    4556
    46 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),)
    47   ARCH_DATA_MODEL=64
    48   PLATFORM=windows-ia64
    49   VM_PLATFORM=windows_ia64
    50   HS_ARCH=ia64
    51   MAKE_ARGS += LP64=1
    52   MAKE_ARGS += ARCH=ia64
    53   MAKE_ARGS += BUILDARCH=ia64
    54   MAKE_ARGS += Platform_arch=ia64
    55   MAKE_ARGS += Platform_arch_model=ia64
    56 endif
    57 
    58 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
    59   ARCH_DATA_MODEL=64
    60   PLATFORM=windows-amd64
    61   VM_PLATFORM=windows_amd64
    62   HS_ARCH=x86
    63   MAKE_ARGS += LP64=1
    64   MAKE_ARGS += ARCH=x86
    65   MAKE_ARGS += BUILDARCH=amd64
    66   MAKE_ARGS += Platform_arch=x86
    67   MAKE_ARGS += Platform_arch_model=x86_64
     57ifneq ($(ARCH_DATA_MODEL),32)
     58  ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),)
     59    ARCH_DATA_MODEL=64
     60    PLATFORM=windows-ia64
     61    VM_PLATFORM=windows_ia64
     62    HS_ARCH=ia64
     63    MAKE_ARGS += LP64=1
     64    MAKE_ARGS += ARCH=ia64
     65    MAKE_ARGS += BUILDARCH=ia64
     66    MAKE_ARGS += Platform_arch=ia64
     67    MAKE_ARGS += Platform_arch_model=ia64
     68  endif
     69
     70# http://support.microsoft.com/kb/888731 : this can be either
     71# AMD64 for AMD, or EM64T for Intel chips.
     72  ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),)
     73    ARCH_DATA_MODEL=64
     74    PLATFORM=windows-amd64
     75    VM_PLATFORM=windows_amd64
     76    HS_ARCH=x86
     77    MAKE_ARGS += LP64=1
     78    MAKE_ARGS += ARCH=x86
     79    MAKE_ARGS += BUILDARCH=amd64
     80    MAKE_ARGS += Platform_arch=x86
     81    MAKE_ARGS += Platform_arch_model=x86_64
     82  endif
     83
     84ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),)
     85    ARCH_DATA_MODEL=64
     86    PLATFORM=windows-amd64
     87    VM_PLATFORM=windows_amd64
     88    HS_ARCH=x86
     89    MAKE_ARGS += LP64=1
     90    MAKE_ARGS += ARCH=x86
     91    MAKE_ARGS += BUILDARCH=amd64
     92    MAKE_ARGS += Platform_arch=x86
     93    MAKE_ARGS += Platform_arch_model=x86_64
     94  endif
     95
     96# NB later OS versions than 2003 may report "Intel64"
     97  ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
     98    ARCH_DATA_MODEL=64
     99    PLATFORM=windows-amd64
     100    VM_PLATFORM=windows_amd64
     101    HS_ARCH=x86
     102    MAKE_ARGS += LP64=1
     103    MAKE_ARGS += ARCH=x86
     104    MAKE_ARGS += BUILDARCH=amd64
     105    MAKE_ARGS += Platform_arch=x86
     106    MAKE_ARGS += Platform_arch_model=x86_64
     107  endif
    68108endif
    69109

  • trunk/openjdk/hotspot/make/windows/makefiles/fastdebug.make

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/makefiles/generated.make

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/makefiles/makedeps.make

    r2 r278  
    11#
    2 # Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/makefiles/sanity.make

    r2 r278  
    11#
    2 # Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
    … …  
    2828
    2929checkCL:
    30         @ if "$(MSC_VER)" NEQ "1310" if "$(MSC_VER)" NEQ "1399" if "$(MSC_VER)" NEQ "1400" if "$(MSC_VER)" NEQ "1500" \
     30        @ if "$(MSC_VER)" NEQ "1310" if "$(MSC_VER)" NEQ "1399" if "$(MSC_VER)" NEQ "1400" if "$(MSC_VER)" NEQ "1500" if "$(MSC_VER)" NEQ "1600" \
    3131        echo *** WARNING *** unrecognized cl.exe version $(MSC_VER) ($(RAW_MSC_VER)).  Use FORCE_MSC_VER to override automatic detection.
    3232
    3333checkLink:
    34         @ if "$(LINK_VER)" NEQ "710" if "$(LINK_VER)" NEQ "800" if "$(LINK_VER)" NEQ "900" \
     34        @ if "$(LINK_VER)" NEQ "710" if "$(LINK_VER)" NEQ "800" if "$(LINK_VER)" NEQ "900" if "$(LINK_VER)" NEQ "1000" \
    3535        echo *** WARNING *** unrecognized link.exe version $(LINK_VER) ($(RAW_LINK_VER)).  Use FORCE_LINK_VER to override automatic detection.

  • trunk/openjdk/hotspot/make/windows/makefiles/shared.make

    r2 r278  
    11#
    2 # Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

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

    r2 r278  
    11#
    2 # Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/projectfiles/common/Makefile

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/projectfiles/compiler1/Makefile

    r2 r278  
    11#
    2 # Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/projectfiles/compiler2/Makefile

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/projectfiles/core/Makefile

    r2 r278  
    11#
    2 # Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/projectfiles/kernel/Makefile

    r2 r278  
    11#
    2 # Copyright (c) 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#   
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#   
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#

  • trunk/openjdk/hotspot/make/windows/projectfiles/tiered/Makefile

    r2 r278  
    11#
    2 # Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222# 
    2323#
Note: See TracChangeset for help on using the changeset viewer.