Refresh the following patch: 0001-configure.ac-add-build-options-for-ilp32.patch
Signed-off-by: Zang Ruochen zangrc.fnst@cn.fujitsu.com --- ...igure.ac-add-build-options-for-ilp32.patch | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/meta-linaro-integration/recipes-support/gmp/gmp/0001-configure.ac-add-build-options-for-ilp32.patch b/meta-linaro-integration/recipes-support/gmp/gmp/0001-configure.ac-add-build-options-for-ilp32.patch index bb50a34..f1e6da2 100644 --- a/meta-linaro-integration/recipes-support/gmp/gmp/0001-configure.ac-add-build-options-for-ilp32.patch +++ b/meta-linaro-integration/recipes-support/gmp/gmp/0001-configure.ac-add-build-options-for-ilp32.patch @@ -1,18 +1,19 @@ -From b788583bdf5c19e32cf2f15cc4c0fe35d33d3792 Mon Sep 17 00:00:00 2001 +From 96b1ab58dff13089e3cf9597c3ecba46377a5834 Mon Sep 17 00:00:00 2001 From: Vishal Bhoj vishal.bhoj@linaro.org Date: Fri, 4 Aug 2017 15:21:09 +0530 Subject: [PATCH] configure.ac: add build options for ilp32
Signed-off-by: Vishal Bhoj vishal.bhoj@linaro.org + --- configure.ac | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac -index 9641c04..dcaf7c3 100644 +index db47f9c..59da576 100644 --- a/configure.ac +++ b/configure.ac -@@ -592,16 +592,19 @@ case $host in +@@ -613,16 +613,19 @@ case $host in
arm*-*-* | aarch64*-*-*) @@ -28,12 +29,12 @@ index 9641c04..dcaf7c3 100644 CALLING_CONVENTIONS_OBJS_64="" cclist_64="gcc cc" + cclist_ilp32="gcc cc" - any_32_testlist="sizeof-long-4" + any_32_testlist="sizeof-void*-4" + any_ilp32_testlist="sizeof-long-4" - any_64_testlist="sizeof-long-8" + any_64_testlist="sizeof-void*-8"
- # This is needed for clang, which is not content with flags like -mfpu=neon -@@ -737,13 +740,22 @@ case $host in + # FIXME: We make mandatory compiler options optional here. We should +@@ -760,13 +763,22 @@ case $host in gcc_cflags_tune="-mtune=xgene1" ;; aarch64*) @@ -56,7 +57,4 @@ index 9641c04..dcaf7c3 100644 + ;; *) path="arm" - gcc_cflags_arch="-march=armv4" --- -2.7.4 - + ;;
Libffi has been updated to version 3.3, and the following patch is no longer applicable to this version: libffi_armeb_be8.patch
Signed-off-by: Zang Ruochen zangrc.fnst@cn.fujitsu.com --- .../libffi/libffi/libffi_armeb_be8.patch | 37 ------------------- .../recipes-gnome/libffi/libffi_%.bbappend | 1 - 2 files changed, 38 deletions(-) delete mode 100644 meta-bigendian/recipes-gnome/libffi/libffi/libffi_armeb_be8.patch
diff --git a/meta-bigendian/recipes-gnome/libffi/libffi/libffi_armeb_be8.patch b/meta-bigendian/recipes-gnome/libffi/libffi/libffi_armeb_be8.patch deleted file mode 100644 index 7efa58e..0000000 --- a/meta-bigendian/recipes-gnome/libffi/libffi/libffi_armeb_be8.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: libffi-3.0.13/src/arm/ffi.c -=================================================================== ---- libffi-3.0.13.orig/src/arm/ffi.c -+++ libffi-3.0.13/src/arm/ffi.c -@@ -582,6 +582,7 @@ ffi_closure_free (void *ptr) - - #else - -+#if !(defined(__ARMEB__) && defined(__ARM_ARCH_7A__)) - #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX) \ - ({ unsigned char *__tramp = (unsigned char*)(TRAMP); \ - unsigned int __fun = (unsigned int)(FUN); \ -@@ -595,7 +596,23 @@ ffi_closure_free (void *ptr) - /* Clear instruction \ - mapping. */ \ - }) -- -+#else /* armv7 big endian: be8 instructions are still little endian */ -+#define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX) \ -+({ unsigned char *__tramp = (unsigned char*)(TRAMP); \ -+ unsigned int __fun = (unsigned int)(FUN); \ -+ unsigned int __ctx = (unsigned int)(CTX); \ -+ unsigned char *insns = (unsigned char *)(CTX); \ -+ *(unsigned int*) &__tramp[0] = 0x0f002de9; /* swab(0xe92d000f, 4) - stmfd sp!, {r0-r3} */ \ -+ *(unsigned int*) &__tramp[4] = 0x00009fe5; /* swab(0xe59f0000, 4) - ldr r0, [pc] */ \ -+ *(unsigned int*) &__tramp[8] = 0x00f09fe5; /* swab(0xe59ff000, 4) - ldr pc, [pc] */ \ -+ *(unsigned int*) &__tramp[12] = __ctx; \ -+ *(unsigned int*) &__tramp[16] = __fun; \ -+ __clear_cache((&__tramp[0]), (&__tramp[19])); /* Clear data mapping. */ \ -+ __clear_cache(insns, insns + 3 * sizeof (unsigned int)); \ -+ /* Clear instruction \ -+ mapping. */ \ -+ }) -+#endif - #endif - - /* the cif must already be prep'ed */ diff --git a/meta-bigendian/recipes-gnome/libffi/libffi_%.bbappend b/meta-bigendian/recipes-gnome/libffi/libffi_%.bbappend index 05b2f11..6d4804d 100644 --- a/meta-bigendian/recipes-gnome/libffi/libffi_%.bbappend +++ b/meta-bigendian/recipes-gnome/libffi/libffi_%.bbappend @@ -1,3 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://libffi_armeb_be8.patch"
COPYING changed from the original GPL-2.0 to GPL-2.0 & LGPL-2.1. COPYING.LIB modified the address. GPL-2.0 and LGPL-2.1 files have been added to the source code.
Signed-off-by: Zang Ruochen zangrc.fnst@cn.fujitsu.com --- .../trace-cmd/trace-cmd_2.3.2.bb | 21 ----------------- .../trace-cmd/trace-cmd_2.9.1.bb | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb create mode 100644 meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb
diff --git a/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb b/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb deleted file mode 100644 index 28143b1..0000000 --- a/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "User interface to Ftrace" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ - file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://trace-input.c;beginline=5;endine=8;md5=dafd8a1cade30b847a8686dd3628cea4" - -DEPENDS = "swig-native" - -SRCREV = "79e08f8edb38c4c5098486caaa87ca90ba00f547" -PV = "2.3.2" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;branch=trace-cmd-stable-v2.3" - -S = "${WORKDIR}/git" - -do_install() { - ${MAKE} NO_PYTHON=1 prefix=${prefix} plugin_dir=${libdir}/trace-cmd/plugins DESTDIR=${D} install -} - -FILES_${PN}-dbg += "${libdir}/trace-cmd/plugins/.debug/" diff --git a/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb b/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb new file mode 100644 index 0000000..b6a9ed1 --- /dev/null +++ b/meta-linaro/recipes-kernel/trace-cmd/trace-cmd_2.9.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "User interface to Ftrace" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=873f48a813bded3de6ebc54e6880c4ac \ + file://COPYING.LIB;md5=edb195fe538e4552c1f6ca0fd7bf4f0a \ + file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \ + file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd" + +DEPENDS = "swig-native" + +SRCREV = "530b1a0caef39466e16bbd49de5afef89656f03f" +PV = "2.9.1" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git" + +S = "${WORKDIR}/git" + +do_install() { + ${MAKE} NO_PYTHON=1 prefix=${prefix} plugin_dir=${libdir}/trace-cmd/plugins DESTDIR=${D} install +} + +FILES_${PN} += "${prefix}/etc/" +FILES_${PN} += "${libdir}/traceevent/plugins/" +FILES_${PN}-dbg += "${libdir}/trace-cmd/plugins/.debug/"
-
Zang Ruochen