changeset 475:50e3199e6c29

Merge
author asaha
date Mon, 16 Apr 2012 11:04:37 -0700
parents 216641904bdf 91cf6d5b184c
children ba04f31cbad4
files .hgtags
diffstat 2 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Apr 02 14:56:56 2012 -0700
+++ b/.hgtags	Mon Apr 16 11:04:37 2012 -0700
@@ -163,6 +163,8 @@
 bfca64f13d582de179d69b32cf68ed06e6271ad0 jdk7u4-b16
 e2a9fe67e0595ea101a2c0b07cd98ab401b3c25e jdk7u4-b17
 c2eb741b947d9c31137934b75df12741bbc2c7fc jdk7u4-b18
+8bdf527067aca1acf92c7083a9c249e0731ff955 jdk7u4-b19
+81a59f2d7ea4e7a880041eaa4fa4e9d2518ed35b jdk7u4-b20
 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u6-b01
 e3fbf686ef874c635e34ef3419a707ab36f6eabd jdk7u6-b02
 f18c50ad8f76ccbb7be021f45c4fe520fef5b9e6 jdk7u6-b03
--- a/make/common/shared/Platform.gmk	Mon Apr 02 14:56:56 2012 -0700
+++ b/make/common/shared/Platform.gmk	Mon Apr 16 11:04:37 2012 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -275,7 +275,7 @@
                     echo sparc \
                     ;; \
                 x86_64) \
-                    echo amd64 \
+                    echo x86_64 \
                     ;; \
                 "Power Macintosh") \
                     echo ppc \
@@ -287,12 +287,13 @@
   ARCH        := $(shell $(archExpr) )
   ARCH_FAMILY := $(ARCH)
 
-  # Darwin x86 builds are i386/amd64 universal.
-  ifeq ($(SYSTEM_UNAME), Darwin)
-    ifneq ($(ARCH), ppc)
-      ARCH=universal
-    endif
-  endif
+  # Darwin builds are currently universal but only include 64-bit
+  # 
+  # ifeq ($(SYSTEM_UNAME), Darwin)
+  #  ifneq ($(ARCH), ppc)
+  #    ARCH=universal
+  #  endif
+  # endif
 
   # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
   ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))