diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/valgrind | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/valgrind')
5 files changed, 89 insertions, 13 deletions
diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch new file mode 100644 index 000000000..bedf1c127 --- /dev/null +++ b/poky/meta/recipes-devtools/valgrind/valgrind/0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch @@ -0,0 +1,45 @@ +From 7820fc268fae4353118b6355f1d4b9e1b7eeebec Mon Sep 17 00:00:00 2001 +From: Philippe Waroquiers <philippe.waroquiers@skynet.be> +Date: Sun, 28 Oct 2018 18:35:11 +0100 +Subject: [PATCH] Fix dependencies between libcoregrind*.a and + *m_main.o/*m_libcsetjmp.o + +The primary and secondary coregrind libraries must be updated +when m_main.c or m_libcsetjmp.c are changed. + +A dependency was missing between libcoregrind*.a and libnolto_coregrind*.a, +and so tools were not relinked when m_main.c or m_libcsetjmp.c were +changed. + +Upstream-Status: Backport[git://sourceware.org/git/valgrind.git 7820fc268fae4353118b6355f1d4b9e1b7eeebec] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + coregrind/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am +index 914a270..8de1996 100644 +--- a/coregrind/Makefile.am ++++ b/coregrind/Makefile.am +@@ -511,6 +511,8 @@ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS += \ + endif + libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_LIBADD = \ + $(libnolto_coregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_OBJECTS) ++libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_DEPENDENCIES = \ ++ libnolto_coregrind-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a + + if VGCONF_HAVE_PLATFORM_SEC + libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \ +@@ -531,6 +533,8 @@ libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS += \ + endif + libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_LIBADD = \ + $(libnolto_coregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_OBJECTS) ++libcoregrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_DEPENDENCIES = \ ++ libnolto_coregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a + endif + + #---------------------------------------------------------------------------- +-- +2.10.2 + diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch index 3efe65a94..81ab29f3b 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch +++ b/poky/meta/recipes-devtools/valgrind/valgrind/0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch @@ -3,7 +3,7 @@ From: Randy MacLeod <Randy.MacLeod@windriver.com> Date: Fri, 19 Oct 2018 10:31:12 -0400 Subject: [PATCH] Guard against __GLIBC_PREREQ for musl libc -Upstream-Status: Pending +Upstream-Status: Submitted https://bugs.kde.org/show_bug.cgi?id=400162 Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> --- diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch index 45e5ea3e7..8d2ca5733 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch +++ b/poky/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch @@ -18,7 +18,7 @@ and more importantly also avoid an assembler error: /tmp/cce22iiw.s:915: Error: symbol `exit_0' is already defined /tmp/cce22iiw.s:917: Error: symbol `exit' is already defined -Upstream-Status: Pending +Upstream-Status: Submitted https://bugs.kde.org/show_bug.cgi?id=400164 Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> --- diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch new file mode 100644 index 000000000..657f80335 --- /dev/null +++ b/poky/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 <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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/poky/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb b/poky/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb index 50f8221eb..db1bd9fc5 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb +++ b/poky/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb @@ -36,6 +36,8 @@ 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 \ + file://0001-Fix-dependencies-between-libcoregrind-.a-and-m_main..patch \ " SRC_URI[md5sum] = "74175426afa280184b62591b58c671b3" SRC_URI[sha256sum] = "037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5" @@ -56,6 +58,9 @@ COMPATIBLE_HOST_linux-muslx32 = 'null' COMPATIBLE_HOST_mipsarchr6 = 'null' COMPATIBLE_HOST_linux-gnun32 = 'null' +# Disable for powerpc64 with musl +COMPATIBLE_HOST_libc-musl_powerpc64 = 'null' + inherit autotools ptest multilib_header EXTRA_OECONF = "--enable-tls --without-mpicc" @@ -63,7 +68,6 @@ EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEIN # valgrind checks host_cpu "armv7*)", so we need to over-ride the autotools.bbclass default --host option EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" -TARGET_CC_ARCH_remove_arm = "${@get_mcpu(d)}" EXTRA_OEMAKE = "-w" @@ -75,14 +79,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" # which fixes build path issue in DWARF. SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" -def get_mcpu(d): - for arg in (d.getVar('TUNE_CCARGS') or '').split(): - if arg.startswith('-mcpu='): - return arg - else: - continue - return "" - do_configure_prepend () { rm -rf ${S}/config.h sed -i -e 's:$(abs_top_builddir):$(pkglibdir)/ptest:g' ${S}/none/tests/Makefile.am @@ -94,8 +90,6 @@ do_install_append () { oe_multilib_header valgrind/config.h } -TUNE = "${@strip_mcpu(d)}" - VALGRINDARCH ?= "${TARGET_ARCH}" VALGRINDARCH_aarch64 = "arm64" VALGRINDARCH_x86-64 = "amd64" |