From df2dfaea4e76a6159e733073aff5aa5e6837289a Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 14 Mar 2013 09:52:13 +0100
Subject: [PATCH] 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
---
gcc/ChangeLog | 8 ++++++++
gcc/config/aarch64/t-aarch64-linux | 2 +-
gcc/genmultilib | 9 +++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cd69f0cf6a74..78b3616196c0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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>
* config/sh/linux.h (TARGET_DEFAULT): Remove MASK_USERMODE.
diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
index 48b4c69f6b49..a7a0a8836057 100644
--- a/gcc/config/aarch64/t-aarch64-linux
+++ b/gcc/config/aarch64/t-aarch64-linux
@@ -22,4 +22,4 @@ LIB1ASMSRC = aarch64/lib1funcs.asm
LIB1ASMFUNCS = _aarch64_sync_cache_range
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)
diff --git a/gcc/genmultilib b/gcc/genmultilib
index 4dca65d68ff3..3e6046b9627b 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.
--
GitLab