# HG changeset patch
# User herrick
# Date 1245085650 14400
# Node ID 79d8fd9e74b9e14ccc285b59b34a1b2849ab472c
# Parent  ffb590b42ed123992c8fbb714b3b3debb5c917a5# Parent  e906b16a12a9a63b615898afa5d9673cbd1c5ab8
Merge

diff -r ffb590b42ed1 -r 79d8fd9e74b9 .hgtags
--- a/.hgtags	Thu Jun 11 15:16:20 2009 -0400
+++ b/.hgtags	Mon Jun 15 13:07:30 2009 -0400
@@ -34,3 +34,4 @@
 972c6157fae57850694675da82fd58a17930db0a jdk7-b57
 2e3b8edab3ef55406494d3dd562e06882e6fc15e jdk7-b58
 7e6b2b55c00cc523b468272353ada3979adbbf16 jdk7-b59
+f1e1cccbd13aa96d2d8bd872782ff764010bc22c jdk7-b60
diff -r ffb590b42ed1 -r 79d8fd9e74b9 make/README
--- a/make/README	Thu Jun 11 15:16:20 2009 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-README:
-  This file should be located at the top of the corba Mercurial repository.
-
-  See http://openjdk.java.net/ for more information about the OpenJDK.
-
-  See ../README-builds.html for complete details on build machine requirements.
-
-Simple Build Instructions:
-
-    cd make && gnumake
-     
-  The files that will be imported into the jdk build will be in the "dist"
-  directory.
-
diff -r ffb590b42ed1 -r 79d8fd9e74b9 make/common/shared/Compiler-gcc.gmk
--- a/make/common/shared/Compiler-gcc.gmk	Thu Jun 11 15:16:20 2009 -0400
+++ b/make/common/shared/Compiler-gcc.gmk	Mon Jun 15 13:07:30 2009 -0400
@@ -73,23 +73,18 @@
   ifneq ("$(findstring sparc,$(ARCH))", "")
     # sparc or sparcv9
     REQUIRED_CC_VER = 4.0
-    REQUIRED_GCC_VER = 4.0.*
   else
   ifeq ($(ARCH_DATA_MODEL), 32)
     # i586
     REQUIRED_CC_VER = 3.2
-    REQUIRED_GCC_VER = 3.2.1*
-    REQUIRED_GCC_VER_INT = 3.2.1-7a
   else
   ifeq ($(ARCH), amd64)
     # amd64
     REQUIRED_CC_VER = 3.2
-    REQUIRED_GCC_VER = 3.2.*
   endif
   ifeq ($(ARCH), ia64)
     # ia64
     REQUIRED_CC_VER = 3.2
-    REQUIRED_GCC_VER = 2.9[56789].*
   endif
   endif
   endif
@@ -109,13 +104,6 @@
 
   # Option used to create a shared library
   SHARED_LIBRARY_FLAG = -G
-  # But gcc is still needed no matter what on 32bit
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    REQUIRED_GCC_VER = 2.95
-    GCC =$(GCC_COMPILER_PATH)gcc
-    _GCC_VER :=$(shell $(GCC) -dumpversion 2>&1 )
-    GCC_VER  :=$(call GetVersion,"$(_GCC_VER)")
-  endif
 
 endif
 
diff -r ffb590b42ed1 -r 79d8fd9e74b9 make/common/shared/Compiler-sun.gmk
--- a/make/common/shared/Compiler-sun.gmk	Thu Jun 11 15:16:20 2009 -0400
+++ b/make/common/shared/Compiler-sun.gmk	Mon Jun 15 13:07:30 2009 -0400
@@ -39,13 +39,6 @@
   LINT           = $(COMPILER_PATH)lint
   # Option used to create a shared library
   SHARED_LIBRARY_FLAG = -G
-  # But gcc is still needed no matter what on 32bit
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    REQUIRED_GCC_VER = 2.95
-    GCC =$(GCC_COMPILER_PATH)gcc
-    _GCC_VER :=$(shell $(GCC) -dumpversion 2>&1 )
-    GCC_VER  :=$(call GetVersion,"$(_GCC_VER)")
-  endif
 endif
 
 # Sun Studio Compiler settings specific to Linux
diff -r ffb590b42ed1 -r 79d8fd9e74b9 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk	Thu Jun 11 15:16:20 2009 -0400
+++ b/make/common/shared/Platform.gmk	Mon Jun 15 13:07:30 2009 -0400
@@ -288,11 +288,22 @@
   TEMP_DISK=C:/temp
   # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
   # return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead.
+  PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER))
+  PROC_ARCH:=$(subst x86,X86,$(PROC_ARCH))
+  PROC_ARCH:=$(subst x64,X64,$(PROC_ARCH))
+  PROC_ARCH:=$(subst intel64,X64,$(PROC_ARCH))
+  PROC_ARCH:=$(subst Intel64,X64,$(PROC_ARCH))
+  PROC_ARCH:=$(subst INTEL64,X64,$(PROC_ARCH))
+  PROC_ARCH:=$(subst em64t,X64,$(PROC_ARCH))
+  PROC_ARCH:=$(subst EM64T,X64,$(PROC_ARCH))
+  PROC_ARCH:=$(subst amd64,X64,$(PROC_ARCH))
+  PROC_ARCH:=$(subst AMD64,X64,$(PROC_ARCH))
+  PROC_ARCH:=$(subst ia64,IA64,$(PROC_ARCH))
   ifndef ARCH_DATA_MODEL
-    ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64)
+    ifeq ($(PROC_ARCH),IA64)
       ARCH_DATA_MODEL=64
     else
-      ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),AMD64)
+      ifeq ($(PROC_ARCH),X64)
         ARCH_DATA_MODEL=64
       else
         ARCH_DATA_MODEL=32
@@ -313,10 +324,12 @@
     #      + set ARCH to ia64 or amd64, or
     REQUIRED_WINDOWS_NAME=Windows Server 2003
     REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1
-    ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)), AMD64)
+    ifeq ($(PROC_ARCH),X64)
       ARCH=amd64
     else
-      ARCH=ia64
+      ifeq ($(PROC_ARCH),IA64)
+        ARCH=ia64
+      endif
     endif
     LIBARCH=$(ARCH)
     # Value of Java os.arch property