diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-08-30 16:19:15 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2005-08-30 16:19:15 +0000 |
| commit | 7a98d47cf7832ce369db72c587b9ed0d48f21755 (patch) | |
| tree | cbec12a74dc3811b9d689adbf515725c98c173a9 | |
| parent | 5038e0988ed00c097c45794ca5eee2511cd7ff62 (diff) | |
| download | gcc-7a98d47cf7832ce369db72c587b9ed0d48f21755.zip gcc-7a98d47cf7832ce369db72c587b9ed0d48f21755.tar.gz gcc-7a98d47cf7832ce369db72c587b9ed0d48f21755.tar.bz2 | |
re PR libgcj/23549 (gij swallows args after -ea)
2005-08-29 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/23549
* gij.cc (main): Don't expect arguments to -enableassertions, -ea,
-disableassertions and -da.
From-SVN: r103642
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gij.cc | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c810ce2..0c6f650 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-08-29 Thomas Fitzsimmons <fitzsim@redhat.com> + + PR libgcj/23549 + * gij.cc (main): Don't expect arguments to -enableassertions, -ea, + -disableassertions and -da. + 2005-08-29 Andrew Pinski <pinskia@physics.uc.edu> * configure.ac: Replace "*-*-darwin[0-7].*" with diff --git a/libjava/gij.cc b/libjava/gij.cc index 60d5b34..7c8d8b4 100644 --- a/libjava/gij.cc +++ b/libjava/gij.cc @@ -155,20 +155,16 @@ main (int argc, char const** argv) // Ignore 32/64-bit JIT options else if (! strcmp (arg, "-d32") || ! strcmp (arg, "-d64")) continue; - else if (! strcmp (arg, "-enableassertions") || ! strcmp (arg, "-ea")) + else if (! strncmp (arg, "-enableassertions", sizeof ("-enableassertions") - 1) + || ! strncmp (arg, "-ea", sizeof ("-ea") - 1)) { - if (i >= argc - 1) - goto no_arg; // FIXME: hook up assertion support - ++i; continue; } - else if (! strcmp (arg, "-disableassertions") || ! strcmp (arg, "-da")) + else if (! strncmp (arg, "-disableassertions", sizeof ("-disableassertions") - 1) + || ! strncmp (arg, "-da", sizeof ("-da") - 1)) { - if (i >= argc - 1) - goto no_arg; - // FIXME - ++i; + // FIXME: hook up assertion support continue; } else if (! strcmp (arg, "-enablesystemassertions") |