From 3308718a6b41f09e9dd3c7caa9986cd6cb8f2eeb Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Mon, 4 Jan 2021 16:34:28 -0800 Subject: Revert "Add patch to make codesign_allocate compatible with Apple's" This reverts commit a4118c6e200e02e7560f8bc213697aa2909d95b1. Github-Pull: #20855 Rebased-From: a0eb4c551ebf8adfacb8c38c4ce56641fe379667 --- depends/patches/native_cctools/segalign.patch | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 depends/patches/native_cctools/segalign.patch (limited to 'depends/patches/native_cctools') diff --git a/depends/patches/native_cctools/segalign.patch b/depends/patches/native_cctools/segalign.patch deleted file mode 100644 index bcdbd67a6c..0000000000 --- a/depends/patches/native_cctools/segalign.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 7f2eb11ce6ebec7eb9b8e1429535e453054143e5 -Author: Pieter Wuille -Date: Sun Dec 13 11:34:21 2020 -0800 - - Make cctools_port's codesign_allocate compatible with Apple's - -diff --git a/cctools/libstuff/arch.c b/cctools/libstuff/arch.c -index 6f2332f..d85c25c 100644 ---- a/cctools/libstuff/arch.c -+++ b/cctools/libstuff/arch.c -@@ -134,7 +134,7 @@ static const struct cpu_entry cpu_entries[] = { - { CPU_TYPE_ARM, LITTLE_ENDIAN_BYTE_SEX, 0, 0x4000 }, - - /* desktop */ -- { CPU_TYPE_X86_64, LITTLE_ENDIAN_BYTE_SEX, 0x7fff5fc00000LL, 0x1000 }, -+ { CPU_TYPE_X86_64, LITTLE_ENDIAN_BYTE_SEX, 0x7fff5fc00000LL, 0x2000 /* Used to be 0x1000; changed to 0x2000 to match Apple's distributed codesign_allocate. */}, - { CPU_TYPE_I386, LITTLE_ENDIAN_BYTE_SEX, 0xc0000000, 0x1000 }, - { CPU_TYPE_POWERPC, BIG_ENDIAN_BYTE_SEX, 0xc0000000, 0x1000 }, - { CPU_TYPE_POWERPC64, BIG_ENDIAN_BYTE_SEX, 0x7ffff00000000LL, 0x1000 }, -- cgit v1.2.3