alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pkgsCross.ppc64.libffi: pull upstream patch to support gcc-12

Browse source 
Without the change `libffi` fails to build against `gcc-12` as:

    libtool: compile:  powerpc64-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude \
        -I../src -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math -Wall -fexceptions -c ../src/tramp.c \
        -fPIC -DPIC -o src/.libs/tramp.o
    ../src/powerpc/linux64_closure.S: Assembler messages:
    ../src/powerpc/linux64_closure.S:363: Error: unrecognized opcode: `lvx'

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Sergei Trofimovich 2022-06-02 11:27:18 +01:00
parent 1bd8058f66
commit 55886c3946
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/libffi/default.nix
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" ];

23
pkgs/development/libraries/libffi/libffi-powerpc64.patch Normal file
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