diff options
author | Stepan Kasal <skasal@redhat.com> | 2007-03-26 22:15:14 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-03-26 22:15:14 +0000 |
commit | 596438ca819090ac83159b4d068b78c17019c066 (patch) | |
tree | 4d7cdfacc1a36c9ed7314c0cfa1aa0560f523615 | |
parent | 7cf2045de18e9d6499626b5f0321aab16319b96a (diff) | |
download | gcc-596438ca819090ac83159b4d068b78c17019c066.zip gcc-596438ca819090ac83159b4d068b78c17019c066.tar.gz gcc-596438ca819090ac83159b4d068b78c17019c066.tar.bz2 |
Main.java (cniOrJniSeen): New field.
2007-03-26 Stepan Kasal <skasal@redhat.com>
* tools/gnu/classpath/tools/javah/Main.java (cniOrJniSeen): New
field.
(getParser): Use new field.
From-SVN: r123240
13 files changed, 14 insertions, 1 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 330fe70..54f71df 100644 --- 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 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 Binary files differindex 5937740..9acfd81 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$1.class 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 Binary files differindex ed0500f..7feb934 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$10.class 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 Binary files differindex 1eb1b1e..8148867 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$2.class 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 Binary files differindex a798489..00fd949 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$3.class 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 Binary files differindex 0811703..818c3d4 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$4.class 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 Binary files differindex faa51e2..d0b741f 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$5.class 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 Binary files differindex 10286fa..4e1c7f3 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$6.class 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 Binary files differindex 6da557c..104ce2e 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$7.class 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 Binary files differindex 16fe8a3..8b47b8c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$8.class 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 Binary files differindex f4393f5..038d74d 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main$9.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class Binary files differindex 56c7f48..ac3fda8 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class 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 --- 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've seen -cni or -jni. + boolean cniOrJniSeen; + // True if output files should always be written. boolean force; @@ -243,8 +246,9 @@ public class Main { public void parsed(String arg0) throws OptionException { - if (cni) + if (cniOrJniSeen && cni) throw new OptionException("only one of -jni or -cni may be used"); + cniOrJniSeen = true; cni = false; } }); @@ -252,6 +256,9 @@ public class Main { 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; } }); |