comparison make/linux/makefiles/defs.make @ 1930:2d26b0046e0d

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 14:53:30 +0100
parents 126ea7725993
children 0a8e0d4345b3
comparison
equal deleted inserted replaced
1484:6b7001391c97 1930:2d26b0046e0d
1 # 1 #
2 # Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved. 2 # Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
14 # 14 #
15 # You should have received a copy of the GNU General Public License version 15 # You should have received a copy of the GNU General Public License version
16 # 2 along with this work; if not, write to the Free Software Foundation, 16 # 2 along with this work; if not, write to the Free Software Foundation,
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 # 18 #
19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # CA 95054 USA or visit www.sun.com if you need additional information or 20 # or visit www.oracle.com if you need additional information or have any
21 # have any questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 # The common definitions for hotspot linux builds. 25 # The common definitions for hotspot linux builds.
26 # Include the top level defs.make under make directory instead of this one. 26 # Include the top level defs.make under make directory instead of this one.
96 PLATFORM = linux-i586 96 PLATFORM = linux-i586
97 VM_PLATFORM = linux_i486 97 VM_PLATFORM = linux_i486
98 HS_ARCH = x86 98 HS_ARCH = x86
99 endif 99 endif
100 100
101 # ARM
102 ifeq ($(ARCH), arm)
103 ARCH_DATA_MODEL = 32
104 PLATFORM = linux-arm
105 VM_PLATFORM = linux_arm
106 HS_ARCH = arm
107 endif
108
109 # PPC
110 ifeq ($(ARCH), ppc)
111 ARCH_DATA_MODEL = 32
112 PLATFORM = linux-ppc
113 VM_PLATFORM = linux_ppc
114 HS_ARCH = ppc
115 endif
116
101 JDK_INCLUDE_SUBDIR=linux 117 JDK_INCLUDE_SUBDIR=linux
102 118
103 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms 119 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
104 VM_DEBUG=jvmg 120 VM_DEBUG=jvmg
105 121
106 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 122 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
107 123
108 # client and server subdirectories have symbolic links to ../libjsig.so 124 # client and server subdirectories have symbolic links to ../libjsig.so
109 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so 125 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
126 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
110 127
111 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 128 ifndef BUILD_CLIENT_ONLY
112 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 129 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
113 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so 130 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
131 endif
132
114 ifneq ($(ZERO_BUILD), true) 133 ifneq ($(ZERO_BUILD), true)
115 ifeq ($(ARCH_DATA_MODEL), 32) 134 ifeq ($(ARCH_DATA_MODEL), 32)
116 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 135 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
117 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 136 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
118 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 137 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
119 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
120 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
121 else
122 ifeq ($(ARCH),ia64)
123 else
124 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
125 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
126 endif
127 endif 138 endif
128 endif 139 endif
140
141 # Serviceability Binaries
142 # No SA Support for PPC, IA64, ARM or zero
143 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
144 $(EXPORT_LIB_DIR)/sa-jdi.jar
145 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
146 $(EXPORT_LIB_DIR)/sa-jdi.jar
147 ADD_SA_BINARIES/ppc =
148 ADD_SA_BINARIES/ia64 =
149 ADD_SA_BINARIES/arm =
150 ADD_SA_BINARIES/zero =
151
152 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
153
154