comparison make/defs.make @ 1930:2d26b0046e0d

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 14:53:30 +0100
parents 126ea7725993
children c7db7adb83b4
comparison
equal deleted inserted replaced
1484:6b7001391c97 1930:2d26b0046e0d
1 # 1 #
2 # Copyright 2006-2010 Sun Microsystems, Inc. All Rights Reserved. 2 # Copyright (c) 2006, 2010, 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 builds. 25 # The common definitions for hotspot builds.
26 26
190 # BUILDARCH - build directory 190 # BUILDARCH - build directory
191 # LIBARCH - directory name in JDK/JRE 191 # LIBARCH - directory name in JDK/JRE
192 192
193 # Use uname output for SRCARCH, but deal with platform differences. If ARCH 193 # Use uname output for SRCARCH, but deal with platform differences. If ARCH
194 # is not explicitly listed below, it is treated as x86. 194 # is not explicitly listed below, it is treated as x86.
195 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 zero,$(ARCH))) 195 SRCARCH = $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 arm ppc zero,$(ARCH)))
196 ARCH/ = x86 196 ARCH/ = x86
197 ARCH/sparc = sparc 197 ARCH/sparc = sparc
198 ARCH/sparc64= sparc 198 ARCH/sparc64= sparc
199 ARCH/ia64 = ia64 199 ARCH/ia64 = ia64
200 ARCH/amd64 = x86 200 ARCH/amd64 = x86
201 ARCH/x86_64 = x86 201 ARCH/x86_64 = x86
202 ARCH/ppc64 = ppc
203 ARCH/ppc = ppc
204 ARCH/arm = arm
202 ARCH/zero = zero 205 ARCH/zero = zero
203 206
204 # BUILDARCH is usually the same as SRCARCH, except for sparcv9 207 # BUILDARCH is usually the same as SRCARCH, except for sparcv9
205 BUILDARCH = $(SRCARCH) 208 BUILDARCH = $(SRCARCH)
206 ifeq ($(BUILDARCH), x86) 209 ifeq ($(BUILDARCH), x86)
221 LIBARCH/i486 = i386 224 LIBARCH/i486 = i386
222 LIBARCH/amd64 = amd64 225 LIBARCH/amd64 = amd64
223 LIBARCH/sparc = sparc 226 LIBARCH/sparc = sparc
224 LIBARCH/sparcv9 = sparcv9 227 LIBARCH/sparcv9 = sparcv9
225 LIBARCH/ia64 = ia64 228 LIBARCH/ia64 = ia64
229 LIBARCH/ppc64 = ppc
230 LIBARCH/ppc = ppc
231 LIBARCH/arm = arm
226 LIBARCH/zero = $(ZERO_LIBARCH) 232 LIBARCH/zero = $(ZERO_LIBARCH)
227 233
228 LP64_ARCH = sparcv9 amd64 ia64 zero 234 LP64_ARCH = sparcv9 amd64 ia64 zero
229 endif 235 endif
230 236