summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Pinski <apinski@cavium.com>2013-12-10 00:19:03 +0000
committerAndrew Pinski <pinskia@gcc.gnu.org>2013-12-09 16:19:03 -0800
commit3e0fc59aa0e1bca6f3c7ced40489cab2cf6df6e6 (patch)
tree57fc38a589c5611ff282aa4ab73971756cd3dff3
parent7e7707293a67cc546da669eec5fd44eebaa28f22 (diff)
downloadgcc-3e0fc59aa0e1bca6f3c7ced40489cab2cf6df6e6.tar.gz
t-aarch64 (MULTILIB_OPTIONS): Fix definition so that options are conflicting ones.
2013-12-09 Andrew Pinski <apinski@cavium.com> * config/aarch64/t-aarch64 (MULTILIB_OPTIONS): Fix definition so that options are conflicting ones. From-SVN: r205843
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/aarch64/t-aarch642
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7fe4851270a..4389a3f3cdc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-09 Andrew Pinski <apinski@cavium.com>
+
+ * config/aarch64/t-aarch64 (MULTILIB_OPTIONS): Fix definition so
+ that options are conflicting ones.
+
2013-12-09 Eric Botcazou <ebotcazou@adacore.com>
* optabs.c (gen_int_libfunc): Do not compare modes directly.
diff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64
index 9f8d8cd6e0d..98a30d86acd 100644
--- a/gcc/config/aarch64/t-aarch64
+++ b/gcc/config/aarch64/t-aarch64
@@ -41,5 +41,5 @@ aarch-common.o: $(srcdir)/config/arm/aarch-common.c $(CONFIG_H) $(SYSTEM_H) \
$(srcdir)/config/arm/aarch-common.c
comma=,
-MULTILIB_OPTIONS = $(patsubst %, mabi=%, $(subst $(comma), ,$(TM_MULTILIB_CONFIG)))
+MULTILIB_OPTIONS = $(subst $(comma),/, $(patsubst %, mabi=%, $(subst $(comma),$(comma)mabi=,$(TM_MULTILIB_CONFIG))))
MULTILIB_DIRNAMES = $(subst $(comma), ,$(TM_MULTILIB_CONFIG))