From d6fd2a4a0fb437c4752091edefd080efe5399ea9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 26 Dec 2018 12:09:52 -0800 Subject: valgrind: Fix x86_64 build failure with gcc9 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...1-tests-amd64-Do-not-clobber-rsp-register.patch | 37 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.14.0.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch new file mode 100644 index 0000000000..657f80335d --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch @@ -0,0 +1,37 @@ +From 8c1ebb564f5eca2baeedc27a703200786d1abb0b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 22 Dec 2018 15:28:40 -0800 +Subject: [PATCH] tests/amd64: Do not clobber %rsp register + +This is seen with gcc-9.0 compiler now which is fix that gcc community +did recently +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813 + +Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=402480] + +Signed-off-by: Khem Raj +--- + none/tests/amd64-linux/bug345887.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/none/tests/amd64-linux/bug345887.c b/none/tests/amd64-linux/bug345887.c +index 0f9237d..4b07fe1 100644 +--- a/none/tests/amd64-linux/bug345887.c ++++ b/none/tests/amd64-linux/bug345887.c +@@ -20,13 +20,14 @@ static void inner(void) + "movq $0x10d, %%r14\n" + "movq $0x10e, %%r15\n" + // not %rbp as mdb is then not able to reconstruct stack trace +- "movq $0x10f, %%rsp\n" ++ // not %rsp since gcc ignores it and since gcc >= 9.0 errors about it ++ // see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813 + "movq $0x1234, (%%rax)\n" // should cause SEGV here + "ud2" // should never get here + : // no output registers + : // no input registers + : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi", +- "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "%rsp"); ++ "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"); + } + + __attribute__((noinline)) diff --git a/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb index 50f8221ebb..bbbc3bf695 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb @@ -36,6 +36,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://0001-fix-opcode-not-supported-on-mips32-linux.patch \ file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \ file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \ + file://0001-tests-amd64-Do-not-clobber-rsp-register.patch \ " SRC_URI[md5sum] = "74175426afa280184b62591b58c671b3" SRC_URI[sha256sum] = "037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5" -- cgit 1.2.3-korg