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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7fe4851..4389a3f 100644 (file)
--- 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 9f8d8cd..98a30d8 100644 (file)
--- 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))