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:
48 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

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