changeset 55:edbc97c550e4

meth, indy: rebase to bsd-port
author jrose
date Tue, 11 May 2010 17:49:05 -0700
parents c2c8c3c2e692
children d5f083ee4032
files meth-ing-6939134.patch series
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/meth-ing-6939134.patch	Sat May 01 20:08:05 2010 -0700
+++ b/meth-ing-6939134.patch	Tue May 11 17:49:05 2010 -0700
@@ -340,9 +340,9 @@
 -        if (target.hasInvokedynamic()) {
 -            options.put("invokedynamic",  "invokedynamic");
 -        }
-         return filenames.toList();
-     }
-     // where
+ 
+         // handle this here so it works even if no other options given
+         String showClass = options.get("showClass");
 diff --git a/src/share/classes/com/sun/tools/javac/util/Names.java b/src/share/classes/com/sun/tools/javac/util/Names.java
 --- a/src/share/classes/com/sun/tools/javac/util/Names.java
 +++ b/src/share/classes/com/sun/tools/javac/util/Names.java
--- a/series	Sat May 01 20:08:05 2010 -0700
+++ b/series	Tue May 11 17:49:05 2010 -0700
@@ -1,14 +1,14 @@
-# base = 9d0c5bd080b6 in http://hg.openjdk.java.net/bsd-port/bsd-port/langtools [2010-04-19]
+# base = 6c9fc54a9389 in http://hg.openjdk.java.net/bsd-port/bsd-port/langtools [2010-05-08]
 
 compile-error-tweak.patch       #+compile-error-tweak
 netbeans-project.patch          #+netbeans-project
 dump-stack-on-error.patch       #+dump-stack-on-error
 
-meth.patch                      #-/meth #+9d0c5bd080b6
-meth-ing-6939134.patch          #-/meth #+9d0c5bd080b6
-meth-ver-6949040.patch          #-/meth #+9d0c5bd080b6 #-testable
-meth-ldc-6939203.patch          #-/meth #+9d0c5bd080b6
-meth-anno.patch                 #-/meth #+9d0c5bd080b6 #-testable
+meth.patch                      #-/meth #+6c9fc54a9389
+meth-ing-6939134.patch          #-/meth #+6c9fc54a9389
+meth-ver-6949040.patch          #-/meth #+6c9fc54a9389 #-testable
+meth-ldc-6939203.patch          #-/meth #+6c9fc54a9389
+meth-anno.patch                 #-/meth #+6c9fc54a9389 #-testable
 
 # Keep these separate, for debugging and review:
 dyncast.patch   #+dyncast       #-/dyncast