git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

t-aarch64-linux (MULTARCH_DIRNAME): Remove. 

* 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.

From-SVN: r196649
This commit is contained in:
Jakub Jelinek 2013-03-14 09:52:13 +01:00 committed by Jakub Jelinek
parent 10ace8a0cf
commit df2dfaea4e
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2013-03-14 Jakub Jelinek <jakub@redhat.com>
* 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.
2013-03-14 Kaz Kojima <kkojima@gcc.gnu.org> 2013-03-14 Kaz Kojima <kkojima@gcc.gnu.org>
* config/sh/linux.h (TARGET_DEFAULT): Remove MASK_USERMODE. * config/sh/linux.h (TARGET_DEFAULT): Remove MASK_USERMODE.

2
gcc/config/aarch64/t-aarch64-linux
View File

@ -22,4 +22,4 @@ LIB1ASMSRC = aarch64/lib1funcs.asm
LIB1ASMFUNCS = _aarch64_sync_cache_range LIB1ASMFUNCS = _aarch64_sync_cache_range
AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be) AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu) MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)

9
gcc/genmultilib
View File

@ -267,6 +267,7 @@ fi
# names. # names.
toosdirnames= toosdirnames=
defaultosdirname= defaultosdirname=
defaultosdirname2=
if [ -n "${multiarch}" ]; then if [ -n "${multiarch}" ]; then
defaultosdirname=::${multiarch} defaultosdirname=::${multiarch}
fi fi
@ -280,6 +281,13 @@ if [ -n "${osdirnames}" ]; then
if [ -n "${multiarch}" ]; then if [ -n "${multiarch}" ]; then
defaultosdirname=${defaultosdirname}:${multiarch} defaultosdirname=${defaultosdirname}:${multiarch}
fi fi
case "$defaultosdirname" in
::*) ;;
*)
defaultosdirname2=${defaultosdirname}
defaultosdirname=
;;
esac
shift shift
;; ;;
*=*) *=*)
@ -352,6 +360,7 @@ for set in ${options}; do
done done
optout=`echo ${optout} | sed -e 's/^ //'` optout=`echo ${optout} | sed -e 's/^ //'`
echo "\".${defaultosdirname} ${optout};\"," echo "\".${defaultosdirname} ${optout};\","
[ -n "${defaultosdirname2}" ] && echo "\".${defaultosdirname2} ${optout};\","
# This part of code convert an option combination to # This part of code convert an option combination to
# its corresponding directory names. # its corresponding directory names.