diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-16 05:47:07 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-16 05:47:07 +0000 |
| commit | 837277abb06f9450177070657d8aa67bfd21643b (patch) | |
| tree | 67395c06dd702d1671de8501d39fbe92f55618bd /gcc/java | |
| parent | 88c1b63cdbc13c27b7cf9805f5a397b45596228f (diff) | |
| download | ppe42-gcc-837277abb06f9450177070657d8aa67bfd21643b.tar.gz ppe42-gcc-837277abb06f9450177070657d8aa67bfd21643b.zip | |
* c-opts.c (c_common_handle_option): s/on/value/.
(OPT_fabi_version_, OPT_ftabstop_, OPT_ftemplate_depth_): Use value
directly rather than converting the argument.
* c.opt: Update docs. Use UInteger where appropriate.
* common.opt: Use UInteger where appropriate.
* opts.c (integral_argument): New.
(handle_argument): Handle integral arguments, and optional
joined arguments.
(common_handle_option): Update.
* opts.h (CL_MISSING_OK, CL_UINTEGER): New.
* opts.sh: Handle JoinedOrMissing and UInteger flags.
java:
* lang.c (java_handle_option): Special-casing of optional
joined arguments no longer needed.
* lang.opt: Update switches that take optional argument.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67999 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/lang.c | 13 | ||||
| -rw-r--r-- | gcc/java/lang.opt | 8 |
3 files changed, 12 insertions, 15 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index e2c58664bd3..634aca69617 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 ff20985fc50..07d5647ed32 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 e108fb72c2c..ed8d02ee151 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 |
