2007-03-26 Stepan Kasal <skasal@redhat.com>

	* tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New
	field.
	(getParser): Use new field.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123240 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 330fe70..54f71df 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-26  Stepan Kasal  <skasal@redhat.com>
+
+       * tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New
+       field.
+       (getParser): Use new field.
+

 2007-03-17  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
        * resource/com/sun/tools/javac/messages.properties
 2007-03-17  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
        * resource/com/sun/tools/javac/messages.properties

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class
index 5937740..9acfd81 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class
index ed0500f..7feb934 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class
index 1eb1b1e..8148867 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class
index a798489..00fd949 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class
index 0811703..818c3d4 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class
index faa51e2..d0b741f 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class
index 10286fa..4e1c7f3 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class
index 6da557c..104ce2e 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class
index 16fe8a3..8b47b8c 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class
index f4393f5..038d74d 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
index 56c7f48..ac3fda8 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class differ

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index dfa04c4..29c96cf 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
@@ -89,6 +89,9 @@ public class Main
   // True if we're emitting CNI code.
   boolean cni;
 
   // True if we're emitting CNI code.
   boolean cni;
 

+  // True if we've seen -cni or -jni.
+  boolean cniOrJniSeen;
+

   // True if output files should always be written.
   boolean force;
 
   // True if output files should always be written.
   boolean force;
 


@@ -243,8 +246,9 @@ public class Main
     {
       public void parsed(String arg0) throws OptionException
       {
     {
       public void parsed(String arg0) throws OptionException
       {

-        if (cni)
+        if (cniOrJniSeen && cni)

           throw new OptionException("only one of -jni or -cni may be used");
           throw new OptionException("only one of -jni or -cni may be used");

+       cniOrJniSeen = true;

         cni = false;
       }
     });
         cni = false;
       }
     });


@@ -252,6 +256,9 @@ public class Main
     {
       public void parsed(String arg0) throws OptionException
       {
     {
       public void parsed(String arg0) throws OptionException
       {

+        if (cniOrJniSeen && ! cni)
+          throw new OptionException("only one of -jni or -cni may be used");
+       cniOrJniSeen = true;

         cni = true;
       }
     });
         cni = true;
       }
     });