summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/gcc/gcc-7.3.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-7.3/0050-powerpc-powerpc64-Add-support-for-musl-ldso.patch31
-rw-r--r--meta/recipes-devtools/gcc/gcc-8.2.inc1
-rw-r--r--meta/recipes-devtools/gcc/gcc-8.2/0042-powerpc-powerpc64-Add-support-for-musl-ldso.patch31
4 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc
index c7c88f12e4..e16d03f50d 100644
--- a/meta/recipes-devtools/gcc/gcc-7.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-7.3.inc
@@ -72,6 +72,7 @@ SRC_URI = "\
72 file://0047-sync-gcc-stddef.h-with-musl.patch \ 72 file://0047-sync-gcc-stddef.h-with-musl.patch \
73 file://0048-gcc-Enable-static-PIE.patch \ 73 file://0048-gcc-Enable-static-PIE.patch \
74 file://0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch \ 74 file://0049-gcc-override-TARGET_LIBC_PROVIDES_SSP.patch \
75 file://0050-powerpc-powerpc64-Add-support-for-musl-ldso.patch \
75 file://fix-segmentation-fault-precompiled-hdr.patch \ 76 file://fix-segmentation-fault-precompiled-hdr.patch \
76 file://no-sse-fix-test-case-failures.patch \ 77 file://no-sse-fix-test-case-failures.patch \
77 ${BACKPORTS} \ 78 ${BACKPORTS} \
diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0050-powerpc-powerpc64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-7.3/0050-powerpc-powerpc64-Add-support-for-musl-ldso.patch
new file mode 100644
index 0000000000..b0c735bb05
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-7.3/0050-powerpc-powerpc64-Add-support-for-musl-ldso.patch
@@ -0,0 +1,31 @@
1From 3f5f5da776be86b408a15f38c9782f2185f97073 Mon Sep 17 00:00:00 2001
2From: Serhey Popovych <serhe.popovych@gmail.com>
3Date: Tue, 11 Dec 2018 02:30:50 -0500
4Subject: [PATCH] powerpc/powerpc64: Add support for musl ldso
5
6Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
7---
8Upstream-Status: Inappropriate [OE-Specific]
9
10 gcc/config/rs6000/linux64.h | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
14index 619e113..ee8b44f 100644
15--- a/gcc/config/rs6000/linux64.h
16+++ b/gcc/config/rs6000/linux64.h
17@@ -421,9 +421,9 @@ extern int dot_symbols;
18 #endif
19
20 #define MUSL_DYNAMIC_LINKER32 \
21- "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
22+ SYSTEMLIBS_DIR "ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
23 #define MUSL_DYNAMIC_LINKER64 \
24- "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
25+ SYSTEMLIBS_DIR "ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
26
27 #define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
28 #define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0"
29--
302.7.4
31
diff --git a/meta/recipes-devtools/gcc/gcc-8.2.inc b/meta/recipes-devtools/gcc/gcc-8.2.inc
index 866a77558b..206e1571b2 100644
--- a/meta/recipes-devtools/gcc/gcc-8.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-8.2.inc
@@ -70,6 +70,7 @@ SRC_URI = "\
70 file://0039-Fix-for-testsuite-failure.patch \ 70 file://0039-Fix-for-testsuite-failure.patch \
71 file://0040-Re-introduce-spe-commandline-options.patch \ 71 file://0040-Re-introduce-spe-commandline-options.patch \
72 file://0041-ARC-fix-spec-gen.patch \ 72 file://0041-ARC-fix-spec-gen.patch \
73 file://0042-powerpc-powerpc64-Add-support-for-musl-ldso.patch \
73 ${BACKPORTS} \ 74 ${BACKPORTS} \
74" 75"
75BACKPORTS = "\ 76BACKPORTS = "\
diff --git a/meta/recipes-devtools/gcc/gcc-8.2/0042-powerpc-powerpc64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-8.2/0042-powerpc-powerpc64-Add-support-for-musl-ldso.patch
new file mode 100644
index 0000000000..b0c735bb05
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-8.2/0042-powerpc-powerpc64-Add-support-for-musl-ldso.patch
@@ -0,0 +1,31 @@
1From 3f5f5da776be86b408a15f38c9782f2185f97073 Mon Sep 17 00:00:00 2001
2From: Serhey Popovych <serhe.popovych@gmail.com>
3Date: Tue, 11 Dec 2018 02:30:50 -0500
4Subject: [PATCH] powerpc/powerpc64: Add support for musl ldso
5
6Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
7---
8Upstream-Status: Inappropriate [OE-Specific]
9
10 gcc/config/rs6000/linux64.h | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
14index 619e113..ee8b44f 100644
15--- a/gcc/config/rs6000/linux64.h
16+++ b/gcc/config/rs6000/linux64.h
17@@ -421,9 +421,9 @@ extern int dot_symbols;
18 #endif
19
20 #define MUSL_DYNAMIC_LINKER32 \
21- "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
22+ SYSTEMLIBS_DIR "ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
23 #define MUSL_DYNAMIC_LINKER64 \
24- "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
25+ SYSTEMLIBS_DIR "ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
26
27 #define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
28 #define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0"
29--
302.7.4
31