From: Andrew Pinski <apinski@cavium.com>
Date: Thu, 21 Dec 2017 19:18:32 +0000 (+0000)
Subject: t-aarch64-linux (MULTILIB_OSDIRNAMES): Handle multi-arch for ilp32.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da98f7424ee636d5254b5b90adbdb9f880818692;p=gcc.git

t-aarch64-linux (MULTILIB_OSDIRNAMES): Handle multi-arch for ilp32.

2017-12-21  Andrew Pinski  <apinski@cavium.com>
	    Steve Ellcey  <sellcey@cavium.com>

	* config/aarch64/t-aarch64-linux (MULTILIB_OSDIRNAMES): Handle
	multi-arch for ilp32.

Co-Authored-By: Steve Ellcey <sellcey@cavium.com>

From-SVN: r255951
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7f9d16c08d3..9bc3ba31d90 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-21  Andrew Pinski  <apinski@cavium.com>
+	    Steve Ellcey  <sellcey@cavium.com>
+
+	* config/aarch64/t-aarch64-linux (MULTILIB_OSDIRNAMES): Handle
+	multi-arch for ilp32.
+
 2017-12-21  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/83467
diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
index ab064ab6f22..348fcda7fd8 100644
--- a/gcc/config/aarch64/t-aarch64-linux
+++ b/gcc/config/aarch64/t-aarch64-linux
@@ -25,4 +25,4 @@ AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
 MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
 MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
 
-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
+MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)_ilp32-linux-gnu)