From 00a11f5640616931a920f27da4ea59671c8d3aaf Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 22 Feb 2013 08:56:54 +0000 Subject: [PATCH] libffi: fix powerpc build breakage Happens with the latest release when there are no FP registers. Fixes: http://autobuild.buildroot.net/results/bc43261d3ddc9d4c320522563249f4a0695a35a4/ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/libffi/libffi-002-fix-ppc-nofpr.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/libffi/libffi-002-fix-ppc-nofpr.patch diff --git a/package/libffi/libffi-002-fix-ppc-nofpr.patch b/package/libffi/libffi-002-fix-ppc-nofpr.patch new file mode 100644 index 0000000000..729bae812b --- /dev/null +++ b/package/libffi/libffi-002-fix-ppc-nofpr.patch @@ -0,0 +1,29 @@ +From: Gilles Talis + +On PPC, if __NO_FPRS__ is defined, fparg_count and NUM_FPR_ARG_REGISTERS +are not defined, thus must not be used. + +Signed-off-by: Gilles Talis +--- + src/powerpc/ffi.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c +index f3a96a1..9c69584 100644 +--- a/src/powerpc/ffi.c ++++ b/src/powerpc/ffi.c +@@ -376,9 +376,10 @@ ffi_prep_args_SYSV (extended_cif *ecif, unsigned *const stack) + with the number found in ffi_prep_cif_machdep(). However, intarg_count + is incremeneted whenever we place an FP arg on the stack, so account for + that before our assert test. */ ++#ifndef __NO_FPRS__ + if (fparg_count > NUM_FPR_ARG_REGISTERS) + intarg_count -= fparg_count - NUM_FPR_ARG_REGISTERS; +-#ifndef __NO_FPRS__ ++ + FFI_ASSERT (fpr_base.u + <= stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS); + #endif +-- +1.7.10.4 + -- 2.30.2