# HG changeset patch
# User asaha
# Date 1334270969 25200
# Node ID acf57a3ee030f31a960bac4fcb6c075007e35685
# Parent  c0b1bb1ef2b0c68ba906e4347d34ad64d1608dd6# Parent  91cf6d5b184c696382fd50ad76ca1d2bfd962e91
Merge

diff -r c0b1bb1ef2b0 -r acf57a3ee030 .hgtags
--- a/.hgtags	Fri Apr 06 13:53:36 2012 -0700
+++ b/.hgtags	Thu Apr 12 15:49:29 2012 -0700
@@ -165,3 +165,4 @@
 8b529de05c544057240cfc91316ef5ab1dcfa9b6 jdk7u5-b01
 c2eb741b947d9c31137934b75df12741bbc2c7fc jdk7u4-b18
 8bdf527067aca1acf92c7083a9c249e0731ff955 jdk7u4-b19
+81a59f2d7ea4e7a880041eaa4fa4e9d2518ed35b jdk7u4-b20
diff -r c0b1bb1ef2b0 -r acf57a3ee030 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk	Fri Apr 06 13:53:36 2012 -0700
+++ b/make/common/shared/Platform.gmk	Thu Apr 12 15:49:29 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))