equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 1999, 2014, 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. |
65 ifndef FORCE_TIERED |
65 ifndef FORCE_TIERED |
66 FORCE_TIERED=1 |
66 FORCE_TIERED=1 |
67 endif |
67 endif |
68 endif |
68 endif |
69 # C1 is not ported on ppc64, so we cannot build a tiered VM: |
69 # C1 is not ported on ppc64, so we cannot build a tiered VM: |
70 ifeq ($(ARCH),ppc64) |
70 # Notice: after 8046471 ARCH will be 'ppc' for top-level ppc64 builds but |
71 FORCE_TIERED=0 |
71 # 'ppc64' for HotSpot-only ppc64 builds. Need to detect both variants here! |
|
72 ifneq (,$(findstring $(ARCH), ppc ppc64)) |
|
73 ifeq ($(ARCH_DATA_MODEL), 64) |
|
74 FORCE_TIERED=0 |
|
75 endif |
72 endif |
76 endif |
73 |
77 |
74 ifdef LP64 |
78 ifdef LP64 |
75 ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","") |
79 ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","") |
76 _JUNK_ := $(shell echo >&2 \ |
80 _JUNK_ := $(shell echo >&2 \ |