From 3e0f6665e3c9b7432404eb49efd74bff91f62935 Mon Sep 17 00:00:00 2001 From: Patrick Luby Date: Sun, 18 Feb 2024 20:26:08 +0100 Subject: [PATCH] Revert "tdf#152524 Add a __objc_fork_ok data section for Mac Intel executable" This reverts commit c6652e280b0690497abf27380dd064898f91db32. Reason for revert: patch may no longer be needed after commit b0656e6ca668a0719fbcb71b6d46c68093dda470. Change-Id: I20da2d0ff576f82272efbb193148e77c44a73d5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163540 Tested-by: Jenkins Reviewed-by: Patrick Luby --- desktop/Executable_soffice_bin.mk | 23 --------------------- desktop/util/macos/__objc_fork_ok_data.txt | Bin 4 -> 0 bytes 2 files changed, 23 deletions(-) delete mode 100644 desktop/util/macos/__objc_fork_ok_data.txt diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index 086abbae4df0..ad391b3dbc19 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -66,27 +66,4 @@ endif endif -ifeq ($(OS),MACOSX) -ifeq ($(CPUNAME),X86_64) - -# tdf#152524 Add a __objc_fork_ok data section for Mac Intel executable -# This attempts to fix a particularly difficult to debug crash due to -# memory corruption when gpgme tries to fork and exec a gpg command. -# For more background, see the following bug comment: -# https://bugs.documentfoundation.org/show_bug.cgi?id=152524#c39 -# This data section is only added in Mac Intel builds as it is a -# controversial approach and I have not seen any reports of this bug -# on Mac Silicon yet. So limit the fix only to Mac Intel in the hope -# that this controversial approach will automatically phase itself -# out when Apple eventually stops releasing new versions of macOS -# for Mac Intel. -# Note: the Objective C runtime doesn't appear to check the value of -# this data section, but set it to 1 in case that changes in the future. -$(eval $(call gb_Executable_add_ldflags,soffice_bin,\ - -sectcreate __DATA __objc_fork_ok $(SRCDIR)/desktop/util/macos/__objc_fork_ok_data.txt \ -)) - -endif -endif - # vim: set ts=4 sw=4 et: diff --git a/desktop/util/macos/__objc_fork_ok_data.txt b/desktop/util/macos/__objc_fork_ok_data.txt deleted file mode 100644 index f66c9cf4c9672fa2832bce76f4082fd97b823506..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZQ%U|;|M00;mA