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:
43 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • 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#
Note: See TracChangeset for help on using the changeset viewer.