diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-11-21 09:45:20 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-11-21 09:45:20 +0000 |
| commit | c6512af198eada8dc1a9ba1a5350e495fd47e98d (patch) | |
| tree | 72521078564cfb03a85f3d85371c44e3c8c983b3 | |
| parent | 8ec0d38a156c112d17381fcc969d688b1cf179cd (diff) | |
* jvspec.c (lang_specific_driver): Put filelist_filename first on
command line.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_0-rhl-branch@107292 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/jvspec.c | 23 |
2 files changed, 20 insertions, 8 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 722d4eaea20..648fb76b234 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2005-07-13 Tom Tromey <tromey@redhat.com> + + * jvspec.c (lang_specific_driver): Put filelist_filename first on + command line. + 2005-11-08 Terry Laurenzo <tlaurenzo@gmail.com> PR java/20993 diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c index 479916b7d65..1688173ae1d 100644 --- a/gcc/java/jvspec.c +++ b/gcc/java/jvspec.c @@ -458,7 +458,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, if (filelist_file == NULL) pfatal_with_name (filelist_filename); num_args -= java_files_count + class_files_count + zip_files_count; - num_args += 2; /* for the combined arg and "-xjava" */ + num_args += 3; /* for the combined arg "-xjava", and "-xnone" */ } /* If we know we don't have to do anything, bail now. */ #if 0 @@ -493,11 +493,23 @@ 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; + arglist[j++] = "-xnone"; + } + + 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 +571,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. */ |