diff options
| author | Michael Tretter <michael.tretter@posteo.net> | 2019-06-20 23:33:55 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-02 16:06:19 +0200 |
| commit | 119a2cb59757116f302f762655b7ea4ede8055d4 (patch) | |
| tree | b4085ba213ede2994c2cc65f8d3545e62e110aa2 /patches | |
| parent | f146b037494cb4e16e80eacfc2b5fc855b0e6bf6 (diff) | |
| download | OSELAS.Toolchain-119a2cb59757116f302f762655b7ea4ede8055d4.tar.gz OSELAS.Toolchain-119a2cb59757116f302f762655b7ea4ede8055d4.tar.xz | |
gcc: aarch64: fix multi-os-directory
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>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/gcc-9-20190810/0202-aarch64-change-paths-for-pure64.patch | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/patches/gcc-9-20190810/0202-aarch64-change-paths-for-pure64.patch b/patches/gcc-9-20190810/0202-aarch64-change-paths-for-pure64.patch index ae8c59d..1bea2cf 100644 --- a/patches/gcc-9-20190810/0202-aarch64-change-paths-for-pure64.patch +++ b/patches/gcc-9-20190810/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 5ad670ba2cea..a936b42fbadd 100644 +index 5ad670ba2cea..dfeedf149992 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 5ad670ba2cea..a936b42fbadd 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) |