Merge pull request #191957 from trofi/libffi-update

libffi: 3.4.2 -> 3.4.3
This commit is contained in:
Sergei Trofimovich
2022-09-24 09:04:15 +01:00
committed by GitHub
2 changed files with 2 additions and 26 deletions
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "libffi";
version = "3.4.2";
version = "3.4.3";
src = fetchurl {
url = "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "081nx7wpzds168jbr59m34n6s3lyiq6r8zggvqxvlslsc4hvf3sl";
sha256 = "sha256-RBbdkrauj8tbEEIecRxNPLMSA9d1Iad9hdAQIxHmw7g=";
};
# Note: this package is used for bootstrapping fetchurl, and thus
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
patches = [
./libffi-powerpc64.patch
];
strictDeps = true;
@@ -1,23 +0,0 @@
https://github.com/libffi/libffi/issues/668
--- a/src/powerpc/linux64.S
+++ b/src/powerpc/linux64.S
@@ -29,6 +29,8 @@
#include <fficonfig.h>
#include <ffi.h>
+ .machine altivec
+
#ifdef POWERPC64
.hidden ffi_call_LINUX64
.globl ffi_call_LINUX64
--- a/src/powerpc/linux64_closure.S
+++ b/src/powerpc/linux64_closure.S
@@ -30,6 +30,8 @@
.file "linux64_closure.S"
+ .machine altivec
+
#ifdef POWERPC64
FFI_HIDDEN (ffi_closure_LINUX64)
.globl ffi_closure_LINUX64