From f08fdbe638842f1dcb90a6c143225b21aaf411d8 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Fri, 19 Jul 2019 13:48:02 +0200 Subject: [PATCH] [ios] Switch to python offset tool (mono/mono#15744) The C# version doesn't work on 64bit. It would require to update its dependencies, but Zoltan already added a Python version for WebAssembly which works fine. Some notes: * changed the semantics of `--xcode-path` in order to match the output of `xcode-select -p` * switched to python3/pip3 * removed hack for arm64_32, it works properly now because the Python version uses stock `clang` * removed some leftover usages of `XCODE32_DIR`. Manually verified by comparing output with the C# version. This will unblock the iOS team when building on Catalina/Xcode11, as they can't consume SDK archives there. See https://github.com/xamarin/xamarin-macios/pull/6603#issuecomment-512803082 Contributes to https://github.com/mono/mono/issues/9621 Commit migrated from https://github.com/mono/mono/commit/3f7d33ce855dc220873b2e679698f65084dbc336 --- src/mono/mono/utils/mono-context.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/mono/mono/utils/mono-context.h b/src/mono/mono/utils/mono-context.h index d268424..77be278 100644 --- a/src/mono/mono/utils/mono-context.h +++ b/src/mono/mono/utils/mono-context.h @@ -48,19 +48,8 @@ typedef __m128d MonoContextSimdReg; #endif #elif defined(TARGET_ARM64) #define MONO_HAVE_SIMD_REG -#if defined(MONO_ARCH_ILP32) && defined(MONO_CPPSHARP_HACK) -/* We lie to the MonoAotOffsetsDumper tool and claim we targeting armv7k. This - * is because aarch64_ilp32 isn't available (yet). Unfortunately __uint128_t - * isn't defined for this target by the compiler, so we define a struct with - * the same size here in order to get the right offset */ -typedef struct -{ - guint8 v[16]; -} MonoContextSimdReg; -#else typedef __uint128_t MonoContextSimdReg; #endif -#endif /* * General notes about mono-context. -- 2.7.4