diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-07-30 14:40:28 +0930 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-31 22:55:35 +0100 |
| commit | b1585dde96750c057413564244ac4ed95e8b3d4f (patch) | |
| tree | 149aebcb86b7c1662c3f07ae82501e2362711967 | |
| parent | d9a9a2d80e648a9f0556f6e3eb3eea7ee65539ab (diff) | |
| download | poky-b1585dde96750c057413564244ac4ed95e8b3d4f.tar.gz | |
gcc-7.3: Fix build on ppc64le hosts
When building on ppc64le hosts that have GCC 8 (such as Ubuntu 18.10)
the GCC build bootstrap fails.
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86162
This is a fix that was applied to the upstream GCC 7 branch.
Change-Id: I7796d2a999ec420805dd1c6cf0a1ecba1de5a897
(From OE-Core rev: c17f5e7e954487ad3e97e26c3e0d31443d658d5a)
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-7.3.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-ppc64le-build-Partial-backport-r256656.patch | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-7.3.inc b/meta/recipes-devtools/gcc/gcc-7.3.inc index b816f7d12f..81320dc52a 100644 --- a/meta/recipes-devtools/gcc/gcc-7.3.inc +++ b/meta/recipes-devtools/gcc/gcc-7.3.inc | |||
| @@ -79,6 +79,7 @@ SRC_URI = "\ | |||
| 79 | BACKPORTS = "\ | 79 | BACKPORTS = "\ |
| 80 | file://0001-Fix-internal-compiler-error-in-testcase.patch \ | 80 | file://0001-Fix-internal-compiler-error-in-testcase.patch \ |
| 81 | file://0001-PR-rtl-optimization-83030.patch \ | 81 | file://0001-PR-rtl-optimization-83030.patch \ |
| 82 | file://0001-Fix-ppc64le-build-Partial-backport-r256656.patch \ | ||
| 82 | " | 83 | " |
| 83 | 84 | ||
| 84 | SRC_URI[md5sum] = "be2da21680f27624f3a87055c4ba5af2" | 85 | SRC_URI[md5sum] = "be2da21680f27624f3a87055c4ba5af2" |
diff --git a/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-ppc64le-build-Partial-backport-r256656.patch b/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-ppc64le-build-Partial-backport-r256656.patch new file mode 100644 index 0000000000..cfb70e1ecd --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-ppc64le-build-Partial-backport-r256656.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From aa65a43516da1d48011ef621ed5988289711d99b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4> | ||
| 3 | Date: Fri, 29 Jun 2018 09:31:30 +0000 | ||
| 4 | Subject: [PATCH] Partial backport r256656 | ||
| 5 | |||
| 6 | 2018-06-29 Martin Liska <mliska@suse.cz> | ||
| 7 | |||
| 8 | Backport from mainline | ||
| 9 | 2018-01-10 Kelvin Nilsen <kelvin@gcc.gnu.org> | ||
| 10 | |||
| 11 | * lex.c (search_line_fast): Remove illegal coercion of an | ||
| 12 | unaligned pointer value to vector pointer type and replace with | ||
| 13 | use of __builtin_vec_vsx_ld () built-in function, which operates | ||
| 14 | on unaligned pointer values. | ||
| 15 | |||
| 16 | Upstream-Status: Backport | ||
| 17 | Signed-off-by: Joel Stanley <joel@jms.id.au> | ||
| 18 | --- | ||
| 19 | libcpp/lex.c | 2 +- | ||
| 20 | 1 files changed, 1 insertions(+), 1 deletion(-) | ||
| 21 | |||
| 22 | diff --git a/libcpp/lex.c b/libcpp/lex.c | ||
| 23 | index 097c78002cbb..e0fb9e822c44 100644 | ||
| 24 | --- a/libcpp/lex.c | ||
| 25 | +++ b/libcpp/lex.c | ||
| 26 | @@ -568,7 +568,7 @@ search_line_fast (const uchar *s, const uchar *end ATTRIBUTE_UNUSED) | ||
| 27 | { | ||
| 28 | vc m_nl, m_cr, m_bs, m_qm; | ||
| 29 | |||
| 30 | - data = *((const vc *)s); | ||
| 31 | + data = __builtin_vec_vsx_ld (0, s); | ||
| 32 | s += 16; | ||
| 33 | |||
| 34 | m_nl = (vc) __builtin_vec_cmpeq(data, repl_nl); | ||
| 35 | -- | ||
| 36 | 2.17.1 | ||
| 37 | |||
