[ptxdist] [PATCH] gcc: aarch64: fix multi-os-directory

[ptxdist] [PATCH] gcc: aarch64: fix multi-os-directory

[Michael Tretter]

The multi-os-directory, which can be printed with

	aarch64-v8a-linux-gnu-gcc -print-multi-os-directory

is ../lib for aarch64, but must be . to ensure a correct search path for
libraries that use multi-os-directory.

Without this fix, for example, libffi might add /usr/lib/../lib to the
libs search directory, which is not filtered by ptxdist and will cause
compile errors on programs that link against libffi.

Signed-off-by: Michael Tretter <michael.tretter@posteo.net>
---
 .../0202-aarch64-change-paths-for-pure64.patch              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/patches/gcc-8-20181130/0202-aarch64-change-paths-for-pure64.patch b/patches/gcc-8-20181130/0202-aarch64-change-paths-for-pure64.patch
index 5681c21..0cfb04f 100644
--- a/patches/gcc-8-20181130/0202-aarch64-change-paths-for-pure64.patch
+++ b/patches/gcc-8-20181130/0202-aarch64-change-paths-for-pure64.patch
@@ -3,12 +3,14 @@ Date: Sun, 7 Dec 2014 21:07:28 +0100
 Subject: [PATCH] aarch64: change paths for pure64
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+[michael.tretter@posteo.net: replace ../lib with .]
+Signed-off-by: Michael Tretter <michael.tretter@posteo.net>
 ---
  gcc/config/aarch64/t-aarch64-linux | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux
-index b9897785a892..bfea371dfa7e 100644
+index b9897785a892..7cc175c879e3 100644
 --- a/gcc/config/aarch64/t-aarch64-linux
 +++ b/gcc/config/aarch64/t-aarch64-linux
 @@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
@@ -16,7 +18,7 @@ index b9897785a892..bfea371dfa7e 100644
  
  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)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++MULTILIB_OSDIRNAMES = mabi.lp64=.$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
  MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
  
  MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-- 
2.22.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de