From 36d2188379e7656ffc1d3a3dcfe0775eec4b48fc Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 7 May 2012 19:59:56 +0000
Subject: [PATCH] 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
---
gcc/ChangeLog | 8 ++++++++
gcc/collect2.c | 2 +-
gcc/config.in | 2 +-
gcc/configure | 6 +++---
gcc/configure.ac | 6 +++---
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09783656bf92..f4437e661d89 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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
diff --git a/gcc/collect2.c b/gcc/collect2.c
index d0166a5b5af3..deed052af2fc 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 53214522a5c2..9eefc9787b08 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 223f21805e0f..557a4cc794d2 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 86b4bea102d1..2c17736edf2e 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)
--
GitLab