diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-12 22:35:48 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-12 22:35:48 +0000 |
| commit | 2eff3dbf9807c8f1f70edc4eb4262543031fbc1c (patch) | |
| tree | 5f31a14b18091c241dfc218ee28a6241ebfad78e /gcc/java | |
| parent | 376f9d5004dc12e758fae816379338830d12cd94 (diff) | |
| download | ppe42-gcc-2eff3dbf9807c8f1f70edc4eb4262543031fbc1c.tar.gz ppe42-gcc-2eff3dbf9807c8f1f70edc4eb4262543031fbc1c.zip | |
reverted erroneous commit
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101949 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/jvspec.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c index 2163a3c05c9..e4f4d1838de 100644 --- a/gcc/java/jvspec.c +++ b/gcc/java/jvspec.c @@ -1,6 +1,6 @@ /* Specific flags and argument handling of the front-end of the GNU compiler for the Java(TM) language. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GCC. @@ -493,22 +493,11 @@ lang_specific_driver (int *in_argc, const char *const **in_argv, arglist = xmalloc ((num_args + 1) * sizeof (char *)); j = 0; - 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; - } - - for (i = 1; i < argc; i++, j++) + for (i = 0; i < argc; i++, j++) { arglist[j] = argv[i]; - if ((args[i] & PARAM_ARG)) + if ((args[i] & PARAM_ARG) || i == 0) continue; if ((args[i] & RESOURCE_FILE_ARG) != 0) @@ -570,10 +559,15 @@ 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. */ |
