diff options
Diffstat (limited to 'pkg/libffi/patch')
3 files changed, 17 insertions, 18 deletions
diff --git a/pkg/libffi/patch/0001-Use-fixed-type-integer-types-when-available.patch b/pkg/libffi/patch/0001-Use-fixed-type-integer-types-when-available.patch index 46b37561..91492d75 100644 --- a/pkg/libffi/patch/0001-Use-fixed-type-integer-types-when-available.patch +++ b/pkg/libffi/patch/0001-Use-fixed-type-integer-types-when-available.patch @@ -1,4 +1,4 @@ -From 8aee4bf7573a7d52c0e3a84e03a964222e13f4c2 Mon Sep 17 00:00:00 2001 +From a53acabb2bade1d1934cc3a44f0174689255cf8a Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Tue, 13 Aug 2019 22:20:39 +0000 Subject: [PATCH] Use fixed-type integer types when available @@ -9,10 +9,10 @@ This avoids the use of gcc attributes to select the integer width. 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/ffi_common.h b/include/ffi_common.h -index 37f5a9e..56145f4 100644 +index 76b9dd6..cfec340 100644 --- a/include/ffi_common.h +++ b/include/ffi_common.h -@@ -91,7 +91,17 @@ typedef struct +@@ -112,7 +112,17 @@ typedef struct } extended_cif; /* Terse sized type definitions. */ @@ -32,5 +32,5 @@ index 37f5a9e..56145f4 100644 typedef signed char SINT8; typedef unsigned short UINT16; -- -2.22.0 +2.24.0 diff --git a/pkg/libffi/patch/0002-Use-generic-padding-instead-of-128-bit-integers.patch b/pkg/libffi/patch/0002-Use-generic-padding-instead-of-128-bit-integers.patch index 6fe04f55..f7130fe8 100644 --- a/pkg/libffi/patch/0002-Use-generic-padding-instead-of-128-bit-integers.patch +++ b/pkg/libffi/patch/0002-Use-generic-padding-instead-of-128-bit-integers.patch @@ -1,4 +1,4 @@ -From 0e209181497d1bd3db35c390fdf05ae58e3d81eb Mon Sep 17 00:00:00 2001 +From 68b09c2e546bb3ea3ad43904e5b499729ee3bee8 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Tue, 13 Aug 2019 22:27:49 +0000 Subject: [PATCH] Use generic padding instead of 128-bit integers @@ -8,10 +8,10 @@ Subject: [PATCH] Use generic padding instead of 128-bit integers 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/x86/ffi64.c b/src/x86/ffi64.c -index 5a5e043..fb9ab13 100644 +index dec331c..a48c74d 100644 --- a/src/x86/ffi64.c +++ b/src/x86/ffi64.c -@@ -38,23 +38,11 @@ +@@ -40,23 +40,11 @@ #define MAX_GPR_REGS 6 #define MAX_SSE_REGS 8 @@ -37,5 +37,5 @@ index 5a5e043..fb9ab13 100644 struct register_args -- -2.22.0 +2.24.0 diff --git a/pkg/libffi/patch/0003-Don-t-use-complex-types-if-they-are-not-supported.patch b/pkg/libffi/patch/0003-Don-t-use-complex-types-if-they-are-not-supported.patch index abcb60ff..59cf0199 100644 --- a/pkg/libffi/patch/0003-Don-t-use-complex-types-if-they-are-not-supported.patch +++ b/pkg/libffi/patch/0003-Don-t-use-complex-types-if-they-are-not-supported.patch @@ -1,26 +1,25 @@ -From 11d46eaa4293840e7a4c1dde18f75453bfaca54e Mon Sep 17 00:00:00 2001 +From 160695fc15e589d08843b07b9f9950be574f3aee Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Tue, 13 Aug 2019 22:28:49 +0000 Subject: [PATCH] Don't use complex types if they are not supported --- - src/x86/ffitarget.h | 2 ++ - 1 file changed, 2 insertions(+) + src/x86/ffitarget.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/x86/ffitarget.h b/src/x86/ffitarget.h -index a236677..709140d 100644 +index 85ccedf..d4f384c 100644 --- a/src/x86/ffitarget.h +++ b/src/x86/ffitarget.h -@@ -50,7 +50,9 @@ +@@ -50,7 +50,7 @@ #endif #define FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION -+#ifndef __STDC_NO_COMPLEX__ +-#ifndef _MSC_VER ++#if !defined(_MSC_VER) && !defined(__STDC_NO_COMPLEX__) #define FFI_TARGET_HAS_COMPLEX_TYPE -+#endif - - /* ---- Generic type definitions ----------------------------------------- */ + #endif -- -2.22.0 +2.24.0 |