diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-07-22 21:59:50 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-07-22 21:59:50 +0000 |
| commit | e2650fc1b38a7094eb7e2dccd03670a764c2b74b (patch) | |
| tree | bbe9f78ca64eed3c393ee9de1efca7d7ac25056b /java/openjdk6/files/icedtea | |
| parent | Use GNU versions of tar, md5sum, sha1sum, sha256sum during runtime (diff) | |
- Add couple of upstreamed IcedTea6 patches for consistency.
- Disable test_gamma by default.
Notes
Notes:
svn path=/head/; revision=323500
Diffstat (limited to 'java/openjdk6/files/icedtea')
3 files changed, 70 insertions, 0 deletions
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); |