vanhofen
3 years ago
5 changed files with 1 additions and 161 deletions
@ -1,51 +0,0 @@ |
|||
From f9d8f11d60cdc656a801e0d8116101beb22e117b Mon Sep 17 00:00:00 2001 |
|||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
|||
Date: Sun, 24 Nov 2019 09:52:01 +0100 |
|||
Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 |
|||
|
|||
Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7 |
|||
fails on: |
|||
|
|||
In file included from ../src/powerpc/ffi.c:33:0: |
|||
../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target |
|||
typedef _Float128 float128; |
|||
^~~~~~~~~ |
|||
|
|||
Fix this build failure by checking for __HAVE_FLOAT128 before using |
|||
_Float128, as _Float128 is enabled only on specific conditions, see |
|||
output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h: |
|||
|
|||
/* Defined to 1 if the current compiler invocation provides a |
|||
floating-point type with the IEEE 754 binary128 format, and this glibc |
|||
includes corresponding *f128 interfaces for it. */ |
|||
#if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \ |
|||
&& defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH |
|||
# define __HAVE_FLOAT128 1 |
|||
#else |
|||
# define __HAVE_FLOAT128 0 |
|||
#endif |
|||
|
|||
Fixes: |
|||
- http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53 |
|||
|
|||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
|||
---
|
|||
src/powerpc/ffi_powerpc.h | 2 +- |
|||
1 file changed, 1 insertion(+), 1 deletion(-) |
|||
|
|||
diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h
|
|||
index 5ee2a70..a5a786b 100644
|
|||
--- a/src/powerpc/ffi_powerpc.h
|
|||
+++ b/src/powerpc/ffi_powerpc.h
|
|||
@@ -57,7 +57,7 @@ typedef union
|
|||
double d; |
|||
} ffi_dblfl; |
|||
|
|||
-#if defined(__FLOAT128_TYPE__)
|
|||
+#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128)
|
|||
typedef _Float128 float128; |
|||
#elif defined(__FLOAT128__) |
|||
typedef __float128 float128; |
|||
--
|
|||
2.24.0 |
|||
|
|||
@ -1,39 +0,0 @@ |
|||
From 01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd Mon Sep 17 00:00:00 2001 |
|||
From: Sergei Trofimovich <slyfox@gentoo.org> |
|||
Date: Thu, 28 Nov 2019 12:42:41 +0000 |
|||
Subject: [PATCH] powerpc: fix build failure on power7 and older (#532) |
|||
|
|||
Build failure looks as: |
|||
``` |
|||
libtool: compile: powerpc-unknown-linux-gnu-gcc \ |
|||
-O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ... |
|||
In file included from src/powerpc/ffi.c:33: |
|||
src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target |
|||
65 | typedef __int128 float128; |
|||
| ^~~~~~~~ |
|||
``` |
|||
|
|||
The fix avoids using __int128 in favour of aligned char[16]. |
|||
|
|||
Closes: https://github.com/libffi/libffi/issues/531 |
|||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> |
|||
[Retrieved from: |
|||
https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd] |
|||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
|||
---
|
|||
src/powerpc/ffi_powerpc.h | 2 +- |
|||
1 file changed, 1 insertion(+), 1 deletion(-) |
|||
|
|||
diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h
|
|||
index 5ee2a709..8e2f2f0e 100644
|
|||
--- a/src/powerpc/ffi_powerpc.h
|
|||
+++ b/src/powerpc/ffi_powerpc.h
|
|||
@@ -62,7 +62,7 @@ typedef _Float128 float128;
|
|||
#elif defined(__FLOAT128__) |
|||
typedef __float128 float128; |
|||
#else |
|||
-typedef __int128 float128;
|
|||
+typedef char float128[16] __attribute__((aligned(16)));
|
|||
#endif |
|||
|
|||
void FFI_HIDDEN ffi_closure_SYSV (void); |
|||
@ -1,28 +0,0 @@ |
|||
From 6663047f56c2932a6b10a790f4ac6666dd181326 Mon Sep 17 00:00:00 2001 |
|||
From: Anthony Green <green@moxielogic.com> |
|||
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 <fontaine.fabrice@gmail.com> |
|||
---
|
|||
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++; |
|||
@ -1,42 +0,0 @@ |
|||
From e50b9ef8b910fa642ef158f6642e60d54d7ad740 Mon Sep 17 00:00:00 2001 |
|||
From: Khem Raj <raj.khem@gmail.com> |
|||
Date: Sat, 7 Dec 2019 02:34:14 -0800 |
|||
Subject: [PATCH] powerpc64: Use memcpy to help platforms with no __int128. |
|||
(#534) |
|||
|
|||
Signed-off-by: Khem Raj <raj.khem@gmail.com> |
|||
[Retrieved from: |
|||
https://github.com/libffi/libffi/commit/e50b9ef8b910fa642ef158f6642e60d54d7ad740] |
|||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
|||
---
|
|||
src/powerpc/ffi_linux64.c | 8 ++++---- |
|||
1 file changed, 4 insertions(+), 4 deletions(-) |
|||
|
|||
diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c
|
|||
index 73647701..4d50878e 100644
|
|||
--- a/src/powerpc/ffi_linux64.c
|
|||
+++ b/src/powerpc/ffi_linux64.c
|
|||
@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack)
|
|||
{ |
|||
if (vecarg_count < NUM_VEC_ARG_REGISTERS64 |
|||
&& i < nfixedargs) |
|||
- *vec_base.f128++ = *arg.f128++;
|
|||
+ memcpy (vec_base.f128++, arg.f128, sizeof (float128));
|
|||
else |
|||
- *next_arg.f128 = *arg.f128++;
|
|||
+ memcpy (next_arg.f128, arg.f128++, sizeof (float128));
|
|||
if (++next_arg.f128 == gpr_end.f128) |
|||
next_arg.f128 = rest.f128; |
|||
vecarg_count++; |
|||
@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif,
|
|||
do |
|||
{ |
|||
if (pvec < end_pvec && i < nfixedargs) |
|||
- *to.f128 = *pvec++;
|
|||
+ memcpy (to.f128, pvec++, sizeof (float128));
|
|||
else |
|||
- *to.f128 = *from.f128;
|
|||
+ memcpy (to.f128, from.f128, sizeof (float128));
|
|||
to.f128++; |
|||
from.f128++; |
|||
} |
|||
Loading…
Reference in new issue