summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2005-08-30 16:19:15 +0000
committerfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2005-08-30 16:19:15 +0000
commit3f2b0698ca2600a813b37f1513c79c84b227b8cc (patch)
treecbec12a74dc3811b9d689adbf515725c98c173a9 /libjava
parent53fdb59e6a4b98922e25944ff867cb5bff8e55e9 (diff)
downloadgcc-3f2b0698ca2600a813b37f1513c79c84b227b8cc.tar.gz
2005-08-29 Thomas Fitzsimmons <fitzsim@redhat.com>
PR libgcj/23549 * gij.cc (main): Don't expect arguments to -enableassertions, -ea, -disableassertions and -da. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@103642 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/gij.cc14
2 files changed, 11 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c810ce23347..0c6f6509505 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 60d5b34817d..7c8d8b4222b 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")