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

Darwin, Driver: Avoid a link line for empty commands. 

We were pushing a spec value for weak_reference_mismatches unconditionally
which is not needed (the value was the default) and the side-effect of
this was that we appeared to need to drive a link command; leading to
unexpected diagnostics for cases where gcc was invoked with an empty
command line.

Also we were pushing flags for sysroot, os minimum version and controls
even if the command line was empty.

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

gcc/ChangeLog:

	* config/darwin-driver.c (darwin_driver_init): Exit from the
	option handling early if the command line is definitely enpty.
	* config/darwin.h (SUBTARGET_DRIVER_SELF_SPECS): Remove
	setting for the default content of weak_reference_mismatches.
This commit is contained in:
Iain Sandoe 2021-12-15 20:25:27 +00:00
parent 7c0ceaed0c
commit ff56eea24e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/config/darwin-driver.c
View File

@ -416,6 +416,10 @@ darwin_driver_init (unsigned int *decoded_options_count,
}
#endif
/* If there is nothing else on the command line, do not add sysroot etc. */
if (*decoded_options_count <= 1)
return;
if (appendM32 || appendM64)
{
++*decoded_options_count;
@ -426,7 +430,7 @@ darwin_driver_init (unsigned int *decoded_options_count,
&(*decoded_options)[*decoded_options_count - 1]);
}
if (! seen_sysroot_p)
if (!seen_sysroot_p)
{
/* We will pick up an SDKROOT if we didn't specify a sysroot and treat
it as overriding any configure-time --with-sysroot. */
@ -445,7 +449,7 @@ darwin_driver_init (unsigned int *decoded_options_count,
/* We will need to know the OS X version we're trying to build for here
so that we can figure out the mechanism and source for the sysroot to
be used. */
if (! seen_version_min && *decoded_options_count > 1)
if (!seen_version_min)
/* Not set by the User, try to figure it out. */
vers_string = darwin_default_min_version ();

5
gcc/config/darwin.h
View File

@ -268,11 +268,6 @@ extern GTY(()) int darwin_ms_struct;
"%{unexported_symbols_list*:\
-Xlinker -unexported_symbols_list -Xlinker %*} \
%<unexported_symbols_list*", \
"%{!weak_reference_mismatches*:\
%:version-compare(< 10.5 asm_macosx_version_min= -Xlinker) \
%:version-compare(< 10.5 asm_macosx_version_min= -weak_reference_mismatches) \
%:version-compare(< 10.5 asm_macosx_version_min= -Xlinker) \
%:version-compare(< 10.5 asm_macosx_version_min= non-weak)}", \
"%{weak_reference_mismatches*:\
-Xlinker -weak_reference_mismatches -Xlinker %*} \
%<weak_reference_mismatches*", \