- Add couple of upstreamed IcedTea6 patches for consistency.

- Disable test_gamma by default.

7 files changed, 123 insertions, 31 deletions

diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 450da6439e12..76b8a7195283 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openjdk6
 PORTVERSION=	b27
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
 		http://download.java.net/jaxp/openjdk/jdk6/:jaxp \
@@ -173,6 +173,8 @@ DISTFILES+=	${JTREGFILE}:jtreg
 EXTRACT_ONLY+=	${JTREGFILE}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 USE_DISPLAY=	yes
+.else
+EXTRA_PATCHES+=	${FILESDIR}/test_gamma-disable.patch
 .endif
 
 COPYDIRS=	\
diff --git a/java/openjdk6/Makefile.icedtea b/java/openjdk6/Makefile.icedtea
index 2e666f8c6aa5..12e0cf3eb01c 100644
--- a/java/openjdk6/Makefile.icedtea
+++ b/java/openjdk6/Makefile.icedtea
@@ -160,8 +160,11 @@ _PATCHES= \
 
 .if ${PORT_OPTIONS:MICEDTEA}
 _PATCHES+= \
-	openjdk/7032388-work_without_cmov_instruction.patch \
 	applet_hole.patch \
+	openjdk/7032388-work_without_cmov_instruction.patch \
+	openjdk/8004341-jck_dialog_failure.patch \
+	openjdk/8004341-jck_dialog_failure-02.patch \
+	openjdk/7197906-handle_32_bit_shifts.patch \
 	jpegclasses.patch
 .endif
 
diff --git a/java/openjdk6/files/icedtea/openjdk/7197906-handle_32_bit_shifts.patch b/java/openjdk6/files/icedtea/openjdk/7197906-handle_32_bit_shifts.patch
new file mode 100644
index 000000000000..07304d60aeba
--- /dev/null
+++ b/java/openjdk6/files/icedtea/openjdk/7197906-handle_32_bit_shifts.patch
@@ -0,0 +1,33 @@
+--- hotspot/src/share/vm/memory/blockOffsetTable.hpp	2012-09-13 21:22:37.897456500 +0200
++++ hotspot/src/share/vm/memory/blockOffsetTable.hpp	2012-09-13 21:22:34.345253300 +0200
+@@ -285,7 +285,7 @@
+   };
+ 
+   static size_t power_to_cards_back(uint i) {
+-    return (size_t)(1 << (LogBase * i));
++    return (size_t)1 << (LogBase * i);
+   }
+   static size_t power_to_words_back(uint i) {
+     return power_to_cards_back(i) * N_words;
+--- hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2012-09-13 21:22:37.901456800 +0200
++++ hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp	2012-09-13 21:22:34.354253900 +0200
+@@ -110,7 +110,7 @@
+ #ifndef PRODUCT
+ bool CMBitMapRO::covers(ReservedSpace rs) const {
+   // assert(_bm.map() == _virtual_space.low(), "map inconsistency");
+-  assert(((size_t)_bm.size() * (size_t)(1 << _shifter)) == _bmWordSize,
++  assert(((size_t)_bm.size() * ((size_t)1 << _shifter)) == _bmWordSize,
+          "size inconsistency");
+   return _bmStartWord == (HeapWord*)(rs.base()) &&
+          _bmWordSize  == rs.size()>>LogHeapWordSize;
+--- hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2012-09-13 21:22:37.898456600 +0200
++++ hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp	2012-09-13 21:22:34.346253400 +0200
+@@ -273,7 +273,7 @@
+   if (_max_fine_entries == 0) {
+     assert(_mod_max_fine_entries_mask == 0, "Both or none.");
+     size_t max_entries_log = (size_t)log2_long((jlong)G1RSetRegionEntries);
+-    _max_fine_entries = (size_t)(1 << max_entries_log);
++    _max_fine_entries = (size_t)1 << max_entries_log;
+     _mod_max_fine_entries_mask = _max_fine_entries - 1;
+ 
+     assert(_fine_eviction_sample_size == 0
diff --git a/java/openjdk6/files/icedtea/openjdk/8004341-jck_dialog_failure-02.patch b/java/openjdk6/files/icedtea/openjdk/8004341-jck_dialog_failure-02.patch
new file mode 100644
index 000000000000..586c0a97a943
--- /dev/null
+++ b/java/openjdk6/files/icedtea/openjdk/8004341-jck_dialog_failure-02.patch
@@ -0,0 +1,18 @@
+# HG changeset patch
+# User andrew
+# Date 1360590852 0
+# Node ID 892e940d9996b09c01796de27fd57225faf8be0a
+# Parent  c6058fa2a9824f71e06ca214aa8ec54400b56cc4
+8004341: Two JCK tests fails with 7u11 b06
+
+diff --git a/src/share/classes/java/awt/Dialog.java b/src/share/classes/java/awt/Dialog.java
+--- jdk/src/share/classes/java/awt/Dialog.java
++++ jdk/src/share/classes/java/awt/Dialog.java
+@@ -1643,7 +1643,6 @@
+         this.resizable = fields.get("resizable", true);
+         this.undecorated = fields.get("undecorated", false);
+         this.title = (String)fields.get("title", "");
+-        this.modalityType = localModalityType;
+ 
+         blockedWindows = new IdentityArrayList();
+ 
diff --git a/java/openjdk6/files/icedtea/openjdk/8004341-jck_dialog_failure.patch b/java/openjdk6/files/icedtea/openjdk/8004341-jck_dialog_failure.patch
new file mode 100644
index 000000000000..7606e3976b7c
--- /dev/null
+++ b/java/openjdk6/files/icedtea/openjdk/8004341-jck_dialog_failure.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User andrew
+# Date 1360323180 0
+# Node ID ca6ee539c5f4f4dd9d5fb9b0604d94c5806c3e28
+# Parent  635d562a25becae602dc5988dae8bce84b199eb4
+8004341: Two JCK tests fails with 7u11 b06
+
+diff --git a/src/share/classes/java/awt/Dialog.java b/src/share/classes/java/awt/Dialog.java
+--- jdk/src/share/classes/java/awt/Dialog.java
++++ jdk/src/share/classes/java/awt/Dialog.java
+@@ -1636,6 +1636,8 @@
+         if (localModalityType == null) {
+             this.modal = fields.get("modal", false);
+             setModal(modal);
++        } else {
++            this.modalityType = localModalityType;
+         }
+ 
+         this.resizable = fields.get("resizable", true);
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index 9c0c9bc2e520..435b6c510380 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -2985,35 +2985,7 @@
  endif
 --- hotspot/make/bsd/Makefile
 +++ hotspot/make/bsd/Makefile
-@@ -39,11 +39,11 @@
- # One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on
- # an architecture that differs from the target architecture, as long
- # as the bootstrap jdk runs under the same flavor of OS as the target
--# (i.e., if the target is bsd, point to a jdk that runs on a bsd
-+# (i.e., if the target is linux, point to a jdk that runs on a linux
- # box).  In order to use such a bootstrap jdk, set the make variable
- # REMOTE to the desired remote command mechanism, e.g.,
- #
--#    make REMOTE="rsh -l me myotherbsdbox"
-+#    make REMOTE="rsh -l me myotherlinuxbox"
- 
- # Along with VM, Serviceability Agent (SA) is built for SA/JDI binding.
- # JDI binding on SA produces two binaries:
-@@ -94,7 +94,7 @@
- #
- # We only do this on SunOS variants, for a couple of reasons:
- #  * It is extremely rare that source trees exist on other systems
--#  * It has been claimed that the Bsd automounter is flakey, so
-+#  * It has been claimed that the Linux automounter is flakey, so
- #    changing GAMMADIR in a way that exercises the automounter could
- #    prove to be a source of unreliability in the build process.
- # Obviously, this Makefile is only relevant on SunOS boxes to begin
-@@ -226,11 +226,12 @@
- 
- checks: check_os_version check_j2se_version
- 
--# We do not want people accidentally building on old systems (e.g. Bsd 2.2.x,
-+# We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
+@@ -230,7 +230,8 @@
  # Solaris 2.5.1, 2.6).
  # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
  
diff --git a/java/openjdk6/files/test_gamma-disable.patch b/java/openjdk6/files/test_gamma-disable.patch
new file mode 100644
index 000000000000..1be01027f977
--- /dev/null
+++ b/java/openjdk6/files/test_gamma-disable.patch
@@ -0,0 +1,45 @@
+--- hotspot/make/bsd/Makefile
++++ hotspot/make/bsd/Makefile
+@@ -287,42 +288,36 @@
+ 
+ $(TARGETS_C2):  $(SUBDIRS_C2)
+ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+ endif
+ 
+ $(TARGETS_TIERED):  $(SUBDIRS_TIERED)
+ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+ 
+ $(TARGETS_C1):  $(SUBDIRS_C1)
+ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+ 
+ $(TARGETS_CORE):  $(SUBDIRS_CORE)
+ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+ 
+ $(TARGETS_ZERO):  $(SUBDIRS_ZERO)
+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+ 
+ $(TARGETS_SHARK):  $(SUBDIRS_SHARK)
+ 	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
+-	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
+ ifdef INSTALL
+ 	cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
+ endif