diff options
author | H.J. Lu <hongjiu.lu@intel.com> | 2013-12-19 18:11:42 +0000 |
---|---|---|
committer | H.J. Lu <hjl@gcc.gnu.org> | 2013-12-19 10:11:42 -0800 |
commit | b78e932d513b7d3373bc5e1aab456dda737d07d0 (patch) | |
tree | 9cd489829df0a7b71a7ba27da9b9f1ec45d2f759 /gcc/gcc.c | |
parent | 582e2e430089a54069f3e38eb8a2bacd36c42af5 (diff) | |
download | gcc-b78e932d513b7d3373bc5e1aab456dda737d07d0.zip gcc-b78e932d513b7d3373bc5e1aab456dda737d07d0.tar.gz gcc-b78e932d513b7d3373bc5e1aab456dda737d07d0.tar.bz2 |
Improve -fuse-ld=[bfd|gold] check
PR driver/59321
* collect2.c (main): Check -fuse-ld=[bfd|gold] when
DEFAULT_LINKER is defined.
* common.opt (fuse-ld=bfd): Add Driver.
(fuse-ld=gold): Likewise.
* gcc.c (use_ld): New variable.
(driver_handle_option): Set use_ld for OPT_fuse_ld_bfd and
OPT_fuse_ld_gold.
(main): Check -fuse-ld=[bfd|gold] for -print-prog-name=ld.
From-SVN: r206129
Diffstat (limited to 'gcc/gcc.c')
-rw-r--r-- | gcc/gcc.c | 43 |
1 files changed, 43 insertions, 0 deletions
@@ -105,6 +105,9 @@ static int verbose_only_flag; static int print_subprocess_help; +/* Linker suffix passed to -fuse-ld=... */ +static const char *use_ld; + /* Whether we should report subprocess execution times to a file. */ FILE *report_times_to_file = NULL; @@ -3380,6 +3383,14 @@ driver_handle_option (struct gcc_options *opts, do_save = false; break; + case OPT_fuse_ld_bfd: + use_ld = ".bfd"; + break; + + case OPT_fuse_ld_gold: + use_ld = ".gold"; + break; + case OPT_fcompare_debug_second: compare_debug_second = 1; break; @@ -6708,6 +6719,38 @@ main (int argc, char **argv) if (print_prog_name) { + if (use_ld != NULL && ! strcmp (print_prog_name, "ld")) + { + /* Append USE_LD to to the default linker. */ +#ifdef DEFAULT_LINKER + char *ld; +# ifdef HAVE_HOST_EXECUTABLE_SUFFIX + int len = (sizeof (DEFAULT_LINKER) + - sizeof (HOST_EXECUTABLE_SUFFIX)); + ld = NULL; + if (len > 0) + { + char *default_linker = xstrdup (DEFAULT_LINKER); + /* Strip HOST_EXECUTABLE_SUFFIX if DEFAULT_LINKER contains + HOST_EXECUTABLE_SUFFIX. */ + if (! strcmp (&default_linker[len], HOST_EXECUTABLE_SUFFIX)) + { + default_linker[len] = '\0'; + ld = concat (default_linker, use_ld, + HOST_EXECUTABLE_SUFFIX, NULL); + } + } + if (ld == NULL) +# endif + ld = concat (DEFAULT_LINKER, use_ld, NULL); + if (access (ld, X_OK) == 0) + { + printf ("%s\n", ld); + return (0); + } +#endif + print_prog_name = concat (print_prog_name, use_ld, NULL); + } char *newname = find_a_file (&exec_prefixes, print_prog_name, X_OK, 0); printf ("%s\n", (newname ? newname : print_prog_name)); return (0); |