Skip to contentSkip to conversation

package/libffi: fix build on powerpc64 with no __int128

PATCH New Fabrice Fontaine 2 participants 2 messages Dec 26, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libffi: fix build on powerpc64 with no __int128

Fixes:
- http://autobuild.buildroot.net/results/cb69d82ad1d41f6ea13d289ec2226d9bd5b67984

---
 ...6-Address-platforms-with-no-__int128.patch | 28 +++++++++++++
 ...y-to-help-platforms-with-no-__int128.patch | 42 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 package/libffi/0006-Address-platforms-with-no-__int128.patch
 create mode 100644 package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch
package/libffi/0006-Address-platforms-with-no-__int128.patch new file +28 -0
new file mode 100644
index 0000000000..012c6f0dae
@@ -0,0 +1,28 @@
+From 6663047f56c2932a6b10a790f4ac6666dd181326 Mon Sep 17 00:00:00 2001
+From: Anthony Green <[email protected]>
+Date: Fri, 29 Nov 2019 07:00:35 -0500
+Subject: [PATCH] Address platforms with no __int128.
+
+[Retrieved from:
+https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ src/powerpc/ffi_linux64.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c
+index de0d0337..73647701 100644
+--- a/src/powerpc/ffi_linux64.c
++++ b/src/powerpc/ffi_linux64.c
+@@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack)
+               if (next_arg.ul == gpr_end.ul)
+                 next_arg.ul = rest.ul;
+               if (vecarg_count < NUM_VEC_ARG_REGISTERS64 && i < nfixedargs)
+-                *vec_base.f128++ = **p_argv.f128;
++		memcpy (vec_base.f128++, *p_argv.f128, sizeof (float128));
+               else
+-                *next_arg.f128 = **p_argv.f128;
++		memcpy (next_arg.f128, *p_argv.f128, sizeof (float128));
+               if (++next_arg.f128 == gpr_end.f128)
+                 next_arg.f128 = rest.f128;
+               vecarg_count++;
package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch new file +42 -0

42 lines not on this page · raw message

Signature · 1 line
2.24.0
#1 lore raw

PATCH 1/1 package/libffi: fix build on powerpc64 with no __int128

Quoted 10 lines · On Thu, 26 Dec 2019 23:09:20 +0100 Fabrice Fontaine…

Fixes:
- http://autobuild.buildroot.net/results/cb69d82ad1d41f6ea13d289ec2226d9bd5b67984

---
 ...6-Address-platforms-with-no-__int128.patch | 28 +++++++++++++
 ...y-to-help-platforms-with-no-__int128.patch | 42 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 package/libffi/0006-Address-platforms-with-no-__int128.patch
 create mode 100644 package/libffi/0007-powerpc64-Use-memcpy-to-help-platforms-with-no-__int128.patch

I wonder how many fixes will be needed to make libffi build on PowerPC! :-)

Applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com