diff options
Diffstat (limited to 'gcc/java/jvspec.c')
| -rw-r--r-- | gcc/java/jvspec.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c index 74ca9d4..aad21e1 100644 --- a/gcc/java/jvspec.c +++ b/gcc/java/jvspec.c @@ -210,8 +210,8 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) int saw_libgcj ATTRIBUTE_UNUSED = 0; #endif - /* Saw -R, -C or -o options, respectively. */ - int saw_R = 0; + /* Saw --resource, -C or -o options, respectively. */ + int saw_resource = 0; int saw_C = 0; int saw_o = 0; @@ -303,13 +303,12 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) library = 0; will_link = 0; } - else if (strcmp (argv[i], "-R") == 0) + else if (strncmp (argv[i], "-fcompile-resource=", 19) == 0) { - saw_R = 1; - quote = argv[i]; + saw_resource = 1; want_spec_file = 0; if (library != 0) - added -= 2; + --added; library = 0; will_link = 0; } @@ -382,7 +381,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) continue; } - if (saw_R) + if (saw_resource) { args[i] |= RESOURCE_FILE_ARG; last_input_index = i; @@ -430,10 +429,10 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) fatal ("`%s' is not a valid class name", main_class_name); num_args = argc + added; - if (saw_R) + if (saw_resource) { if (! saw_o) - fatal ("-R requires -o"); + fatal ("--resource requires -o"); } if (saw_C) { @@ -514,15 +513,6 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) arglist[j] = "-xnone"; } - if (strcmp (argv[i], "-R") == 0) - { - arglist[j] = concat ("-fcompile-resource=", - *argv[i+1] == '/' ? "" : "/", - argv[i+1], NULL); - i++; - continue; - } - if (strcmp (argv[i], "-classpath") == 0 || strcmp (argv[i], "-bootclasspath") == 0 || strcmp (argv[i], "-CLASSPATH") == 0) |