Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update LIBFFI to 3.4.6 #9124

Merged
merged 1 commit into from
Jul 10, 2024
Merged

Update LIBFFI to 3.4.6 #9124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions truffle/mx.truffle/mx_truffle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@ def __init__(self, suite, name, deps, workingSets, **kwargs):
self.out_dir = self.get_output_root()
if mx.get_os() == 'windows':
self.delegate = mx_native.DefaultNativeProject(suite, name, subDir, [], [], None,
os.path.join(self.out_dir, 'libffi-3.4.4'),
os.path.join(self.out_dir, 'libffi-3.4.6'),
'static_lib',
deliverable='ffi',
cflags=['-MD', '-O2', '-DFFI_BUILDING_DLL'])
Expand Down Expand Up @@ -1558,7 +1558,7 @@ def getArchivableResults(self, use_relpath=True, single=False):
'include/ffi.h',
'include/ffitarget.h'],
os.path.join(self.out_dir, 'libffi-build'),
os.path.join(self.out_dir, 'libffi-3.4.4'))
os.path.join(self.out_dir, 'libffi-3.4.6'))
configure_args = ['--disable-dependency-tracking',
'--disable-shared',
'--with-pic',
Expand Down
4 changes: 2 additions & 2 deletions truffle/mx.truffle/suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@

"LIBFFI_SOURCES" : {
"resource" : True,
"version" : "3.4.4",
"version" : "3.4.6",
"urls" : [
"https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-{version}.tar.gz",
"https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz",
],
"digest" : "sha512:88680aeb0fa0dc0319e5cd2ba45b4b5a340bc9b4bcf20b1e0613b39cd898f177a3863aa94034d8e23a7f6f44d858a53dcd36d1bb8dee13b751ef814224061889",
"digest" : "sha512:033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39",
},

"ANTLR4": {
Expand Down
8 changes: 4 additions & 4 deletions ...le/src/libffi/patches/windows-amd64/0001-Preconfigure-sources-for-x64-Windows-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ index d38b781..6284190 100644

/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
+#define PACKAGE_STRING "libffi 3.4.4"
+#define PACKAGE_STRING "libffi 3.4.6"

/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
Expand All @@ -243,7 +243,7 @@ index d38b781..6284190 100644

/* Define to the version of this package. */
-#undef PACKAGE_VERSION
+#define PACKAGE_VERSION "3.4.4"
+#define PACKAGE_VERSION "3.4.6"

/* The size of `double', as computed by sizeof. */
-#undef SIZEOF_DOUBLE
Expand Down Expand Up @@ -283,7 +283,7 @@ index d38b781..6284190 100644

/* Version number of package */
-#undef VERSION
+#define VERSION "3.4.4"
+#define VERSION "3.4.6"

/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
Expand Down Expand Up @@ -312,7 +312,7 @@ index 227ac79..6318a33 100644
@@ -1,5 +1,5 @@
/* -----------------------------------------------------------------*-C-*-
- libffi @VERSION@
+ libffi 3.4.4
+ libffi 3.4.6
- Copyright (c) 2011, 2014, 2019, 2021, 2022 Anthony Green
- Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.

Expand Down
Loading