# HG changeset patch
# User andrew
# Date 1337801861 -3600
# Node ID f60db5e849b20dd47e05a4145787eed40c319181
# Parent  139542079986d040128df2cf16daf8adc48a919b# Parent  c9f6750370c9a99d149d73fd32c363d9959d19d1
Merge

diff -r 139542079986 -r f60db5e849b2 .hgtags
--- a/.hgtags	Wed May 23 09:59:03 2012 +0100
+++ b/.hgtags	Wed May 23 20:37:41 2012 +0100
@@ -163,3 +163,20 @@
 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11
 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12
 9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint
+f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13
+6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14
+d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15
+bfca64f13d582de179d69b32cf68ed06e6271ad0 jdk7u4-b16
+e2a9fe67e0595ea101a2c0b07cd98ab401b3c25e jdk7u4-b17
+c2eb741b947d9c31137934b75df12741bbc2c7fc jdk7u4-b18
+8bdf527067aca1acf92c7083a9c249e0731ff955 jdk7u4-b19
+81a59f2d7ea4e7a880041eaa4fa4e9d2518ed35b jdk7u4-b20
+6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u6-b01
+e3fbf686ef874c635e34ef3419a707ab36f6eabd jdk7u6-b02
+f18c50ad8f76ccbb7be021f45c4fe520fef5b9e6 jdk7u6-b03
+e5a10529aee14ab2679633793880b255dae47c27 jdk7u6-b04
+216641904bdf728e9da51eb2b044ccc87e9d2028 jdk7u6-b05
+2f14aa7dbe3b100b4340d0301aad17d94c29d6df jdk7u6-b06
+1ad8ad7b254dfdf070e8af2f77c69623298af59a jdk7u6-b07
+7df162b43e6e0d02b20a051ae3871845fdfdce58 jdk7u6-b08
+13faa12cfdd6edc11aff87e7917a439180cc2de0 jdk7u6-b09
diff -r 139542079986 -r f60db5e849b2 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk	Wed May 23 09:59:03 2012 +0100
+++ b/make/common/shared/Platform.gmk	Wed May 23 20:37:41 2012 +0100
@@ -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
@@ -284,7 +284,7 @@
                     echo sparc \
                     ;; \
                 x86_64) \
-                    echo amd64 \
+                    echo x86_64 \
                     ;; \
                 "Power Macintosh") \
                     echo ppc \
@@ -296,12 +296,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))