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

gospec.c (lang_specific_driver): If linking, and no -o option was used, add one. 

* gospec.c (lang_specific_driver): If linking, and no -o option
	was used, add one.

From-SVN: r184351
This commit is contained in:
Ian Lance Taylor 2012-02-17 21:27:48 +00:00 committed by Ian Lance Taylor
parent 904bfee883
commit f7b675752a
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/go/ChangeLog
View File

@ -1,3 +1,8 @@
2012-02-17 Ian Lance Taylor <iant@google.com>
* gospec.c (lang_specific_driver): If linking, and no -o option
was used, add one.
2012-02-14 Ian Lance Taylor <iant@google.com>
PR go/48411

24
gcc/go/gospec.c
View File

@ -109,6 +109,11 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
/* Whether the -o option was used. */
bool saw_opt_o = false;
/* Whether the -c option was used. Also used for -E, -fsyntax-only,
in general anything which implies only compilation and not
linking. */
bool saw_opt_c = false;
/* Whether the -S option was used. */
bool saw_opt_S = false;
@ -172,6 +177,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
case OPT_fsyntax_only:
/* Don't specify libraries if we won't link, since that would
cause a warning. */
saw_opt_c = true;
library = -1;
break;
@ -272,10 +278,14 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
j++;
}
/* If we are not linking, add a -o option. This is because we need
/* If we didn't see a -o option, add one. This is because we need
the driver to pass all .go files to go1. Without a -o option the
driver will invoke go1 separately for each input file. */
if (library < 0 && first_go_file != NULL && !saw_opt_o)
driver will invoke go1 separately for each input file. FIXME:
This should probably use some other interface to force the driver
to set combine_inputs. */
if (first_go_file != NULL && !saw_opt_o)
{
if (saw_opt_c || saw_opt_S)
{
const char *base;
int baselen;
@ -287,8 +297,8 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
alen = baselen + 3;
out = XNEWVEC (char, alen);
memcpy (out, base, baselen);
/* The driver will convert .o to some other suffix (e.g., .obj)
if appropriate. */
/* The driver will convert .o to some other suffix (e.g.,
.obj) if appropriate. */
out[baselen] = '.';
if (saw_opt_S)
out[baselen + 1] = 's';
@ -297,6 +307,10 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
out[baselen + 2] = '\0';
generate_option (OPT_o, out, 1, CL_DRIVER,
&new_decoded_options[j]);
}
else
generate_option (OPT_o, "a.out", 1, CL_DRIVER,
&new_decoded_options[j]);
j++;
}