diff options
| author | Khem Raj <raj.khem@gmail.com> | 2019-01-24 19:36:37 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-28 23:14:09 +0000 |
| commit | 64e39849c57998b7aa848b5a94180eac3df0af86 (patch) | |
| tree | b361027c91a2d221b352affa7eea316be2080ada | |
| parent | 156a2d98600299822695d173381a9eac49e30908 (diff) | |
| download | poky-64e39849c57998b7aa848b5a94180eac3df0af86.tar.gz | |
valgrind: Dont strip off -mcpu
Defsault armtunes do not include -march any longer we habe -mcpu
only, therefore to select right ISA we need to keep mcpu
(From OE-Core rev: a8ab78824575bdfcdb9efe89378951d734c1cfa9)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.14.0.bb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb index 4d15a50411..54d09f071f 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb | |||
| @@ -65,7 +65,6 @@ EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEIN | |||
| 65 | 65 | ||
| 66 | # valgrind checks host_cpu "armv7*)", so we need to over-ride the autotools.bbclass default --host option | 66 | # valgrind checks host_cpu "armv7*)", so we need to over-ride the autotools.bbclass default --host option |
| 67 | EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" | 67 | EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" |
| 68 | TARGET_CC_ARCH_remove_arm = "${@get_mcpu(d)}" | ||
| 69 | 68 | ||
| 70 | EXTRA_OEMAKE = "-w" | 69 | EXTRA_OEMAKE = "-w" |
| 71 | 70 | ||
| @@ -77,14 +76,6 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" | |||
| 77 | # which fixes build path issue in DWARF. | 76 | # which fixes build path issue in DWARF. |
| 78 | SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" | 77 | SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" |
| 79 | 78 | ||
| 80 | def get_mcpu(d): | ||
| 81 | for arg in (d.getVar('TUNE_CCARGS') or '').split(): | ||
| 82 | if arg.startswith('-mcpu='): | ||
| 83 | return arg | ||
| 84 | else: | ||
| 85 | continue | ||
| 86 | return "" | ||
| 87 | |||
| 88 | do_configure_prepend () { | 79 | do_configure_prepend () { |
| 89 | rm -rf ${S}/config.h | 80 | rm -rf ${S}/config.h |
| 90 | sed -i -e 's:$(abs_top_builddir):$(pkglibdir)/ptest:g' ${S}/none/tests/Makefile.am | 81 | sed -i -e 's:$(abs_top_builddir):$(pkglibdir)/ptest:g' ${S}/none/tests/Makefile.am |
| @@ -96,8 +87,6 @@ do_install_append () { | |||
| 96 | oe_multilib_header valgrind/config.h | 87 | oe_multilib_header valgrind/config.h |
| 97 | } | 88 | } |
| 98 | 89 | ||
| 99 | TUNE = "${@strip_mcpu(d)}" | ||
| 100 | |||
| 101 | VALGRINDARCH ?= "${TARGET_ARCH}" | 90 | VALGRINDARCH ?= "${TARGET_ARCH}" |
| 102 | VALGRINDARCH_aarch64 = "arm64" | 91 | VALGRINDARCH_aarch64 = "arm64" |
| 103 | VALGRINDARCH_x86-64 = "amd64" | 92 | VALGRINDARCH_x86-64 = "amd64" |
