From 376f9d5004dc12e758fae816379338830d12cd94 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 12 Jul 2005 22:35:03 +0000
Subject: [PATCH] PR java/19674: * parse-scan.y
(interface_member_declaration): Added empty_statement.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101948 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/java/ChangeLog | 6 ++++++
gcc/java/jvspec.c | 22 ++++++++++++++--------
gcc/java/parse-scan.y | 1 +
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b1eed198a8fd..c45a7918ede4 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-12 Tom Tromey <tromey@redhat.com>
+
+ PR java/19674:
+ * parse-scan.y (interface_member_declaration): Added
+ empty_statement.
+
2005-07-08 Daniel Berlin <dberlin@dberlin.org>
* java-tree.h (LABEL_RETURN_LABELS): Use decl_non_common.
diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index e4f4d1838de6..2163a3c05c99 100644
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -1,6 +1,6 @@
/* Specific flags and argument handling of the front-end of the
GNU compiler for the Java(TM) language.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of GCC.
@@ -493,11 +493,22 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
arglist = xmalloc ((num_args + 1) * sizeof (char *));
j = 0;
- for (i = 0; i < argc; i++, j++)
+ arglist[j++] = argv[0];
+
+ if (combine_inputs || indirect_files_count > 0)
+ arglist[j++] = "-ffilelist-file";
+
+ if (combine_inputs)
+ {
+ arglist[j++] = "-xjava";
+ arglist[j++] = filelist_filename;
+ }
+
+ for (i = 1; i < argc; i++, j++)
{
arglist[j] = argv[i];
- if ((args[i] & PARAM_ARG) || i == 0)
+ if ((args[i] & PARAM_ARG))
continue;
if ((args[i] & RESOURCE_FILE_ARG) != 0)
@@ -559,15 +570,10 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
}
}
- if (combine_inputs || indirect_files_count > 0)
- arglist[j++] = "-ffilelist-file";
-
if (combine_inputs)
{
if (fclose (filelist_file))
pfatal_with_name (filelist_filename);
- arglist[j++] = "-xjava";
- arglist[j++] = filelist_filename;
}
/* If we saw no -O or -g option, default to -g1, for javac compatibility. */
diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y
index 2b1564677856..71c43a74af69 100644
--- a/gcc/java/parse-scan.y
+++ b/gcc/java/parse-scan.y
@@ -637,6 +637,7 @@ interface_member_declaration:
| abstract_method_declaration
| class_declaration /* Added, JDK1.1 inner classes */
| interface_declaration /* Added, JDK1.1 inner classes */
+| empty_statement
;
constant_declaration:
--
GitLab