57eb5a
diff --git a/7133138.patch b/7133138.patch
57eb5a
new file mode 100644
57eb5a
index 0000000..882f15f
57eb5a
--- /dev/null
57eb5a
+++ b/7133138.patch
57eb5a
@@ -0,0 +1,38 @@
57eb5a
+--- sun/tools/javazic/Mappings.java.orig       2015-04-13 12:44:10.000000000 -0400
57eb5a
++++ sun/tools/javazic/Mappings.java    2015-04-13 12:45:28.000000000 -0400
57eb5a
+@@ -1,5 +1,5 @@
57eb5a
+ /*
57eb5a
+- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
57eb5a
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
57eb5a
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
57eb5a
+  *
57eb5a
+  * This code is free software; you can redistribute it and/or modify it
57eb5a
+@@ -26,6 +26,7 @@
57eb5a
+ package sun.tools.javazic;
57eb5a
+ 
57eb5a
+ import        java.util.ArrayList;
57eb5a
++import java.util.HashMap;
57eb5a
+ import        java.util.LinkedList;
57eb5a
+ import        java.util.List;
57eb5a
+ import        java.util.Map;
57eb5a
+@@ -162,6 +163,20 @@
57eb5a
+       for (String key : toBeRemoved) {
57eb5a
+           aliases.remove(key);
57eb5a
+       }
57eb5a
++        // Eliminate any alias-to-alias mappings. For example, if
57eb5a
++        // there are A->B and B->C, A->B is changed to A->C.
57eb5a
++        Map<String, String> newMap = new HashMap<String, String>();
57eb5a
++        for (String key : aliases.keySet()) {
57eb5a
++            String realid = aliases.get(key);
57eb5a
++            String leaf = realid;
57eb5a
++            while (aliases.get(leaf) != null) {
57eb5a
++                leaf = aliases.get(leaf);
57eb5a
++            }
57eb5a
++            if (!realid.equals(leaf)) {
57eb5a
++                newMap.put(key, leaf);
57eb5a
++            }
57eb5a
++        }
57eb5a
++        aliases.putAll(newMap);
57eb5a
+     }
57eb5a
+ 
57eb5a
+     Map<String,String> getAliases() {