From 3e0fc59aa0e1bca6f3c7ced40489cab2cf6df6e6 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Tue, 10 Dec 2013 00:19:03 +0000 Subject: [PATCH] t-aarch64 (MULTILIB_OPTIONS): Fix definition so that options are conflicting ones. 2013-12-09 Andrew Pinski * config/aarch64/t-aarch64 (MULTILIB_OPTIONS): Fix definition so that options are conflicting ones. From-SVN: r205843 --- gcc/ChangeLog | 5 +++++ gcc/config/aarch64/t-aarch64 | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * config/aarch64/t-aarch64 (MULTILIB_OPTIONS): Fix definition so + that options are conflicting ones. + 2013-12-09 Eric Botcazou * 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)) -- 2.47.2