configure.ac (PLUGIN_LD): Rename into...

* configure.ac (PLUGIN_LD): Rename into...
	(PLUGIN_LD_SUFFIX): ...this and strip the target_alias triplet.
	* config.in: Regenerate.
	* configure: Likewise.
	* collect2.c (main): Set plugin_ld_suffix to PLUGIN_LD_SUFFIX.

From-SVN: r187269
This commit is contained in:
Eric Botcazou 2012-05-07 19:59:56 +00:00 committed by Eric Botcazou
parent b48e22b2bd
commit 36d2188379
5 changed files with 16 additions and 8 deletions

View File

@ -1,3 +1,11 @@
2012-05-07 Eric Botcazou <ebotcazou@adacore.com>
* configure.ac (PLUGIN_LD): Rename into...
(PLUGIN_LD_SUFFIX): ...this and strip the target_alias triplet.
* config.in: Regenerate.
* configure: Likewise.
* collect2.c (main): Set plugin_ld_suffix to PLUGIN_LD_SUFFIX.
2012-05-07 Eric Botcazou <ebotcazou@adacore.com>
* tree-dfa.c (get_ref_base_and_extent) <ARRAY_REF>: Do the offset

View File

@ -1024,7 +1024,7 @@ int
main (int argc, char **argv)
{
static const char *const ld_suffix = "ld";
static const char *const plugin_ld_suffix = PLUGIN_LD;
static const char *const plugin_ld_suffix = PLUGIN_LD_SUFFIX;
static const char *const real_ld_suffix = "real-ld";
static const char *const collect_ld_suffix = "collect-ld";
static const char *const nm_suffix = "nm";

View File

@ -1693,7 +1693,7 @@
/* Specify plugin linker */
#ifndef USED_FOR_TARGET
#undef PLUGIN_LD
#undef PLUGIN_LD_SUFFIX
#endif

6
gcc/configure vendored
View File

@ -21511,20 +21511,20 @@ fi
fi
ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld
PLUGIN_LD=`basename $gcc_cv_ld`
PLUGIN_LD_SUFFIX=`basename $gcc_cv_ld | sed -e "s,$target_alias-,,"`
# Check whether --with-plugin-ld was given.
if test "${with_plugin_ld+set}" = set; then :
withval=$with_plugin_ld; if test x"$withval" != x; then
ORIGINAL_PLUGIN_LD_FOR_TARGET="$withval"
PLUGIN_LD="$withval"
PLUGIN_LD_SUFFIX=`echo $withval | sed -e "s,$target_alias-,,"`
fi
fi
cat >>confdefs.h <<_ACEOF
#define PLUGIN_LD "$PLUGIN_LD"
#define PLUGIN_LD_SUFFIX "$PLUGIN_LD_SUFFIX"
_ACEOF

View File

@ -2001,15 +2001,15 @@ else
fi])
ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld
PLUGIN_LD=`basename $gcc_cv_ld`
PLUGIN_LD_SUFFIX=`basename $gcc_cv_ld | sed -e "s,$target_alias-,,"`
AC_ARG_WITH(plugin-ld,
[AS_HELP_STRING([[--with-plugin-ld=[ARG]]], [specify the plugin linker])],
[if test x"$withval" != x; then
ORIGINAL_PLUGIN_LD_FOR_TARGET="$withval"
PLUGIN_LD="$withval"
PLUGIN_LD_SUFFIX=`echo $withval | sed -e "s,$target_alias-,,"`
fi])
AC_SUBST(ORIGINAL_PLUGIN_LD_FOR_TARGET)
AC_DEFINE_UNQUOTED(PLUGIN_LD, "$PLUGIN_LD", [Specify plugin linker])
AC_DEFINE_UNQUOTED(PLUGIN_LD_SUFFIX, "$PLUGIN_LD_SUFFIX", [Specify plugin linker])
# Check to see if we are using gold instead of ld
AC_MSG_CHECKING(whether we are using gold)