diff options
| -rw-r--r-- | meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch | 6 | ||||
| -rw-r--r-- | meta/recipes-support/libffi/libffi/not-win32.patch | 8 | ||||
| -rw-r--r-- | meta/recipes-support/libffi/libffi_3.4.4.bb (renamed from meta/recipes-support/libffi/libffi_3.4.2.bb) | 4 | 
3 files changed, 8 insertions, 10 deletions
| diff --git a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch b/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch index 4233799501..3ffcb3e128 100644 --- a/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch +++ b/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 501a6b55853af549fae72723e74271f2a4ec7cf6 Mon Sep 17 00:00:00 2001 | 1 | From 000f1500b693a84880d2da49b77b1113f98dde35 Mon Sep 17 00:00:00 2001 | 
| 2 | From: Brett Warren <brett.warren@arm.com> | 2 | From: Brett Warren <brett.warren@arm.com> | 
| 3 | Date: Fri, 27 Nov 2020 15:28:42 +0000 | 3 | Date: Fri, 27 Nov 2020 15:28:42 +0000 | 
| 4 | Subject: [PATCH] arm/sysv: reverted clang VFP mitigation | 4 | Subject: [PATCH] arm/sysv: reverted clang VFP mitigation | 
| @@ -13,6 +13,7 @@ has been reverted. | |||
| 13 | 13 | ||
| 14 | Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/747] | 14 | Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/747] | 
| 15 | Signed-off-by: Brett Warren <brett.warren@arm.com> | 15 | Signed-off-by: Brett Warren <brett.warren@arm.com> | 
| 16 | |||
| 16 | --- | 17 | --- | 
| 17 | src/arm/sysv.S | 33 --------------------------------- | 18 | src/arm/sysv.S | 33 --------------------------------- | 
| 18 | 1 file changed, 33 deletions(-) | 19 | 1 file changed, 33 deletions(-) | 
| @@ -99,6 +100,3 @@ index fb36213..e4272a1 100644 | |||
| 99 | b call_epilogue | 100 | b call_epilogue | 
| 100 | E(ARM_TYPE_INT64) | 101 | E(ARM_TYPE_INT64) | 
| 101 | ldr r1, [r2, #4] | 102 | ldr r1, [r2, #4] | 
| 102 | -- | ||
| 103 | 2.25.1 | ||
| 104 | |||
| diff --git a/meta/recipes-support/libffi/libffi/not-win32.patch b/meta/recipes-support/libffi/libffi/not-win32.patch index 62daaf4b38..38f9b0025c 100644 --- a/meta/recipes-support/libffi/libffi/not-win32.patch +++ b/meta/recipes-support/libffi/libffi/not-win32.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 306719369a0d3608b4ff2737de74ae284788a14b Mon Sep 17 00:00:00 2001 | 1 | From 20bc4e03442e15965ae3907013e9a177878f0323 Mon Sep 17 00:00:00 2001 | 
| 2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> | 
| 3 | Date: Thu, 4 Feb 2016 16:22:50 +0000 | 3 | Date: Thu, 4 Feb 2016 16:22:50 +0000 | 
| 4 | Subject: [PATCH] libffi: ensure sysroot paths are not in libffi.pc | 4 | Subject: [PATCH] libffi: ensure sysroot paths are not in libffi.pc | 
| @@ -21,11 +21,11 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | 
| 22 | 22 | ||
| 23 | diff --git a/configure.ac b/configure.ac | 23 | diff --git a/configure.ac b/configure.ac | 
| 24 | index b764368..d51ce91 100644 | 24 | index 7e8cd98..cf37e88 100644 | 
| 25 | --- a/configure.ac | 25 | --- a/configure.ac | 
| 26 | +++ b/configure.ac | 26 | +++ b/configure.ac | 
| 27 | @@ -354,7 +354,7 @@ AC_ARG_ENABLE(multi-os-directory, | 27 | @@ -405,7 +405,7 @@ AC_ARG_ENABLE(multi-os-directory, | 
| 28 | 28 | ||
| 29 | # These variables are only ever used when we cross-build to X86_WIN32. | 29 | # These variables are only ever used when we cross-build to X86_WIN32. | 
| 30 | # And we only support this with GCC, so... | 30 | # And we only support this with GCC, so... | 
| 31 | -if test "x$GCC" = "xyes"; then | 31 | -if test "x$GCC" = "xyes"; then | 
| diff --git a/meta/recipes-support/libffi/libffi_3.4.2.bb b/meta/recipes-support/libffi/libffi_3.4.4.bb index 71d9518baf..4ceee6f3cc 100644 --- a/meta/recipes-support/libffi/libffi_3.4.2.bb +++ b/meta/recipes-support/libffi/libffi_3.4.4.bb | |||
| @@ -8,13 +8,13 @@ library really only provides the lowest, machine dependent layer of a fully feat | |||
| 8 | A layer must exist above `libffi' that handles type conversions for values passed between the two languages." | 8 | A layer must exist above `libffi' that handles type conversions for values passed between the two languages." | 
| 9 | 9 | ||
| 10 | LICENSE = "MIT" | 10 | LICENSE = "MIT" | 
| 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=679b5c9bdc79a2b93ee574e193e7a7bc" | 11 | LIC_FILES_CHKSUM = "file://LICENSE;md5=32c0d09a0641daf4903e5d61cc8f23a8" | 
| 12 | 12 | ||
| 13 | SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ | 13 | SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ | 
| 14 | file://not-win32.patch \ | 14 | file://not-win32.patch \ | 
| 15 | file://0001-arm-sysv-reverted-clang-VFP-mitigation.patch \ | 15 | file://0001-arm-sysv-reverted-clang-VFP-mitigation.patch \ | 
| 16 | " | 16 | " | 
| 17 | SRC_URI[sha256sum] = "540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620" | 17 | SRC_URI[sha256sum] = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676" | 
| 18 | UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/" | 18 | UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/" | 
| 19 | UPSTREAM_CHECK_REGEX = "libffi-(?P<pver>\d+(\.\d+)+)\.tar" | 19 | UPSTREAM_CHECK_REGEX = "libffi-(?P<pver>\d+(\.\d+)+)\.tar" | 
| 20 | 20 | ||
