git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverted erroneous commit 

From-SVN: r101949
This commit is contained in:
Tom Tromey 2005-07-12 22:35:48 +00:00
parent 309ca98d96
commit 3c503f9a68
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gcc/java/jvspec.c
View File

@ -1,6 +1,6 @@
/* Specific flags and argument handling of the front-end of the /* Specific flags and argument handling of the front-end of the
GNU compiler for the Java(TM) language. 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. Free Software Foundation, Inc.
This file is part of GCC. 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 *)); arglist = xmalloc ((num_args + 1) * sizeof (char *));
j = 0; j = 0;
arglist[j++] = argv[0]; for (i = 0; i < argc; i++, j++)
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++)
{ {
arglist[j] = argv[i]; arglist[j] = argv[i];
if ((args[i] & PARAM_ARG)) if ((args[i] & PARAM_ARG) || i == 0)
continue; continue;
if ((args[i] & RESOURCE_FILE_ARG) != 0) 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 (combine_inputs)
{ {
if (fclose (filelist_file)) if (fclose (filelist_file))
pfatal_with_name (filelist_filename); 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. */ /* If we saw no -O or -g option, default to -g1, for javac compatibility. */