aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/lang.c13
-rw-r--r--gcc/java/lang.opt8
3 files changed, 12 insertions, 15 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e2c5866..634aca6 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-16 Neil Booth <neil@daikokuya.co.uk>
+
+ * lang.c (java_handle_option): Special-casing of optional
+ joined arguments no longer needed.
+ * lang.opt: Update switches that take optional argument.
+
2003-06-15 Neil Booth <neil@daikokuya.co.uk>
* lang.opt: Declare Java.
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index ff20985..07d5647 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -274,17 +274,8 @@ java_handle_option (size_t scode, const char *arg, int value)
if (arg == NULL && (option->flags & (CL_JOINED | CL_SEPARATE)))
{
- /* These can take an empty argument. */
- if (code == OPT_fassume_compiled_
- || code == OPT_fclasspath_
- || code == OPT_fCLASSPATH_
- || code == OPT_fbootclasspath_)
- arg = "";
- else
- {
- error ("missing argument to \"-%s\"", option->opt_text);
- return 1;
- }
+ error ("missing argument to \"-%s\"", option->opt_text);
+ return 1;
}
switch (code)
diff --git a/gcc/java/lang.opt b/gcc/java/lang.opt
index e108fb72..ed8d02e 100644
--- a/gcc/java/lang.opt
+++ b/gcc/java/lang.opt
@@ -65,7 +65,7 @@ Wredundant-modifiers
Java
fCLASSPATH=
-Java Joined RejectNegative
+Java JoinedOrMissing RejectNegative
fassert
Java
@@ -74,16 +74,16 @@ fassume-compiled
Java
fassume-compiled=
-Java Joined
+Java JoinedOrMissing
fbootclasspath=
-Java Joined RejectNegative
+Java JoinedOrMissing RejectNegative
fcheck-references
Java
fclasspath=
-Java Joined RejectNegative
+Java JoinedOrMissing RejectNegative
fcompile-resource=
Java Joined RejectNegative