mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-08 15:37:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

gcc.c (do_spec_1): Revert 2003-02-24 patch.

Browse Source 
* gcc.c (do_spec_1) ['{']: Revert 2003-02-24 patch.  Don't handle
	pending argument upon return from handle_braces here.
	(do_spec_2): Instead handle it upon return from do_spec_1 here.

Co-Authored-By: Joern Rennecke <joern.rennecke@superh.com>

From-SVN: r64047
This commit is contained in:
Roger Sayle 2003-03-09 21:44:49 +00:00 committed by Roger Sayle
parent 3006d72869
commit 6544fbcb2a
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2003-03-09 Roger Sayle <roger@eyesopen.com>
Joern Rennecke <joern.rennecke@superh.com>
* gcc.c (do_spec_1) ['{']: Revert 2003-02-24 patch. Don't handle
pending argument upon return from handle_braces here.
(do_spec_2): Instead handle it upon return from do_spec_1 here.
2003-03-09 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* varasm.c (make_decl_one_only): Use declare_weak().

32
gcc/gcc.c
View File

@ -4248,6 +4248,9 @@ static int
do_spec_2 (spec)
const char *spec;
{
const char *string;
int result;
clear_args ();
arg_going = 0;
delete_this_arg = 0;
@ -4256,7 +4259,22 @@ do_spec_2 (spec)
input_from_pipe = 0;
suffix_subst = NULL;
return do_spec_1 (spec, 0, NULL);
result = do_spec_1 (spec, 0, NULL);
/* End any pending argument. */
if (arg_going)
{
obstack_1grow (&obstack, 0);
string = obstack_finish (&obstack);
if (this_is_library_file)
string = find_file (string);
store_arg (string, delete_this_arg, this_is_output_file);
if (this_is_output_file)
outfiles[input_file_number] = string;
arg_going = 0;
}
return result;
}
@ -5159,18 +5177,6 @@ do_spec_1 (spec, inswitch, soft_matched_part)
p = handle_braces (p);
if (p == 0)
return -1;
/* End any pending argument. */
if (arg_going)
{
obstack_1grow (&obstack, 0);
string = obstack_finish (&obstack);
if (this_is_library_file)
string = find_file (string);
store_arg (string, delete_this_arg, this_is_output_file);
if (this_is_output_file)
outfiles[input_file_number] = string;
arg_going = 0;
}
break;
case ':':