From 4c38908169a11635138d357fa4be39a80d6285e8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 11 Jul 2017 22:50:41 +0100 Subject: valgrind: fix link failure with gold Signed-off-by: Ross Burton --- .../valgrind/valgrind/link-gz-tests.patch | 27 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch diff --git a/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch b/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch new file mode 100644 index 0000000000..db322398c2 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch @@ -0,0 +1,27 @@ +When checking if the compiler supports compressed debug sections we need to +actually link instead of just compile. Otherwise the compiler thinks that +they are supported, but gold does not support -gz=zlib. + +Upstream-Status: Backport (r16459) +Signed-off-by: Ross Burton + +--- a/configure.ac~ 2017-07-11 11:53:16.000000000 +0100 ++++ b/configure.ac 2017-07-11 18:16:13.674130483 +0100 +@@ -2119,7 +2119,7 @@ + safe_CFLAGS=$CFLAGS + CFLAGS="-g -gz=zlib" + +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[ + return 0; + ]])], [ + ac_have_gz_zlib=yes +@@ -2139,7 +2139,7 @@ + safe_CFLAGS=$CFLAGS + CFLAGS="-g -gz=zlib-gnu" + +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[ ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[ + return 0; + ]])], [ + ac_have_gz_zlib_gnu=yes diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index b63d27861d..0cc5eefc88 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -35,6 +35,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ + file://link-gz-tests.patch \ " SRC_URI_append_libc-musl = "\ file://0001-fix-build-for-musl-targets.patch \ -- cgit 1.2.3-korg