diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2012-05-07 19:59:56 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2012-05-07 19:59:56 +0000 |
| commit | 36d2188379e7656ffc1d3a3dcfe0775eec4b48fc (patch) | |
| tree | 46390bedbc644f144a8aba7a1be73126e13b9327 | |
| parent | b48e22b2bd028164829281f676a1e39ede8c3910 (diff) | |
| download | gcc-36d2188379e7656ffc1d3a3dcfe0775eec4b48fc.zip gcc-36d2188379e7656ffc1d3a3dcfe0775eec4b48fc.tar.gz gcc-36d2188379e7656ffc1d3a3dcfe0775eec4b48fc.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/collect2.c | 2 | ||||
| -rw-r--r-- | gcc/config.in | 2 | ||||
| -rwxr-xr-x | gcc/configure | 6 | ||||
| -rw-r--r-- | gcc/configure.ac | 6 |
5 files changed, 16 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0978365..f4437e6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 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 computation using the precision of the index type. * gimple-fold.c (fold_const_aggregate_ref_1) <ARRAY_REF>: Likewise. diff --git a/gcc/collect2.c b/gcc/collect2.c index d0166a5..deed052 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -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"; diff --git a/gcc/config.in b/gcc/config.in index 5321452..9eefc97 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -1693,7 +1693,7 @@ /* Specify plugin linker */ #ifndef USED_FOR_TARGET -#undef PLUGIN_LD +#undef PLUGIN_LD_SUFFIX #endif diff --git a/gcc/configure b/gcc/configure index 223f218..557a4cc7 100755 --- a/gcc/configure +++ b/gcc/configure @@ -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 diff --git a/gcc/configure.ac b/gcc/configure.ac index 86b4bea..2c17736 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -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) |