hotspot/make/bsd/makefiles/defs.make
author jprovino
Wed, 10 Oct 2012 14:35:58 -0400
changeset 13975 2f7431485cfa
parent 12156 fb31de03f649
child 15793 4867678e3517
permissions -rw-r--r--
7189254: Change makefiles for more flexibility to override defaults Summary: Change makefiles so that targets and parameters can be overridden by alternate makefiles. Reviewed-by: dholmes, coleenp
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     1
#
11629
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
     2
# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     4
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     7
# published by the Free Software Foundation.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     8
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
     9
# This code is distributed in the hope that it will be useful, but WITHOUT
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    10
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    11
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    12
# version 2 for more details (a copy is included in the LICENSE file that
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    13
# accompanied this code).
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    14
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    15
# You should have received a copy of the GNU General Public License version
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    16
# 2 along with this work; if not, write to the Free Software Foundation,
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    17
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    18
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    19
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    20
# or visit www.oracle.com if you need additional information or have any
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    21
# questions.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    22
#  
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    23
#
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    24
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    25
# The common definitions for hotspot bsd builds.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    26
# Include the top level defs.make under make directory instead of this one.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    27
# This file is included into make/defs.make.
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    28
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    29
SLASH_JAVA ?= /java
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    30
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    31
# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    32
ARCH:=$(shell uname -m)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    33
PATH_SEP = :
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    34
ifeq ($(LP64), 1)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    35
  ARCH_DATA_MODEL ?= 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    36
else
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    37
  ARCH_DATA_MODEL ?= 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    38
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    39
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    40
# zero
12156
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
    41
ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    42
  ifeq ($(ARCH_DATA_MODEL), 64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    43
    MAKE_ARGS      += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    44
  endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    45
  PLATFORM         = bsd-zero
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    46
  VM_PLATFORM      = bsd_$(subst i386,i486,$(ZERO_LIBARCH))
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    47
  HS_ARCH          = zero
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    48
  ARCH             = zero
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    49
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    50
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    51
# ia64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    52
ifeq ($(ARCH), ia64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    53
  ARCH_DATA_MODEL = 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    54
  MAKE_ARGS      += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    55
  PLATFORM        = bsd-ia64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    56
  VM_PLATFORM     = bsd_ia64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    57
  HS_ARCH         = ia64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    58
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    59
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    60
# sparc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    61
ifeq ($(ARCH), sparc64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    62
  ifeq ($(ARCH_DATA_MODEL), 64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    63
    ARCH_DATA_MODEL  = 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    64
    MAKE_ARGS        += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    65
    PLATFORM         = bsd-sparcv9
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    66
    VM_PLATFORM      = bsd_sparcv9
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    67
  else
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    68
    ARCH_DATA_MODEL  = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    69
    PLATFORM         = bsd-sparc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    70
    VM_PLATFORM      = bsd_sparc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    71
  endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    72
  HS_ARCH            = sparc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    73
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    74
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    75
# amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    76
ifneq (,$(findstring $(ARCH), amd64 x86_64))
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    77
  ifeq ($(ARCH_DATA_MODEL), 64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    78
    ARCH_DATA_MODEL = 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    79
    MAKE_ARGS       += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    80
    PLATFORM        = bsd-amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    81
    VM_PLATFORM     = bsd_amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    82
    HS_ARCH         = x86
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    83
  else
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    84
    ARCH_DATA_MODEL = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    85
    PLATFORM        = bsd-i586
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    86
    VM_PLATFORM     = bsd_i486
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    87
    HS_ARCH         = x86
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    88
    # We have to reset ARCH to i386 since SRCARCH relies on it
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    89
    ARCH            = i386   
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    90
  endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    91
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    92
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    93
# i386
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    94
ifeq ($(ARCH), i386)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    95
  ifeq ($(ARCH_DATA_MODEL), 64)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    96
    ARCH_DATA_MODEL = 64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    97
    MAKE_ARGS       += LP64=1
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    98
    PLATFORM        = bsd-amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
    99
    VM_PLATFORM     = bsd_amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   100
    HS_ARCH         = x86
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   101
    # We have to reset ARCH to amd64 since SRCARCH relies on it
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   102
    ARCH            = amd64
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   103
  else
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   104
    ARCH_DATA_MODEL  = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   105
    PLATFORM         = bsd-i586
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   106
    VM_PLATFORM      = bsd_i486
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   107
    HS_ARCH          = x86
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   108
  endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   109
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   110
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   111
# ARM
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   112
ifeq ($(ARCH), arm)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   113
  ARCH_DATA_MODEL  = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   114
  PLATFORM         = bsd-arm
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   115
  VM_PLATFORM      = bsd_arm
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   116
  HS_ARCH          = arm
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   117
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   118
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   119
# PPC
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   120
ifeq ($(ARCH), ppc)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   121
  ARCH_DATA_MODEL  = 32
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   122
  PLATFORM         = bsd-ppc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   123
  VM_PLATFORM      = bsd_ppc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   124
  HS_ARCH          = ppc
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   125
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   126
12156
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   127
# On 32 bit bsd we build server and client, on 64 bit just server.
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   128
ifeq ($(JVM_VARIANTS),)
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   129
  ifeq ($(ARCH_DATA_MODEL), 32)
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   130
    JVM_VARIANTS:=client,server
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   131
    JVM_VARIANT_CLIENT:=true
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   132
    JVM_VARIANT_SERVER:=true
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   133
  else
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   134
    JVM_VARIANTS:=server
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   135
    JVM_VARIANT_SERVER:=true
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   136
  endif
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   137
endif
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   138
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   139
JDK_INCLUDE_SUBDIR=bsd
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   140
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   141
# Library suffix
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   142
OS_VENDOR:=$(shell uname -s)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   143
ifeq ($(OS_VENDOR),Darwin)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   144
  LIBRARY_SUFFIX=dylib
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   145
else
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   146
  LIBRARY_SUFFIX=so
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   147
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   148
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   149
# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   150
VM_DEBUG=jvmg
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   151
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   152
EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   153
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   154
# client and server subdirectories have symbolic links to ../libjsig.so
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   155
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   156
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
11593
288a647ff773 7125793: MAC: test_gamma should always work
phh
parents: 10739
diff changeset
   157
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
13975
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   158
EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   159
12095
cc3d6f08a4c4 7148152: Add whitebox testing API to HotSpot
mgerdin
parents: 11784
diff changeset
   160
EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
cc3d6f08a4c4 7148152: Add whitebox testing API to HotSpot
mgerdin
parents: 11784
diff changeset
   161
12156
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   162
ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   163
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   164
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   165
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   166
12156
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   167
ifeq ($(JVM_VARIANT_CLIENT),true)
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   168
  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
fb31de03f649 7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents: 12095
diff changeset
   169
  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   170
endif
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   171
13975
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   172
ifeq ($(JVM_VARIANT_MINIMAL1),true)
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   173
  EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   174
  EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   175
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   176
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   177
    ifeq ($(ZIP_DEBUGINFO_FILES),1)
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   178
	EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   179
    else
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   180
	EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   181
    endif
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   182
  endif 
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   183
endif
2f7431485cfa 7189254: Change makefiles for more flexibility to override defaults
jprovino
parents: 12156
diff changeset
   184
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   185
# Serviceability Binaries
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   186
# No SA Support for PPC, IA64, ARM or zero
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   187
ADD_SA_BINARIES/x86   = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   188
                        $(EXPORT_LIB_DIR)/sa-jdi.jar
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   189
ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   190
                        $(EXPORT_LIB_DIR)/sa-jdi.jar
10739
91935236600e 7098194: integrate macosx-port changes
dcubed
parents: 10565
diff changeset
   191
ADD_SA_BINARIES/universal = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
91935236600e 7098194: integrate macosx-port changes
dcubed
parents: 10565
diff changeset
   192
                            $(EXPORT_LIB_DIR)/sa-jdi.jar
10565
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   193
ADD_SA_BINARIES/ppc   =
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   194
ADD_SA_BINARIES/ia64  =
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   195
ADD_SA_BINARIES/arm   =
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   196
ADD_SA_BINARIES/zero  =
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   197
dc90c239f4ec 7089790: integrate bsd-port changes
never
parents:
diff changeset
   198
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
10739
91935236600e 7098194: integrate macosx-port changes
dcubed
parents: 10565
diff changeset
   199
11629
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   200
# Universal build settings
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   201
ifeq ($(OS_VENDOR), Darwin)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   202
  # Build universal binaries by default on Mac OS X
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   203
  MACOSX_UNIVERSAL = true
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   204
  ifneq ($(ALT_MACOSX_UNIVERSAL),)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   205
    MACOSX_UNIVERSAL = $(ALT_MACOSX_UNIVERSAL)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   206
  endif
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   207
  MAKE_ARGS += MACOSX_UNIVERSAL=$(MACOSX_UNIVERSAL)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   208
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   209
  # Universal settings
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   210
  ifeq ($(MACOSX_UNIVERSAL), true)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   211
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   212
    # Set universal export path but avoid using ARCH or PLATFORM subdirs
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   213
    EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR)
11649
04e30cc559a9 7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents: 11629
diff changeset
   214
    ifneq ($(ALT_EXPORT_PATH),)
04e30cc559a9 7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents: 11629
diff changeset
   215
      EXPORT_PATH=$(ALT_EXPORT_PATH)
04e30cc559a9 7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents: 11629
diff changeset
   216
    endif
10739
91935236600e 7098194: integrate macosx-port changes
dcubed
parents: 10565
diff changeset
   217
11629
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   218
    # Set universal image dir
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   219
    JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
11784
715f58266a42 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents: 11649
diff changeset
   220
    ifneq ($(ALT_JDK_IMAGE_DIR),)
715f58266a42 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents: 11649
diff changeset
   221
      JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
715f58266a42 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents: 11649
diff changeset
   222
    endif
11629
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   223
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   224
    # Binaries to 'universalize' if built
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   225
    UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   226
    UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   227
    UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   228
    UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   229
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   230
    # Files to simply copy in place
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   231
    UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   232
    UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   233
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   234
  endif
72a73185bdc7 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 11593
diff changeset
   235
endif