OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure collect2 responds to intended commmand line options.

Browse Source 
To ensure compatibility with the flags consumed by ld, some of the flags
needed by collect2 come from the command line and some are passed
in the COLLECT_GCC_OPTIONS.

Here we combine initial parses of both and then set the LTO mode accordingly.

2018-12-23  Iain Sandoe  <iain@sandoe.co.uk>

	* collect2.c (main): Combine flags from both the command line and
	COLLECT_GCC_OPTIONS to determine the set in force

From-SVN: r267369
This commit is contained in:
Iain Sandoe 2018-12-23 10:28:51 +00:00 committed by Iain Sandoe
parent 0652a15121
commit f67eeb79e1
2 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2018-12-23 Iain Sandoe <iain@sandoe.co.uk>
* collect2.c (main): Combine flags from both the command line and
COLLECT_GCC_OPTIONS to determine the set in force
2018-12-21 Jan Hubicka <hubicka@ucw.cz>
* ipa-utils.c (ipa_merge_profiles): Recompute summaries.

55
gcc/collect2.c
View File

@ -981,13 +981,14 @@ main (int argc, char **argv)
object = CONST_CAST2 (const char **, char **, object_lst);
#ifdef DEBUG
debug = 1;
debug = true;
#endif
/* Parse command line early for instances of -debug. This allows
the debug flag to be set before functions like find_a_file()
are called. We also look for the -flto or -flto-partition=none flag to know
what LTO mode we are in. */
save_temps = false;
verbose = false;
/* Parse command line / environment for flags we want early.
This allows the debug flag to be set before functions like find_a_file()
are called. */
{
bool no_partition = false;
@ -995,8 +996,6 @@ main (int argc, char **argv)
{
if (! strcmp (argv[i], "-debug"))
debug = true;
else if (! strcmp (argv[i], "-flto-partition=none"))
no_partition = true;
else if (!strncmp (argv[i], "-fno-lto", 8))
lto_mode = LTO_MODE_NONE;
else if (! strcmp (argv[i], "-plugin"))
@ -1031,13 +1030,6 @@ main (int argc, char **argv)
aixlazy_flag = 1;
#endif
}
verbose = debug;
find_file_set_debug (debug);
if (use_plugin)
lto_mode = LTO_MODE_NONE;
if (no_partition && lto_mode == LTO_MODE_WHOPR)
lto_mode = LTO_MODE_LTO;
}
#ifndef DEFAULT_A_OUT_NAME
output_file = "a.out";
@ -1045,20 +1037,37 @@ main (int argc, char **argv)
output_file = DEFAULT_A_OUT_NAME;
#endif
obstack_begin (&temporary_obstack, 0);
temporary_firstobj = (char *) obstack_alloc (&temporary_obstack, 0);
obstack_begin (&temporary_obstack, 0);
temporary_firstobj = (char *) obstack_alloc (&temporary_obstack, 0);
#ifndef HAVE_LD_DEMANGLE
current_demangling_style = auto_demangling;
#endif
p = getenv ("COLLECT_GCC_OPTIONS");
while (p && *p)
{
const char *q = extract_string (&p);
if (*q == '-' && (q[1] == 'm' || q[1] == 'f'))
num_c_args++;
/* Now pick up any flags we want early from COLLECT_GCC_OPTIONS
The LTO options are passed here as are other options that might
be unsuitable for ld (e.g. -save-temps). */
p = getenv ("COLLECT_GCC_OPTIONS");
while (p && *p)
{
const char *q = extract_string (&p);
if (*q == '-' && (q[1] == 'm' || q[1] == 'f'))
num_c_args++;
if (strncmp (q, "-flto-partition=none", 20) == 0)
no_partition = true;
else if (strncmp (q, "-fno-lto", 8) == 0)
lto_mode = LTO_MODE_NONE;
}
obstack_free (&temporary_obstack, temporary_firstobj);
obstack_free (&temporary_obstack, temporary_firstobj);
verbose = verbose || debug;
save_temps = save_temps || debug;
find_file_set_debug (debug);
if (use_plugin)
lto_mode = LTO_MODE_NONE;
if (no_partition && lto_mode == LTO_MODE_WHOPR)
lto_mode = LTO_MODE_LTO;
}
/* -fno-profile-arcs -fno-test-coverage -fno-branch-probabilities
-fno-exceptions -w -fno-whole-program */