From: Michael Tretter <michael.tretter@posteo.net>
To: ptxdist@pengutronix.de
Cc: Michael Tretter <michael.tretter@posteo.net>
Subject: [ptxdist] [PATCH] gcc: aarch64: fix multi-os-directory
Date: Thu, 20 Jun 2019 23:33:55 +0200 [thread overview]
Message-ID: <20190620213355.2300-1-michael.tretter@posteo.net> (raw)
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
reply other threads:[~2019-06-20 21:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190620213355.2300-1-michael.tretter@posteo.net \
--to=michael.tretter@posteo.net \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox