From 07468c71ad47e027bdadbf2cdf35e903734a8078 Mon Sep 17 00:00:00 2001 From: Taichi Haradaguchi <20001722@ymail.ne.jp> Date: Wed, 8 May 2024 11:32:56 +0200 Subject: [PATCH] libffi: Upgrade to 3.4.6 * external/libffi/implicit-function-declaration.patch was obsolete after https://github.com/libffi/libffi/pull/764 * Backport external/python3/0001-bpo-45898-Remove-duplicate-symbols-from-_ctypes-cfie.patch.1 from upstream to fix build errors on Windows. Change-Id: I6d7cd70dd29ea0ce4b22738637afa0e7eb76a93f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167337 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> --- download.lst | 4 +- external/libffi/UnpackedTarball_libffi.mk | 4 - .../implicit-function-declaration.patch | 11 - ...uplicate-symbols-from-_ctypes-cfie.patch.1 | 299 ++++++++++++++++++ external/python3/UnpackedTarball_python3.mk | 3 + 5 files changed, 304 insertions(+), 17 deletions(-) delete mode 100644 external/libffi/implicit-function-declaration.patch create mode 100644 external/python3/0001-bpo-45898-Remove-duplicate-symbols-from-_ctypes-cfie.patch.1 diff --git a/download.lst b/download.lst index bdf9c4858424..c77244baccbc 100644 --- a/download.lst +++ b/download.lst @@ -424,8 +424,8 @@ LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.7.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -LIBFFI_SHA256SUM := d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676 -LIBFFI_TARBALL := libffi-3.4.4.tar.gz +LIBFFI_SHA256SUM := b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e +LIBFFI_TARBALL := libffi-3.4.6.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/libffi/UnpackedTarball_libffi.mk b/external/libffi/UnpackedTarball_libffi.mk index 26436b33012e..3d2278f0add5 100644 --- a/external/libffi/UnpackedTarball_libffi.mk +++ b/external/libffi/UnpackedTarball_libffi.mk @@ -13,8 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libffi,$(LIBFFI_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libffi,0)) -$(eval $(call gb_UnpackedTarball_add_patches,libffi, \ - external/libffi/implicit-function-declaration.patch \ -)) \ - # vim: set noet sw=4 ts=4: diff --git a/external/libffi/implicit-function-declaration.patch b/external/libffi/implicit-function-declaration.patch deleted file mode 100644 index 294a5eff64a3..000000000000 --- a/external/libffi/implicit-function-declaration.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tramp.c -+++ src/tramp.c -@@ -55,6 +55,8 @@ - #include - #endif - #endif -+ -+int open_temp_exec_file (void); - - /* - * Each architecture defines static code for a trampoline code table. The diff --git a/external/python3/0001-bpo-45898-Remove-duplicate-symbols-from-_ctypes-cfie.patch.1 b/external/python3/0001-bpo-45898-Remove-duplicate-symbols-from-_ctypes-cfie.patch.1 new file mode 100644 index 000000000000..15887ef6735a --- /dev/null +++ b/external/python3/0001-bpo-45898-Remove-duplicate-symbols-from-_ctypes-cfie.patch.1 @@ -0,0 +1,299 @@ +From 38f331d4656394ae0f425568e26790ace778e076 Mon Sep 17 00:00:00 2001 +From: Christian Heimes +Date: Thu, 24 Feb 2022 21:51:57 +0200 +Subject: [PATCH] bpo-45898: Remove duplicate symbols from _ctypes/cfield.c + (GH-29791) + +--- + .../2021-11-26-10-46-09.bpo-45898.UIfhsb.rst | 2 + + Modules/_ctypes/cfield.c | 227 ++++++++---------- + PCbuild/_ctypes.vcxproj | 2 +- + 3 files changed, 106 insertions(+), 125 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2021-11-26-10-46-09.bpo-45898.UIfhsb.rst + +diff --git a/Misc/NEWS.d/next/Library/2021-11-26-10-46-09.bpo-45898.UIfhsb.rst b/Misc/NEWS.d/next/Library/2021-11-26-10-46-09.bpo-45898.UIfhsb.rst +new file mode 100644 +index 0000000000..9da5c258ab +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2021-11-26-10-46-09.bpo-45898.UIfhsb.rst +@@ -0,0 +1,2 @@ ++:mod:`ctypes` no longer defines ``ffi_type_*`` symbols in ``cfield.c``. The ++symbols have been provided by libffi for over a decade. +diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c +index 515b280182..2992d34934 100644 +--- a/Modules/_ctypes/cfield.c ++++ b/Modules/_ctypes/cfield.c +@@ -1481,55 +1481,40 @@ P_get(void *ptr, Py_ssize_t size) + } + + static struct fielddesc formattable[] = { +- { 's', s_set, s_get, &ffi_type_pointer}, +- { 'b', b_set, b_get, &ffi_type_schar}, +- { 'B', B_set, B_get, &ffi_type_uchar}, +- { 'c', c_set, c_get, &ffi_type_schar}, +- { 'd', d_set, d_get, &ffi_type_double, d_set_sw, d_get_sw}, +- { 'g', g_set, g_get, &ffi_type_longdouble}, +- { 'f', f_set, f_get, &ffi_type_float, f_set_sw, f_get_sw}, +- { 'h', h_set, h_get, &ffi_type_sshort, h_set_sw, h_get_sw}, +- { 'H', H_set, H_get, &ffi_type_ushort, H_set_sw, H_get_sw}, +- { 'i', i_set, i_get, &ffi_type_sint, i_set_sw, i_get_sw}, +- { 'I', I_set, I_get, &ffi_type_uint, I_set_sw, I_get_sw}, +-/* XXX Hm, sizeof(int) == sizeof(long) doesn't hold on every platform */ +-/* As soon as we can get rid of the type codes, this is no longer a problem */ +-#if SIZEOF_LONG == 4 +- { 'l', l_set, l_get, &ffi_type_sint32, l_set_sw, l_get_sw}, +- { 'L', L_set, L_get, &ffi_type_uint32, L_set_sw, L_get_sw}, +-#elif SIZEOF_LONG == 8 +- { 'l', l_set, l_get, &ffi_type_sint64, l_set_sw, l_get_sw}, +- { 'L', L_set, L_get, &ffi_type_uint64, L_set_sw, L_get_sw}, +-#else +-# error +-#endif +-#if SIZEOF_LONG_LONG == 8 +- { 'q', q_set, q_get, &ffi_type_sint64, q_set_sw, q_get_sw}, +- { 'Q', Q_set, Q_get, &ffi_type_uint64, Q_set_sw, Q_get_sw}, +-#else +-# error +-#endif +- { 'P', P_set, P_get, &ffi_type_pointer}, +- { 'z', z_set, z_get, &ffi_type_pointer}, +- { 'u', u_set, u_get, NULL}, /* ffi_type set later */ +- { 'U', U_set, U_get, &ffi_type_pointer}, +- { 'Z', Z_set, Z_get, &ffi_type_pointer}, ++ { 's', s_set, s_get, NULL}, ++ { 'b', b_set, b_get, NULL}, ++ { 'B', B_set, B_get, NULL}, ++ { 'c', c_set, c_get, NULL}, ++ { 'd', d_set, d_get, NULL, d_set_sw, d_get_sw}, ++ { 'g', g_set, g_get, NULL}, ++ { 'f', f_set, f_get, NULL, f_set_sw, f_get_sw}, ++ { 'h', h_set, h_get, NULL, h_set_sw, h_get_sw}, ++ { 'H', H_set, H_get, NULL, H_set_sw, H_get_sw}, ++ { 'i', i_set, i_get, NULL, i_set_sw, i_get_sw}, ++ { 'I', I_set, I_get, NULL, I_set_sw, I_get_sw}, ++ { 'l', l_set, l_get, NULL, l_set_sw, l_get_sw}, ++ { 'L', L_set, L_get, NULL, L_set_sw, L_get_sw}, ++ { 'q', q_set, q_get, NULL, q_set_sw, q_get_sw}, ++ { 'Q', Q_set, Q_get, NULL, Q_set_sw, Q_get_sw}, ++ { 'P', P_set, P_get, NULL}, ++ { 'z', z_set, z_get, NULL}, ++ { 'u', u_set, u_get, NULL}, ++ { 'U', U_set, U_get, NULL}, ++ { 'Z', Z_set, Z_get, NULL}, + #ifdef MS_WIN32 +- { 'X', BSTR_set, BSTR_get, &ffi_type_pointer}, ++ { 'X', BSTR_set, BSTR_get, NULL}, + #endif +- { 'v', vBOOL_set, vBOOL_get, &ffi_type_sshort}, +-#if SIZEOF__BOOL == 1 +- { '?', bool_set, bool_get, &ffi_type_uchar}, /* Also fallback for no native _Bool support */ +-#elif SIZEOF__BOOL == SIZEOF_SHORT +- { '?', bool_set, bool_get, &ffi_type_ushort}, +-#elif SIZEOF__BOOL == SIZEOF_INT +- { '?', bool_set, bool_get, &ffi_type_uint, I_set_sw, I_get_sw}, ++ { 'v', vBOOL_set, vBOOL_get, NULL}, ++#if SIZEOF__BOOL == SIZEOF_INT ++ { '?', bool_set, bool_get, NULL, I_set_sw, I_get_sw}, + #elif SIZEOF__BOOL == SIZEOF_LONG +- { '?', bool_set, bool_get, &ffi_type_ulong, L_set_sw, L_get_sw}, ++ { '?', bool_set, bool_get, NULL, L_set_sw, L_get_sw}, + #elif SIZEOF__BOOL == SIZEOF_LONG_LONG +- { '?', bool_set, bool_get, &ffi_type_ulong, Q_set_sw, Q_get_sw}, ++ { '?', bool_set, bool_get, NULL, Q_set_sw, Q_get_sw}, ++#else ++ { '?', bool_set, bool_get, NULL}, + #endif /* SIZEOF__BOOL */ +- { 'O', O_set, O_get, &ffi_type_pointer}, ++ { 'O', O_set, O_get, NULL}, + { 0, NULL, NULL, NULL}, + }; + +@@ -1538,6 +1523,79 @@ static struct fielddesc formattable[] = { + Use '?' as code for BOOL. + */ + ++/* Delayed initialization. Windows cannot statically reference dynamically ++ loaded addresses from DLLs. */ ++void ++_ctypes_init_fielddesc(void) ++{ ++ struct fielddesc *fd = formattable; ++ for (; fd->code; ++fd) { ++ switch (fd->code) { ++ case 's': fd->pffi_type = &ffi_type_pointer; break; ++ case 'b': fd->pffi_type = &ffi_type_schar; break; ++ case 'B': fd->pffi_type = &ffi_type_uchar; break; ++ case 'c': fd->pffi_type = &ffi_type_schar; break; ++ case 'd': fd->pffi_type = &ffi_type_double; break; ++ case 'g': fd->pffi_type = &ffi_type_longdouble; break; ++ case 'f': fd->pffi_type = &ffi_type_float; break; ++ case 'h': fd->pffi_type = &ffi_type_sshort; break; ++ case 'H': fd->pffi_type = &ffi_type_ushort; break; ++ case 'i': fd->pffi_type = &ffi_type_sint; break; ++ case 'I': fd->pffi_type = &ffi_type_uint; break; ++ /* XXX Hm, sizeof(int) == sizeof(long) doesn't hold on every platform */ ++ /* As soon as we can get rid of the type codes, this is no longer a problem */ ++ #if SIZEOF_LONG == 4 ++ case 'l': fd->pffi_type = &ffi_type_sint32; break; ++ case 'L': fd->pffi_type = &ffi_type_uint32; break; ++ #elif SIZEOF_LONG == 8 ++ case 'l': fd->pffi_type = &ffi_type_sint64; break; ++ case 'L': fd->pffi_type = &ffi_type_uint64; break; ++ #else ++ #error ++ #endif ++ #if SIZEOF_LONG_LONG == 8 ++ case 'q': fd->pffi_type = &ffi_type_sint64; break; ++ case 'Q': fd->pffi_type = &ffi_type_uint64; break; ++ #else ++ #error ++ #endif ++ case 'P': fd->pffi_type = &ffi_type_pointer; break; ++ case 'z': fd->pffi_type = &ffi_type_pointer; break; ++ case 'u': ++ if (sizeof(wchar_t) == sizeof(short)) ++ fd->pffi_type = &ffi_type_sshort; ++ else if (sizeof(wchar_t) == sizeof(int)) ++ fd->pffi_type = &ffi_type_sint; ++ else if (sizeof(wchar_t) == sizeof(long)) ++ fd->pffi_type = &ffi_type_slong; ++ else ++ Py_UNREACHABLE(); ++ break; ++ case 'U': fd->pffi_type = &ffi_type_pointer; break; ++ case 'Z': fd->pffi_type = &ffi_type_pointer; break; ++ #ifdef MS_WIN32 ++ case 'X': fd->pffi_type = &ffi_type_pointer; break; ++ #endif ++ case 'v': fd->pffi_type = &ffi_type_sshort; break; ++ #if SIZEOF__BOOL == 1 ++ case '?': fd->pffi_type = &ffi_type_uchar; break; /* Also fallback for no native _Bool support */ ++ #elif SIZEOF__BOOL == SIZEOF_SHORT ++ case '?': fd->pffi_type = &ffi_type_ushort; break; ++ #elif SIZEOF__BOOL == SIZEOF_INT ++ case '?': fd->pffi_type = &ffi_type_uint; break; ++ #elif SIZEOF__BOOL == SIZEOF_LONG ++ case '?': fd->pffi_type = &ffi_type_ulong; break; ++ #elif SIZEOF__BOOL == SIZEOF_LONG_LONG ++ case '?': fd->pffi_type = &ffi_type_ulong; break; ++ #endif /* SIZEOF__BOOL */ ++ case 'O': fd->pffi_type = &ffi_type_pointer; break; ++ default: ++ Py_UNREACHABLE(); ++ } ++ } ++ ++} ++ + struct fielddesc * + _ctypes_get_fielddesc(const char *fmt) + { +@@ -1545,13 +1603,7 @@ _ctypes_get_fielddesc(const char *fmt) + struct fielddesc *table = formattable; + + if (!initialized) { +- initialized = 1; +- if (sizeof(wchar_t) == sizeof(short)) +- _ctypes_get_fielddesc("u")->pffi_type = &ffi_type_sshort; +- else if (sizeof(wchar_t) == sizeof(int)) +- _ctypes_get_fielddesc("u")->pffi_type = &ffi_type_sint; +- else if (sizeof(wchar_t) == sizeof(long)) +- _ctypes_get_fielddesc("u")->pffi_type = &ffi_type_slong; ++ _ctypes_init_fielddesc(); + } + + for (; table->code; ++table) { +@@ -1561,77 +1613,4 @@ _ctypes_get_fielddesc(const char *fmt) + return NULL; + } + +-typedef struct { char c; char x; } s_char; +-typedef struct { char c; short x; } s_short; +-typedef struct { char c; int x; } s_int; +-typedef struct { char c; long x; } s_long; +-typedef struct { char c; float x; } s_float; +-typedef struct { char c; double x; } s_double; +-typedef struct { char c; long double x; } s_long_double; +-typedef struct { char c; char *x; } s_char_p; +-typedef struct { char c; void *x; } s_void_p; +- +-/* +-#define CHAR_ALIGN (sizeof(s_char) - sizeof(char)) +-#define SHORT_ALIGN (sizeof(s_short) - sizeof(short)) +-#define LONG_ALIGN (sizeof(s_long) - sizeof(long)) +-*/ +-#define INT_ALIGN (sizeof(s_int) - sizeof(int)) +-#define FLOAT_ALIGN (sizeof(s_float) - sizeof(float)) +-#define DOUBLE_ALIGN (sizeof(s_double) - sizeof(double)) +-#define LONGDOUBLE_ALIGN (sizeof(s_long_double) - sizeof(long double)) +- +-/* #define CHAR_P_ALIGN (sizeof(s_char_p) - sizeof(char*)) */ +-#define VOID_P_ALIGN (sizeof(s_void_p) - sizeof(void*)) +- +-/* +-#ifdef HAVE_USABLE_WCHAR_T +-typedef struct { char c; wchar_t x; } s_wchar; +-typedef struct { char c; wchar_t *x; } s_wchar_p; +- +-#define WCHAR_ALIGN (sizeof(s_wchar) - sizeof(wchar_t)) +-#define WCHAR_P_ALIGN (sizeof(s_wchar_p) - sizeof(wchar_t*)) +-#endif +-*/ +- +-typedef struct { char c; long long x; } s_long_long; +-#define LONG_LONG_ALIGN (sizeof(s_long_long) - sizeof(long long)) +- +-/* from ffi.h: +-typedef struct _ffi_type +-{ +- size_t size; +- unsigned short alignment; +- unsigned short type; +- struct _ffi_type **elements; +-} ffi_type; +-*/ +- +-/* align and size are bogus for void, but they must not be zero */ +-ffi_type ffi_type_void = { 1, 1, FFI_TYPE_VOID }; +- +-ffi_type ffi_type_uint8 = { 1, 1, FFI_TYPE_UINT8 }; +-ffi_type ffi_type_sint8 = { 1, 1, FFI_TYPE_SINT8 }; +- +-ffi_type ffi_type_uint16 = { 2, 2, FFI_TYPE_UINT16 }; +-ffi_type ffi_type_sint16 = { 2, 2, FFI_TYPE_SINT16 }; +- +-ffi_type ffi_type_uint32 = { 4, INT_ALIGN, FFI_TYPE_UINT32 }; +-ffi_type ffi_type_sint32 = { 4, INT_ALIGN, FFI_TYPE_SINT32 }; +- +-ffi_type ffi_type_uint64 = { 8, LONG_LONG_ALIGN, FFI_TYPE_UINT64 }; +-ffi_type ffi_type_sint64 = { 8, LONG_LONG_ALIGN, FFI_TYPE_SINT64 }; +- +-ffi_type ffi_type_float = { sizeof(float), FLOAT_ALIGN, FFI_TYPE_FLOAT }; +-ffi_type ffi_type_double = { sizeof(double), DOUBLE_ALIGN, FFI_TYPE_DOUBLE }; +- +-#ifdef ffi_type_longdouble +-#undef ffi_type_longdouble +-#endif +- /* This is already defined on OSX */ +-ffi_type ffi_type_longdouble = { sizeof(long double), LONGDOUBLE_ALIGN, +- FFI_TYPE_LONGDOUBLE }; +- +-ffi_type ffi_type_pointer = { sizeof(void *), VOID_P_ALIGN, FFI_TYPE_POINTER }; +- + /*---------------- EOF ----------------*/ +diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj +index 69e4271a9b..6ac26f1916 100644 +--- a/PCbuild/_ctypes.vcxproj ++++ b/PCbuild/_ctypes.vcxproj +@@ -94,7 +94,7 @@ + + + +- FFI_BUILDING;%(PreprocessorDefinitions) ++ USING_MALLOC_CLOSURE_DOT_C=1;%(PreprocessorDefinitions) + + + /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions) +-- +2.43.0 + diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 4e522715afc2..5a9cf9f03fde 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -21,7 +21,10 @@ ifneq ($(MSYSTEM),) $(eval $(call gb_UnpackedTarball_set_patchflags,python3,--binary)) endif +# external/python3/0001-bpo-45898-Remove-duplicate-symbols-from-_ctypes-cfie.patch.1: +# backport from https://github.com/python/cpython/commit/38f331d4656394ae0f425568e26790ace778e076 $(eval $(call gb_UnpackedTarball_add_patches,python3,\ + external/python3/0001-bpo-45898-Remove-duplicate-symbols-from-_ctypes-cfie.patch.1 \ external/python3/i100492-freebsd.patch.1 \ external/python3/python-3.3.0-darwin.patch.1 \ external/python3/python-3.8-msvc-libffi.patch.1 \