From b297c1aa4b68653b896e534357af46985ec0d7fc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Jul 2018 21:56:11 -0700 Subject: recipes: Enforce ARM ISA just for arm arches <= armv5 armv7+ used thumb2 ISA and it compiles fine with thumb2 issues are only when using thumb1 ISA (From OE-Core rev: c0ef8a91f671f30acd92e2734144f7ddf1acda53) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb | 5 ++++- meta/classes/goarch.bbclass | 6 +++++- meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 4 +++- meta/recipes-gnome/gcr/gcr_3.28.0.bb | 4 +++- meta/recipes-gnome/libsecret/libsecret_0.18.6.bb | 4 +++- meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb | 4 +++- meta/recipes-support/aspell/aspell_0.60.6.1.bb | 5 ++++- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb b/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb index 073cf5665c..922518bc39 100644 --- a/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb +++ b/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb @@ -28,5 +28,8 @@ FILES_${PN} = "${bindir}/aspell" FILES_libpspell = "${libdir}/libpspell.so.*" FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" + inherit autotools gettext diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass index bb36cc8142..b2c94faddb 100644 --- a/meta/classes/goarch.bbclass +++ b/meta/classes/goarch.bbclass @@ -33,7 +33,11 @@ COMPATIBLE_HOST_linux-muslx32 = "null" COMPATIBLE_HOST_powerpc = "null" COMPATIBLE_HOST_powerpc64 = "null" COMPATIBLE_HOST_mipsarchn32 = "null" -ARM_INSTRUCTION_SET = "arm" + +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" + TUNE_CCARGS_remove = "-march=mips32r2" SECURITY_CFLAGS_mipsarch = "${SECURITY_NOPIE_CFLAGS}" SECURITY_NOPIE_CFLAGS ??= "" diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index a8baca51e3..4bee3713a7 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -36,6 +36,8 @@ do_install () { install -m 0755 unsquashfs ${D}${sbindir}/ } -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-gnome/gcr/gcr_3.28.0.bb b/meta/recipes-gnome/gcr/gcr_3.28.0.bb index 6777ad2277..0796362e4b 100644 --- a/meta/recipes-gnome/gcr/gcr_3.28.0.bb +++ b/meta/recipes-gnome/gcr/gcr_3.28.0.bb @@ -21,7 +21,9 @@ FILES_${PN} += " \ " # http://errors.yoctoproject.org/Errors/Details/20229/ -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" # These files may be out of date or missing our fixes # libgcrypt.m4 in particular is calling into libgcrypt-config diff --git a/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb b/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb index cdc41e762a..518c71feb1 100644 --- a/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb +++ b/meta/recipes-gnome/libsecret/libsecret_0.18.6.bb @@ -12,7 +12,9 @@ SRC_URI[archive.md5sum] = "c6cf132a56bd346fbf49a43abb02e5c2" SRC_URI[archive.sha256sum] = "5efbc890ba41a323ffe0599cd260fd12bd8eb62a04aa1bd1b2762575d253d66f" # http://errors.yoctoproject.org/Errors/Details/20228/ -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" # vapigen.m4 bundled with the tarball does not yet have our cross-compilation fixes do_configure_prepend() { diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb index feafce2580..e105ea2c00 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.bb @@ -30,7 +30,9 @@ SRC_URI[md5sum] = "1cc9e8cb027b9fd4c54f598f51002c19" SRC_URI[sha256sum] = "ed945daf40b124e77a685893cc025d086f638bc703183460aff49508edb3a43f" # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717 -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" # Should be API compatible with libav (which was a fork of ffmpeg) # libpostproc was previously packaged from a separate recipe diff --git a/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/meta/recipes-support/aspell/aspell_0.60.6.1.bb index 19a7155d66..161bb5ce20 100644 --- a/meta/recipes-support/aspell/aspell_0.60.6.1.bb +++ b/meta/recipes-support/aspell/aspell_0.60.6.1.bb @@ -25,7 +25,10 @@ FILES_${PN} = "${bindir}/aspell" FILES_libpspell = "${libdir}/libpspell.so.*" FILES_${PN}-dev += "${bindir}/pspell-config" -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" + inherit autotools-brokensep gettext texinfo binconfig-disabled BINCONFIG = "${bindir}/pspell-config" -- cgit v1.2.3-54-g00ecf