gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #175914 from trofi/libffi-fix-for-gcc-12-powerpc64

Browse Source 
pkgsCross.ppc64.libffi: pull patch to support gcc-12
This commit is contained in:
Sergei Trofimovich
2022-06-07 09:06:01 +00:00
committed by GitHub
parent 75dc5b4a27 55886c3946
commit dedcf624ee
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libffi/default.nix
+7 -6
View File
@@ -7,11 +7,6 @@
, dejagnu
}:
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
stdenv.mkDerivation rec {
pname = "libffi";
version = "3.4.2";
@@ -21,7 +16,13 @@ stdenv.mkDerivation rec {
sha256 = "081nx7wpzds168jbr59m34n6s3lyiq6r8zggvqxvlslsc4hvf3sl";
};
patches = [];
# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
# cgit) that are needed here should be included directly in Nixpkgs as
# files.
patches = [
./libffi-powerpc64.patch
];
strictDeps = true;
outputs = [ "out" "dev" "man" "info" ];
pkgs/development/libraries/libffi/libffi-powerpc64.patch
+23
View File
@@ -0,0 +1,23 @@
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