diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/java/jvspec.c | 17 | ||||
| -rw-r--r-- | gcc/java/lang.c | 1 | ||||
| -rw-r--r-- | gcc/java/lang.opt | 10 |
4 files changed, 16 insertions, 20 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index ca9a8d2..f6022e0 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +2010-09-02 Joseph Myers <joseph@codesourcery.com> + + * lang.opt (CLASSPATH, bootclasspath, classpath, encoding, + fCLASSPATH=): Mark as Java options and as aliases. + * jvspec.c (jvgenmain_spec): Don't handle -fCLASSPATH*. + (lang_specific_driver): Don't handle options marked as aliases. + * lang.c (java_handle_option): Don't handle OPT_fCLASSPATH_. + 2010-08-22 Joseph Myers <joseph@codesourcery.com> * Make-lang.in (jvspec.o): Update dependencies. diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c index cb8c146..792dda0 100644 --- a/gcc/java/jvspec.c +++ b/gcc/java/jvspec.c @@ -69,7 +69,7 @@ static const char jvgenmain_spec[] = %<fuse-boehm-gc %<fhash-synchronization %<fjni\ %<findirect-dispatch %<fnew-verifier\ %<fno-store-check %<foutput-class-dir\ - %<fclasspath* %<fCLASSPATH* %<fbootclasspath*\ + %<fclasspath* %<fbootclasspath*\ %<fextdirs*\ %<fuse-divide-subroutine %<fno-use-divide-subroutine\ %<fuse-atomic-builtins %<fno-use-atomic-builtins\ @@ -299,10 +299,8 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, saw_o = 1; break; - case OPT_classpath: - case OPT_bootclasspath: - case OPT_CLASSPATH: - case OPT_encoding: + case OPT_fclasspath_: + case OPT_fbootclasspath_: case OPT_extdirs: added -= 1; break; @@ -514,15 +512,11 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, --j; continue; - case OPT_classpath: - case OPT_CLASSPATH: - case OPT_fCLASSPATH_: case OPT_fclasspath_: jcf_path_classpath_arg (decoded_options[i].arg); --j; continue; - case OPT_bootclasspath: case OPT_fbootclasspath_: jcf_path_bootclasspath_arg (decoded_options[i].arg); --j; @@ -533,11 +527,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, --j; continue; - case OPT_encoding: - generate_option (OPT_fencoding_, decoded_options[i].arg, 1, - CL_DRIVER, &new_decoded_options[j]); - continue; - case OPT_L: if (spec_file == NULL) spec_file = find_spec_file (decoded_options[i].arg); diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 06edd5e..1633c02 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -261,7 +261,6 @@ java_handle_option (size_t scode, const char *arg, int value, case OPT_faux_classpath: case OPT_fclasspath_: - case OPT_fCLASSPATH_: jcf_path_classpath_arg (arg); break; diff --git a/gcc/java/lang.opt b/gcc/java/lang.opt index 3d6e902..af1dff1 100644 --- a/gcc/java/lang.opt +++ b/gcc/java/lang.opt @@ -29,7 +29,7 @@ Driver ; Java driver option in fact distinct from C-family option with the same name. CLASSPATH -Driver Separate +Java Separate Alias(fclasspath=) D Driver Joined Separate @@ -88,19 +88,19 @@ Java Var(flag_redundant) Warn if modifiers are specified when not necessary bootclasspath -Driver Separate +Java Separate Alias(fbootclasspath=) classpath -Driver Separate +Java Separate Alias(fclasspath=) encoding -Driver Separate +Java Separate Alias(fencoding=) extdirs Driver Separate fCLASSPATH= -Java JoinedOrMissing RejectNegative +Java JoinedOrMissing RejectNegative Alias(fclasspath=) --CLASSPATH Deprecated; use --classpath instead faux-classpath |