| Message ID | 1386105892-2379-4-git-send-email-apinski@cavium.com |
|---|---|
| State | New |
| Headers | show |
Looks good to me, but I cannot approve it. Yufeng On 12/03/13 21:24, Andrew Pinski wrote: > > Hi, > The arguments to --with-multilib-list for AARCH64 are exclusive but currently is being treated as ones which are not. This causes problems in that we get four library sets with --with-multilib-list=lp64,ilp32: empty, lp64, ilp32, lp64/ilp32. The first and last one does not make sense and should not be there. > > This patch changes the definition of MULTILIB_OPTIONS so we have a / inbetween the options rather than a space. > > OK? Build and tested on aarch64-elf with both --with-multilib-list=lp64,ilp32 and without it. > > Thanks, > Andrew Pinski > > * config/aarch64/t-aarch64 (MULTILIB_OPTIONS): Fix definition so > that options are conflicting ones. > --- > gcc/ChangeLog | 2 +- > gcc/config/aarch64/t-aarch64 | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > iff --git a/gcc/config/aarch64/t-aarch64 b/gcc/config/aarch64/t-aarch64 > index 9f8d8cd..98a30d8 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))
On 3 December 2013 21:24, Andrew Pinski <pinskia@gmail.com> wrote: > * config/aarch64/t-aarch64 (MULTILIB_OPTIONS): Fix definition so > that options are conflicting ones. Looks fine to me, commit it. /Marcus
--- 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))