FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

collect2.c (main): Remove SWITCHES_NEED_SPACES conditional.

Browse source 
* collect2.c (main): Remove SWITCHES_NEED_SPACES conditional.
	* doc/tm.texi (SWITCHES_NEED_SPACES): Don't document.
	* gcc.c (SWITCHES_NEED_SPACES, switches_need_spaces): Remove.
	(static_specs): Remove switches_need_spaces.
	(process_command, do_self_spec): Hardcode handling "-o" instead of
	checking switches_need_spaces.
	* system.h (SWITCHES_NEED_SPACES): Poison.

From-SVN: r161436
This commit is contained in:
Joseph Myers 2010-06-26 18:04:16 +01:00 • committed by Joseph Myers
parent 2706a6158b
commit d5d8b1117e
5 changed files with 16 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gcc/ChangeLog
View file

@ -1,3 +1,13 @@
2010-06-26 Joseph Myers <joseph@codesourcery.com>
* collect2.c (main): Remove SWITCHES_NEED_SPACES conditional.
* doc/tm.texi (SWITCHES_NEED_SPACES): Don't document.
* gcc.c (SWITCHES_NEED_SPACES, switches_need_spaces): Remove.
(static_specs): Remove switches_need_spaces.
(process_command, do_self_spec): Hardcode handling "-o" instead of
checking switches_need_spaces.
* system.h (SWITCHES_NEED_SPACES): Poison.
2010-06-26 Richard Guenther <rguenther@suse.de>
PR tree-optimization/44393

7
gcc/collect2.c
View file

@ -1535,12 +1535,7 @@ main (int argc, char **argv)
case 'o':
if (arg[2] == '\0')
output_file = *ld1++ = *ld2++ = *++argv;
else if (1
#ifdef SWITCHES_NEED_SPACES
&& ! strchr (SWITCHES_NEED_SPACES, arg[1])
#endif
)
else
output_file = &arg[2];
break;

7
gcc/doc/tm.texi
View file

@ -141,13 +141,6 @@ should call @code{DEFAULT_SWITCH_CURTAILS_COMPILATION} and then check
for additional options.
@end defmac
@defmac SWITCHES_NEED_SPACES
A string-valued C expression which enumerates the options for which
the linker needs a space between the option and its argument.
If this macro is not defined, the default value is @code{""}.
@end defmac
@defmac TARGET_OPTION_TRANSLATE_TABLE
If defined, a list of pairs of strings, the first of which is a
potential command line target to the @file{gcc} driver program, and the

22
gcc/gcc.c
View file

@ -664,18 +664,6 @@ proper position among the other output files. */
"%{!shared:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}"
#endif
/* config.h can define SWITCHES_NEED_SPACES to control which options
require spaces between the option and the argument.
We define SWITCHES_NEED_SPACES to include "o" by default. This
causes "-ofoo.o" to be split into "-o foo.o" during the initial
processing of the command-line, before being seen by the specs
machinery. This makes sure we record "foo.o" as the temporary file
to be deleted in the case of error, rather than "-ofoo.o". */
#ifndef SWITCHES_NEED_SPACES
#define SWITCHES_NEED_SPACES "o"
#endif
/* config.h can define ENDFILE_SPEC to override the default crtn files. */
#ifndef ENDFILE_SPEC
#define ENDFILE_SPEC ""
@ -811,7 +799,6 @@ static const char *link_gomp_spec = "";
static const char *libgcc_spec = LIBGCC_SPEC;
static const char *endfile_spec = ENDFILE_SPEC;
static const char *startfile_spec = STARTFILE_SPEC;
static const char *switches_need_spaces = SWITCHES_NEED_SPACES;
static const char *linker_name_spec = LINKER_NAME;
static const char *linker_plugin_file_spec = "";
static const char *lto_wrapper_spec = "";
@ -1651,7 +1638,6 @@ static struct spec_list static_specs[] =
INIT_STATIC_SPEC ("link_gomp", &link_gomp_spec),
INIT_STATIC_SPEC ("libgcc", &libgcc_spec),
INIT_STATIC_SPEC ("startfile", &startfile_spec),
INIT_STATIC_SPEC ("switches_need_spaces", &switches_need_spaces),
INIT_STATIC_SPEC ("cross_compile", &cross_compile),
INIT_STATIC_SPEC ("version", &compiler_version),
INIT_STATIC_SPEC ("multilib", &multilib_select),
@ -4214,9 +4200,9 @@ process_command (int argc, const char **argv)
/* Null-terminate the vector. */
switches[n_switches].args[j] = 0;
}
else if (strchr (switches_need_spaces, c))
else if (c == 'o')
{
/* On some systems, ld cannot handle some options without
/* On some systems, ld cannot handle "-o" without
a space. So split the option from its argument. */
char *part1 = XNEWVEC (char, 2);
part1[0] = c;
@ -4786,9 +4772,9 @@ do_self_spec (const char *spec)
/* Null-terminate the vector. */
sw->args[j] = 0;
}
else if (strchr (switches_need_spaces, c))
else if (c == 'o')
{
/* On some systems, ld cannot handle some options without
/* On some systems, ld cannot handle "-o" without
a space. So split the option from its argument. */
char *part1 = XNEWVEC (char, 2);
part1[0] = c;

2
gcc/system.h
View file

@ -769,7 +769,7 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
ASM_OUTPUT_SHARED_LOCAL ASM_MAKE_LABEL_LINKONCE \
STACK_CHECK_PROBE_INTERVAL STACK_CHECK_PROBE_LOAD \
ORDER_REGS_FOR_LOCAL_ALLOC FUNCTION_OUTGOING_VALUE \
ASM_DECLARE_CONSTANT_NAME MODIFY_TARGET_NAME
ASM_DECLARE_CONSTANT_NAME MODIFY_TARGET_NAME SWITCHES_NEED_SPACES
/* Hooks that are no longer used. */
#pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE \