From fc162120aa488ce27609d407021e098f9b6d9a02 Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 14 Mar 2013 08:52:13 +0000 Subject: * config/aarch64/t-aarch64-linux (MULTARCH_DIRNAME): Remove. (MULTILIB_OSDIRNAMES): Set. * genmultilib: If defaultosdirname doesn't start with :: , set defaultosdirname2 instead, clear it and emit two . multilib_raw entries instead of just one. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196649 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/genmultilib | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gcc/genmultilib') diff --git a/gcc/genmultilib b/gcc/genmultilib index 4dca65d68ff..3e6046b9627 100644 --- a/gcc/genmultilib +++ b/gcc/genmultilib @@ -267,6 +267,7 @@ fi # names. toosdirnames= defaultosdirname= +defaultosdirname2= if [ -n "${multiarch}" ]; then defaultosdirname=::${multiarch} fi @@ -280,6 +281,13 @@ if [ -n "${osdirnames}" ]; then if [ -n "${multiarch}" ]; then defaultosdirname=${defaultosdirname}:${multiarch} fi + case "$defaultosdirname" in + ::*) ;; + *) + defaultosdirname2=${defaultosdirname} + defaultosdirname= + ;; + esac shift ;; *=*) @@ -352,6 +360,7 @@ for set in ${options}; do done optout=`echo ${optout} | sed -e 's/^ //'` echo "\".${defaultosdirname} ${optout};\"," +[ -n "${defaultosdirname2}" ] && echo "\".${defaultosdirname2} ${optout};\"," # This part of code convert an option combination to # its corresponding directory names. -- cgit v1.2.1