From: Andrew Pinski <apinski@cavium.com>
Date: Tue, 10 Dec 2013 00:19:03 +0000 (+0000)
Subject: t-aarch64 (MULTILIB_OPTIONS): Fix definition so that options are conflicting ones.
X-Git-Tag: releases/gcc-4.9.0~2173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e0fc59aa0e1bca6f3c7ced40489cab2cf6df6e6;p=thirdparty%2Fgcc.git

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 7fe4851270a4..4389a3f3cdcb 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 9f8d8cd6e0d6..98a30d86acd2 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))