diff --git a/CHANGELOG.md b/CHANGELOG.md index 282a3c24cc3..2d0f451240c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,14 @@ * (PR [#????](https://github.com/realm/realm-core/pull/????)) * Released a read lock which was pinned for the duration of a mutable subscription even after commit. This frees resources earlier, and may improve performance of sync bootstraps where the starting state is large. ([#7946](https://github.com/realm/realm-core/issues/7946)) * Client reset cycle detection now checks if the previous recovery attempt was made by the same core version, and if not attempts recovery again ([PR #7944](https://github.com/realm/realm-core/pull/7944)). +* Updated bundled OpenSSL version to 3.3.1. (PR [#7947](https://github.com/realm/realm-core/pull/7947)) ### Fixed * ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?) * Fixed an "invalid column key" exception when using a RQL "BETWEEN" query on an int or timestamp property across links. ([#7935](https://github.com/realm/realm-core/issues/7935), since v14.10.1) * Fixed conflict resolution bug related to ArrayErase and Clear instructions, which could sometimes cause an "Invalid prior_size" exception to prevent synchronization ([#7893](https://github.com/realm/realm-core/issues/7893), since v14.8.0). * Fixed bug which would prevent eventual consistency during conflict resolution. Affected clients would experience data divergence and potentially consistency errors as a result. ([PR #7955](https://github.com/realm/realm-core/pull/7955), since v14.8.0) +* Fixed issues loading the native Realm libraries on Linux ARMv7 systems when they linked against our bundled OpenSSL resulting in errors like `unexpected reloc type 0x03`. ([#7947](https://github.com/realm/realm-core/issues/7947), since v14.1.0) ### Breaking changes * None. @@ -21,7 +23,7 @@ ----------- ### Internals -* None. +* Reverted the bfd linker override in the Linux-armv7 toolchain file because the upstream OpenSSL issue it was working around was resolved. ---------------------------------------------- diff --git a/dependencies.yml b/dependencies.yml index 45bf8cf0afc..53700399032 100644 --- a/dependencies.yml +++ b/dependencies.yml @@ -1,6 +1,6 @@ PACKAGE_NAME: realm-core VERSION: 14.11.2 -OPENSSL_VERSION: 3.2.0 +OPENSSL_VERSION: 3.3.1 ZLIB_VERSION: 1.2.13 # https://github.com/10gen/baas/commits # 2f308db is 2024 July 10 diff --git a/tools/cmake/armv7-linux-gnueabihf.toolchain.cmake b/tools/cmake/armv7-linux-gnueabihf.toolchain.cmake index 296986fc5bc..423c44fdcd5 100644 --- a/tools/cmake/armv7-linux-gnueabihf.toolchain.cmake +++ b/tools/cmake/armv7-linux-gnueabihf.toolchain.cmake @@ -1,8 +1,3 @@ set(_TRIPLET "armv7-unknown-linux-gnueabihf") set(_TOOLCHAIN_MD5 fbf817b1428bb35c93be8e6c15f73d7d) include("${CMAKE_CURRENT_LIST_DIR}/linux.toolchain.base.cmake") - -# Explicitly opt-in to the slower bfd linker over gold, because gold in GCC 11.2 doesn't play nice with R_ARM_REL32 relocations -set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=bfd ${CMAKE_EXE_LINKER_FLAGS_INIT}") -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=bfd ${CMAKE_SHARED_LINKER_FLAGS_INIT}") -set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=bfd ${CMAKE_MODULE_LINKER_FLAGS_INIT}")