1.1 --- a/make/common/shared/Platform.gmk Thu Apr 05 13:04:35 2012 -0700
1.2 +++ b/make/common/shared/Platform.gmk Mon Apr 16 17:10:35 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -275,7 +275,7 @@
1.11 echo sparc \
1.12 ;; \
1.13 x86_64) \
1.14 - echo amd64 \
1.15 + echo x86_64 \
1.16 ;; \
1.17 "Power Macintosh") \
1.18 echo ppc \
1.19 @@ -287,12 +287,13 @@
1.20 ARCH := $(shell $(archExpr) )
1.21 ARCH_FAMILY := $(ARCH)
1.22
1.23 - # Darwin x86 builds are i386/amd64 universal.
1.24 - ifeq ($(SYSTEM_UNAME), Darwin)
1.25 - ifneq ($(ARCH), ppc)
1.26 - ARCH=universal
1.27 - endif
1.28 - endif
1.29 + # Darwin builds are currently universal but only include 64-bit
1.30 + #
1.31 + # ifeq ($(SYSTEM_UNAME), Darwin)
1.32 + # ifneq ($(ARCH), ppc)
1.33 + # ARCH=universal
1.34 + # endif
1.35 + # endif
1.36
1.37 # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
1.38 ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
