Mercurial > hg > graal-jvmci-8
comparison make/defs.make @ 23660:b5f3a471e646
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 01 Jun 2016 00:11:44 +0200 |
parents | 3ef45d0a6d77 c649dde41041 |
children | 8e2954d78161 |
comparison
equal
deleted
inserted
replaced
23411:d7cf78885a3a | 23660:b5f3a471e646 |
---|---|
1 # | 1 # |
2 # Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 2006, 2016, 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. |
288 # BUILDARCH - build directory | 288 # BUILDARCH - build directory |
289 # LIBARCH - directory name in JDK/JRE | 289 # LIBARCH - directory name in JDK/JRE |
290 | 290 |
291 # Use uname output for SRCARCH, but deal with platform differences. If ARCH | 291 # Use uname output for SRCARCH, but deal with platform differences. If ARCH |
292 # is not explicitly listed below, it is treated as x86. | 292 # is not explicitly listed below, it is treated as x86. |
293 SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc64 zero,$(ARCH))) | 293 SRCARCH ?= $(ARCH/$(filter sparc sparc64 ia64 amd64 x86_64 ppc ppc64 zero,$(ARCH))) |
294 ARCH/ = x86 | 294 ARCH/ = x86 |
295 ARCH/sparc = sparc | 295 ARCH/sparc = sparc |
296 ARCH/sparc64= sparc | 296 ARCH/sparc64= sparc |
297 ARCH/ia64 = ia64 | 297 ARCH/ia64 = ia64 |
298 ARCH/amd64 = x86 | 298 ARCH/amd64 = x86 |
299 ARCH/x86_64 = x86 | 299 ARCH/x86_64 = x86 |
300 ARCH/ppc64 = ppc | 300 ARCH/ppc64 = ppc |
301 ARCH/ppc = ppc | |
301 ARCH/zero = zero | 302 ARCH/zero = zero |
302 | 303 |
303 # BUILDARCH is usually the same as SRCARCH, except for sparcv9 | 304 # BUILDARCH is usually the same as SRCARCH, except for sparcv9 |
304 BUILDARCH ?= $(SRCARCH) | 305 BUILDARCH ?= $(SRCARCH) |
305 ifeq ($(BUILDARCH), x86) | 306 ifeq ($(BUILDARCH), x86) |