Implement support for ARM64_32. Fixes #4864.

Make.config

@@ -226,7 +226,9 @@ SIMULATORWATCH_OBJC_CFLAGS = $(SIMULATORWATCH_CFLAGS) $(COMMON_SIMULATOR_OBJC_CF
 
 DEVICEWATCH_SDK         = $(XCODE_DEVELOPER_ROOT)/Platforms/WatchOS.platform/Developer/SDKs/WatchOS$(WATCH_SDK_VERSION).sdk
 DEVICEWATCH_CFLAGS      = -arch armv7k -mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) -fembed-bitcode $(IOS_COMMON_DEFINES)
+DEVICEWATCH64_32_CFLAGS = -arch arm64_32 -mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) $(CFLAGS) -fembed-bitcode $(IOS_COMMON_DEFINES)
 DEVICEWATCH_OBJC_CFLAGS = $(DEVICEWATCH_CFLAGS) $(DEVICE_OBJC_CFLAGS)
+DEVICEWATCH64_32_OBJC_CFLAGS = $(DEVICEWATCH64_32_CFLAGS) $(DEVICE_OBJC_CFLAGS)
 
 # TVOS
 

Versions-ios.plist.in

@@ -142,6 +142,7 @@
 		<string>http-client-handlers</string>
 		<string>mono-symbol-archive</string>
 		<string>sgen-concurrent-gc</string>
+		<string>arm64_32</string>
 	</array>
 	<key>Optimizations</key>
 	<dict>

builds/Makefile

@@ -1310,55 +1310,101 @@ WATCHOS_BIN_PATH = $(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/u
 
 ifdef INCLUDE_WATCH
 ifdef INCLUDE_DEVICE
-build:: build-targetwatch
-clean-local:: clean-targetwatch
+build:: build-targetwatch build-targetwatch64_32
+clean-local:: clean-targetwatch clean-targetwatch64_32
 install-local:: install-watchos
 all-local:: install-watchos
 
 targetwatch: build-targetwatch install-watchos
-watchos:: targetwatch
+targetwatch64_32: build-targetwatch64_32 install-watch64_32
+watchos:: targetwatch targetwatch64_32
 
-.PHONY: targetwatch
+.PHONY: targetwatch targetwatch64_32
 
 .stamp-build-targetwatch: .stamp-build-crosswatch $(MONO_PATH)/configure $(SDK_CONFIG) $(MONO_DEPENDENCIES)
 	$(MAKE) -C $(SDK_BUILDDIR) package-ios-targetwatch $(SDK_ARGS)
 	$(Q) mkdir -p $(BUILD_DESTDIR)/targetwatch
 	$(Q) $(CP) -r $(SDK_DESTDIR)/ios-targetwatch-release/* $(BUILD_DESTDIR)/targetwatch
 	$(Q) touch $@
 
+.stamp-build-targetwatch64_32: $(MONO_PATH)/configure $(SDK_CONFIG) $(MONO_DEPENDENCIES)
+	$(MAKE) -C $(SDK_BUILDDIR) package-ios-targetwatch64_32 $(SDK_ARGS)
+	$(Q) mkdir -p $(BUILD_DESTDIR)/targetwatch64_32
+	$(Q) $(CP) -r $(SDK_DESTDIR)/ios-targetwatch64_32-release/* $(BUILD_DESTDIR)/targetwatch64_32
+	$(Q) touch $@
+
 build-targetwatch: .stamp-build-targetwatch
+build-targetwatch64_32: .stamp-build-targetwatch64_32
 
 clean-targetwatch:
 	$(Q) rm -rf $(BUILD_DESTDIR)/targetwatch .stamp-*-targetwatch
 	$(MAKE) -C $(SDK_BUILDDIR) clean-ios-targetwatch $(SDK_ARGS)
 
-setup-watchos: setup-targetwatch
-build-watchos: build-targetwatch
-clean-watchos: clean-targetwatch
-
-WATCHOS_TARGET_LIBMONOSGEN                = $(BUILD_DESTDIR)/targetwatch/lib/libmonosgen-2.0.a
-WATCHOS_TARGET_SHAREDMONOSGEN             = $(BUILD_DESTDIR)/targetwatch/lib/libmonosgen-2.0.dylib
-WATCHOS_TARGET_LIBLOGPROFILER             = $(BUILD_DESTDIR)/targetwatch/lib/libmono-profiler-log-static.a
-WATCHOS_TARGET_LIBMONOEEINTERP            = $(BUILD_DESTDIR)/targetwatch/lib/libmono-ee-interp.a
-WATCHOS_TARGET_LIBMONOICALLTABLE          = $(BUILD_DESTDIR)/targetwatch/lib/libmono-icall-table.a
-WATCHOS_TARGET_LIBMONOILGEN               = $(BUILD_DESTDIR)/targetwatch/lib/libmono-ilgen.a
-WATCHOS_TARGET_SHAREDLIBLOGPROFILER       = $(BUILD_DESTDIR)/targetwatch/lib/libmono-profiler-log.0.dylib
-WATCHOS_TARGET_LIBMONONATIVECOMPAT        = $(BUILD_DESTDIR)/targetwatch/lib/libmono-native-compat.a
-WATCHOS_TARGET_LIBMONONATIVEUNIFIED       = $(BUILD_DESTDIR)/targetwatch/lib/libmono-native-unified.a
-WATCHOS_TARGET_SHAREDLIBMONONATIVECOMPAT  = $(BUILD_DESTDIR)/targetwatch/lib/libmono-native-compat.dylib
-WATCHOS_TARGET_SHAREDLIBMONONATIVEUNIFIED = $(BUILD_DESTDIR)/targetwatch/lib/libmono-native-unified.dylib
-
-$(WATCHOS_TARGET_LIBMONOSGEN): .stamp-build-targetwatch
-$(WATCHOS_TARGET_SHAREDMONOSGEN): .stamp-build-targetwatch
-$(WATCHOS_TARGET_LIBLOGPROFILER): .stamp-build-targetwatch
-$(WATCHOS_TARGET_LIBMONOEEINTERP): .stamp-build-targetwatch
-$(WATCHOS_TARGET_LIBMONOICALLTABLE): .stamp-build-targetwatch
-$(WATCHOS_TARGET_LIBMONOILGEN): .stamp-build-targetwatch
-$(WATCHOS_TARGET_SHAREDLIBLOGPROFILER): .stamp-build-targetwatch
-$(WATCHOS_TARGET_LIBMONONATIVECOMPAT): .stamp-build-targetwatch
-$(WATCHOS_TARGET_LIBMONONATIVEUNIFIED): .stamp-build-targetwatch
-$(WATCHOS_TARGET_SHAREDLIBMONONATIVECOMPAT): .stamp-build-targetwatch
-$(WATCHOS_TARGET_SHAREDLIBMONONATIVEUNIFIED): .stamp-build-targetwatch
+clean-targetwatch64_32:
+	$(Q) rm -rf $(BUILD_DESTDIR)/targetwatch64_32 .stamp-*-targetwatch64_32
+	$(MAKE) -C $(SDK_BUILDDIR) clean-ios-targetwatch64_32 $(SDK_ARGS)
+
+setup-watchos: setup-targetwatch setup-targetwatch64_32
+build-watchos: build-targetwatch build-targetwatch64_32
+clean-watchos: clean-targetwatch clean-targetwatch64_32
+
+WATCHOS_TARGET_LIBMONOSGEN = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmonosgen-2.0.a \
+	$(BUILD_DESTDIR)/targetwatch64_32/lib/libmonosgen-2.0.a
+
+WATCHOS_TARGET_SHAREDMONOSGEN = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmonosgen-2.0.dylib \
+	$(BUILD_DESTDIR)/targetwatch64_32/lib/libmonosgen-2.0.dylib
+
+WATCHOS_TARGET_LIBLOGPROFILER = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmono-profiler-log-static.a \
+	$(BUILD_DESTDIR)/targetwatch64_32/lib/libmono-profiler-log-static.a
+
+WATCHOS_TARGET_LIBMONOEEINTERP = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmono-ee-interp.a \
+	$(BUILD_DESTDIR)/targetwatch64_32/lib/libmono-ee-interp.a
+
+WATCHOS_TARGET_LIBMONOICALLTABLE = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmono-icall-table.a \
+	$(BUILD_DESTDIR)/targetwatch64_32/lib/libmono-icall-table.a
+
+WATCHOS_TARGET_LIBMONOILGEN = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmono-ilgen.a \
+	$(BUILD_DESTDIR)/targetwatch64_32/lib/libmono-ilgen.a
+
+WATCHOS_TARGET_SHAREDLIBLOGPROFILER = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmono-profiler-log.0.dylib \
+	$(BUILD_DESTDIR)/targetwatch64_32/lib/libmono-profiler-log.0.dylib
+
+WATCHOS_TARGET_LIBMONONATIVECOMPAT        = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmono-native-compat.a \
+
+WATCHOS_TARGET_LIBMONONATIVEUNIFIED       = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmono-native-unified.a \
+	$(BUILD_DESTDIR)/targetwatch64_32/lib/libmono-native.a \
+
+WATCHOS_TARGET_SHAREDLIBMONONATIVECOMPAT  = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmono-native-compat.dylib \
+
+WATCHOS_TARGET_SHAREDLIBMONONATIVEUNIFIED = \
+	$(BUILD_DESTDIR)/targetwatch/lib/libmono-native-unified.dylib \
+	$(BUILD_DESTDIR)/targetwatch64_32/lib/libmono-native.dylib \
+
+WATCHOS_TARGET_MONOFRAMEWORK = \
+	$(BUILD_DESTDIR)/targetwatch/tmp-lib/Mono \
+	$(BUILD_DESTDIR)/targetwatch64_32/tmp-lib/Mono
+
+$(WATCHOS_TARGET_LIBMONOSGEN): .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_SHAREDMONOSGEN): .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_LIBLOGPROFILER): .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_LIBMONOEEINTERP): .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_LIBMONOICALLTABLE): .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_LIBMONOILGEN): .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_SHAREDLIBLOGPROFILER): .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_LIBMONONATIVECOMPAT):  .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_LIBMONONATIVEUNIFIED):  .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_SHAREDLIBMONONATIVECOMPAT):  .stamp-build-targetwatch .stamp-build-targetwatch64_32
+$(WATCHOS_TARGET_SHAREDLIBMONONATIVEUNIFIED):  .stamp-build-targetwatch .stamp-build-targetwatch64_32
 
 device:: watchos
 
@@ -1385,7 +1431,9 @@ $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib/libmonosgen-2.0.a: $(WATCHOS_TARGET
 	$(Q) $(WATCHOS_BIN_PATH)/lipo $(WATCHOS_TARGET_LIBMONOSGEN) -create -output $@
 
 $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib/libmonosgen-2.0.dylib: $(WATCHOS_TARGET_SHAREDMONOSGEN) | $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib
-	$(Q_STRIP) $(WATCHOS_BIN_PATH)/bitcode_strip $(WATCHOS_TARGET_SHAREDMONOSGEN) -m -o $@
+	$(Q_STRIP) $(WATCHOS_BIN_PATH)/bitcode_strip $(BUILD_DESTDIR)/targetwatch/lib/libmonosgen-2.0.dylib -m -o $(BUILD_DESTDIR)/targetwatch/tmp-lib/libmonosgen-2.0.dylib
+	$(Q_STRIP) $(WATCHOS_BIN_PATH)/bitcode_strip $(BUILD_DESTDIR)/targetwatch64_32/lib/libmonosgen-2.0.dylib -m -o $(BUILD_DESTDIR)/targetwatch64_32/tmp-lib/libmonosgen-2.0.dylib
+	$(Q_STRIP) $(WATCHOS_BIN_PATH)/lipo $(BUILD_DESTDIR)/targetwatch/tmp-lib/libmonosgen-2.0.dylib $(BUILD_DESTDIR)/targetwatch64_32/tmp-lib/libmonosgen-2.0.dylib -create -output $@
 	$(Q) $(WATCHOS_BIN_PATH)/install_name_tool -id @rpath/libmonosgen-2.0.dylib $@
 	$(Q) dsymutil -t 4 -o $@.dSYM $@
 
@@ -1402,8 +1450,13 @@ $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib/libmono-ilgen.a: $(WATCHOS_TARGET_L
 	$(Q) $(WATCHOS_BIN_PATH)/lipo $(WATCHOS_TARGET_LIBMONOILGEN) -create -output $@
 
 $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib/libmono-profiler-log.dylib: $(WATCHOS_TARGET_SHAREDLIBLOGPROFILER) | $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib
-	$(Q) $(WATCHOS_BIN_PATH)/bitcode_strip $(WATCHOS_TARGET_SHAREDLIBLOGPROFILER) -m -o $@
-	$(Q) $(WATCHOS_BIN_PATH)/install_name_tool -id @rpath/libmono-profiler-log.dylib -change $(SDK_DESTDIR)/ios-targetwatch-release/lib/libmonosgen-2.0.1.dylib @rpath/libmonosgen-2.0.dylib $@
+	$(Q) $(WATCHOS_BIN_PATH)/bitcode_strip $(BUILD_DESTDIR)/targetwatch/lib/libmono-profiler-log.0.dylib -m -o $(BUILD_DESTDIR)/targetwatch/tmp-lib/libmono-profiler-log.0.dylib
+	$(Q) $(WATCHOS_BIN_PATH)/bitcode_strip $(BUILD_DESTDIR)/targetwatch64_32/lib/libmono-profiler-log.0.dylib -m -o $(BUILD_DESTDIR)/targetwatch64_32/tmp-lib/libmono-profiler-log.0.dylib
+	$(Q) $(WATCHOS_BIN_PATH)/lipo $(BUILD_DESTDIR)/targetwatch/tmp-lib/libmono-profiler-log.0.dylib $(BUILD_DESTDIR)/targetwatch64_32/tmp-lib/libmono-profiler-log.0.dylib -create -output $@
+	$(Q) $(WATCHOS_BIN_PATH)/install_name_tool -id @rpath/libmono-profiler-log.dylib \
+		-change $(SDK_DESTDIR)/ios-targetwatch-release/lib/libmonosgen-2.0.1.dylib @rpath/libmonosgen-2.0.dylib \
+		-change $(SDK_DESTDIR)/ios-targetwatch64_32-release/lib/libmonosgen-2.0.1.dylib @rpath/libmonosgen-2.0.dylib \
+		$@
 	$(Q) dsymutil -t 4 -o $@.dSYM $@
 
 $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib/libmono-native-compat.a: $(WATCHOS_TARGET_LIBMONONATIVECOMPAT) | $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib
@@ -1418,15 +1471,22 @@ $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib/libmono-native-compat.dylib: $(WATC
 	$(Q) dsymutil -t 4 -o $@.dSYM $@
 
 $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib/libmono-native-unified.dylib: $(WATCHOS_TARGET_SHAREDLIBMONONATIVEUNIFIED) | $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib
-	$(Q) $(WATCHOS_BIN_PATH)/bitcode_strip $(WATCHOS_TARGET_SHAREDLIBMONONATIVEUNIFIED) -m -o $@
-	$(Q) $(WATCHOS_BIN_PATH)/install_name_tool -id @rpath/libmono-native-unified.dylib -change $(SDK_DESTDIR)/ios-targetwatch-release/lib/libmono-native-unified.dylib @rpath/libmono-native-unified.dylib -change $(SDK_DESTDIR)/ios-targetwatch-release/lib/libmonosgen-2.0.1.dylib @rpath/libmonosgen-2.0.dylib $@
+	$(Q_STRIP) $(WATCHOS_BIN_PATH)/bitcode_strip $(BUILD_DESTDIR)/targetwatch/lib/libmono-native-unified.dylib -m -o $(BUILD_DESTDIR)/targetwatch/tmp-lib/libmono-native-unified.dylib
+	$(Q_STRIP) $(WATCHOS_BIN_PATH)/bitcode_strip $(BUILD_DESTDIR)/targetwatch64_32/lib/libmono-native.dylib -m -o $(BUILD_DESTDIR)/targetwatch64_32/tmp-lib/libmono-native.dylib
+	$(Q_STRIP) $(WATCHOS_BIN_PATH)/lipo $(BUILD_DESTDIR)/targetwatch/tmp-lib/libmono-native-unified.dylib $(BUILD_DESTDIR)/targetwatch64_32/tmp-lib/libmono-native.dylib -create -output $@
+	$(Q) $(WATCHOS_BIN_PATH)/install_name_tool -id @rpath/libmono-native-unified.dylib \
+		-change $(SDK_DESTDIR)/ios-targetwatch64_32-release/lib/libmono-native.dylib @rpath/libmono-native-unified.dylib \
+		-change $(SDK_DESTDIR)/ios-targetwatch64_32-release/lib/libmonosgen-2.0.1.dylib @rpath/libmonosgen-2.0.dylib \
+		-change $(SDK_DESTDIR)/ios-targetwatch-release/lib/libmono-native-unified.dylib @rpath/libmono-native-unified.dylib \
+		-change $(SDK_DESTDIR)/ios-targetwatch-release/lib/libmonosgen-2.0.1.dylib @rpath/libmonosgen-2.0.dylib \
+		$@
 	$(Q) dsymutil -t 4 -o $@.dSYM $@
 
 $(WATCHOS_DIRECTORIES):
 	$(Q) mkdir -p $@
 
-$(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/Frameworks/Mono.framework/Mono: $(BUILD_DESTDIR)/targetwatch/tmp-lib/Mono | $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/Frameworks/Mono.framework
-	$(Q) $(CP) $< $@
+$(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/Frameworks/Mono.framework/Mono: $(WATCHOS_TARGET_MONOFRAMEWORK) | $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/Frameworks/Mono.framework
+	$(Q) lipo $(WATCHOS_TARGET_MONOFRAMEWORK) -create -output $@
 	$(Q) dsymutil -t 4 -o $(patsubst %/,%,$(dir $@)).dSYM $@
 
 $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/Frameworks/Mono.framework/Info.plist: Mono.framework-watchos.Info.plist | $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/Frameworks/Mono.framework
@@ -1435,6 +1495,9 @@ $(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/Frameworks/Mono.framework/Info.plist: Mono.
 $(BUILD_DESTDIR)/targetwatch/tmp-lib/Mono: $(BUILD_DESTDIR)/targetwatch/lib/libmonosgen-2.0.a
 	$(Q_GEN) CC="$(IOS_CC)" ./create-shared-library.sh $< $@ -arch armv7k -install_name @rpath/Mono.framework/Mono -mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) -lc++ -fembed-bitcode
 
+$(BUILD_DESTDIR)/targetwatch64_32/tmp-lib/Mono: $(BUILD_DESTDIR)/targetwatch64_32/lib/libmonosgen-2.0.a
+	$(Q_GEN) CC="$(IOS_CC)" ./create-shared-library.sh $< $@ -arch arm64_32 -install_name @rpath/Mono.framework/Mono -mwatchos-version-min=$(MIN_WATCHOS_SDK_VERSION) -isysroot $(DEVICEWATCH_SDK) -lc++ -fembed-bitcode
+
 install-watchos: $(WATCHOS_TARGETS)
 
 endif # INCLUDE_DEVICE

mk/rules.mk

@@ -12,6 +12,7 @@ DEV64_I := $(COMMON_I)
 
 SIMW_I  := $(COMMON_I)
 DEVW_I  := $(COMMON_I)
+DEVW64_32_I := $(COMMON_I)
 
 SIM_TV_I:= $(COMMON_I)
 DEV_TV_I:= $(COMMON_I)
@@ -120,6 +121,18 @@ define NativeCompilationTemplate
 .libs/watchos/%$(1).armv7k.framework: | .libs/watchos
 	$$(call Q_2,LD,    [watchos]) $(DEVICE_CC) $(DEVICEWATCH_CFLAGS)          $$(EXTRA_FLAGS) -dynamiclib -o $$@ $$^ -F$(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/Frameworks -fapplication-extension
 
+.libs/watchos/%$(1).arm64_32.o: %.m $(EXTRA_DEPENDENCIES) | .libs/watchos
+	$$(call Q_2,OBJC,  [watchos]) $(DEVICE_CC) $(DEVICEWATCH64_32_OBJC_CFLAGS)    $$(EXTRA_DEFINES) $(DEVW64_32_I) -g $(2) -c $$< -o $$@
+
+.libs/watchos/%$(1).arm64_32.o: %.c $(EXTRA_DEPENDENCIES) | .libs/watchos
+	$$(call Q_2,CC,    [watchos]) $(DEVICE_CC) $(DEVICEWATCH64_32_CFLAGS)         $$(EXTRA_DEFINES) $(DEVW64_32_I) -g $(2) -c $$< -o $$@
+
+.libs/watchos/%$(1).arm64_32.dylib: | .libs/watchos
+	$$(call Q_2,LD,    [watchos]) $(DEVICE_CC) $(DEVICEWATCH64_32_CFLAGS)          $$(EXTRA_FLAGS) -dynamiclib -o $$@ $$^ -L$(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/usr/lib -fapplication-extension
+
+.libs/watchos/%$(1).arm64_32.framework: | .libs/watchos
+	$$(call Q_2,LD,    [watchos]) $(DEVICE_CC) $(DEVICEWATCH64_32_CFLAGS)          $$(EXTRA_FLAGS) -dynamiclib -o $$@ $$^ -F$(IOS_DESTDIR)$(XAMARIN_WATCHOS_SDK)/Frameworks -fapplication-extension
+
 ## tv simulator
 
 .libs/tvos/%$(1).x86_64.o: %.m $(EXTRA_DEPENDENCIES) | .libs/tvos

msbuild/Xamarin.iOS.Tasks.Core/Tasks/MTouchTaskBase.cs

@@ -24,6 +24,7 @@ enum TargetArchitecture
 		ARMv7s       = 16,
 		ARMv7k       = 32,
 		ARM64        = 64,
+		ARM64_32     = 128,
 
 		// Note: needed for backwards compatability
 		ARMv6_ARMv7  = ARMv6 | ARMv7,
@@ -486,6 +487,9 @@ protected override string GenerateCommandLineCommands ()
 				if (architectures.HasFlag (TargetArchitecture.ARMv7k))
 					abi += (abi.Length > 0 ? "," : "") + "armv7k" + llvm;
 
+				if (architectures.HasFlag (TargetArchitecture.ARM64_32))
+					abi += (abi.Length > 0 ? "," : "") + "arm64_32" + llvm;
+
 				if (string.IsNullOrEmpty (abi))
 					abi = "armv7" + llvm + thumb;
 			}

msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS.AppExtension.Common.targets

@@ -28,7 +28,7 @@ Copyright (C) 2015-2016 Xamarin. All rights reserved.
 
 		<!-- Enable nuget package conflict resolution -->
 		<ResolveAssemblyConflicts>true</ResolveAssemblyConflicts>
-		<UseFakeWatchOS4_3Sdk Condition="'$(UseFakeWatchOS4_3Sdk)' == ''">True</UseFakeWatchOS4_3Sdk>
+		<UseFakeWatchOS4_3Sdk Condition="'$(UseFakeWatchOS4_3Sdk)' == ''">False</UseFakeWatchOS4_3Sdk>
 	</PropertyGroup>
 
 	<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />

runtime/Makefile

@@ -197,7 +197,7 @@ $(eval $(call PlatformTemplate,ios,IOS,armv7 armv7s arm64,x86 x86_64,IOS,IPHONE)
 endif
 
 ifdef INCLUDE_WATCH
-$(eval $(call PlatformTemplate,watchos,WATCHOS,armv7k,x86,WATCH,WATCH))
+$(eval $(call PlatformTemplate,watchos,WATCHOS,armv7k arm64_32,x86,WATCH,WATCH))
 endif
 
 ifdef INCLUDE_TVOS
@@ -336,6 +336,7 @@ armv7_$(1)$(3)_OBJECTS  = $$(patsubst %,.libs/$(1)/%$(4).armv7.o,$$($(2)_SOURCE_
 armv7s_$(1)$(3)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(4).armv7s.o,$$($(2)_SOURCE_STEMS))
 armv7k_$(1)$(3)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(4).armv7k.o,$$($(2)_SOURCE_STEMS))
 arm64_$(1)$(3)_OBJECTS  = $$(patsubst %,.libs/$(1)/%$(4).arm64.o,$$($(2)_SOURCE_STEMS))  $$(patsubst %,.libs/$(1)/%$(4).arm64.o,$$($(2)_ARM64_SOURCE_STEMS))
+arm64_32_$(1)$(3)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(4).arm64_32.o,$$($(2)_SOURCE_STEMS))
 
 $$(foreach arch,$$($(2)_ARCHITECTURES),$$(eval $$(call LibXamarinArchTemplate,$(1),$(2),$(3),$(4),$$(arch))))
 
@@ -361,6 +362,9 @@ $$(foreach arch,$$($(2)_ARCHITECTURES),$$(eval $$(call LibXamarinArchTemplate,$(
 .libs/$(1)/libxamarin$(4).armv7k.dylib: EXTRA_FLAGS=$$($(1)$(3)_COMMON_DYLIB_FLAGS)
 .libs/$(1)/libxamarin$(4).armv7k.dylib: $$(armv7k_$(1)$(3)_OBJECTS)
 
+.libs/$(1)/libxamarin$(4).arm64_32.dylib: EXTRA_FLAGS=$$($(1)$(3)_COMMON_DYLIB_FLAGS)
+.libs/$(1)/libxamarin$(4).arm64_32.dylib: $$(arm64_32_$(1)$(3)_OBJECTS)
+
 .libs/$(1)/Xamarin$(4).x86.framework: EXTRA_FLAGS=$$($(1)$(3)_COMMON_FRAMEWORK_FLAGS)
 .libs/$(1)/Xamarin$(4).x86.framework: $$(x86_$(1)$(3)_OBJECTS)
 
@@ -378,6 +382,9 @@ $$(foreach arch,$$($(2)_ARCHITECTURES),$$(eval $$(call LibXamarinArchTemplate,$(
 
 .libs/$(1)/Xamarin$(4).armv7k.framework: EXTRA_FLAGS=$$($(1)$(3)_COMMON_FRAMEWORK_FLAGS)
 .libs/$(1)/Xamarin$(4).armv7k.framework: $$(armv7k_$(1)$(3)_OBJECTS)
+
+.libs/$(1)/Xamarin$(4).arm64_32.framework: EXTRA_FLAGS=$$($(1)$(3)_COMMON_FRAMEWORK_FLAGS)
+.libs/$(1)/Xamarin$(4).arm64_32.framework: $$(arm64_32_$(1)$(3)_OBJECTS)
 endef
 
 $(eval $(call LibXamarinTemplate,ios,IOS))

runtime/bindings.h

@@ -226,7 +226,7 @@ struct MPSImageHistogramInfoWrapper {
 	// entire struct on a 16-byte boundary, which doesn't match how we've
 	// defined it in managed code (explicit layout, but no specific alignment).
 	// So we need to manually pad the struct to match the managed definition.
-#if defined (__x86_64__) || defined (__arm64__)
+#if !defined(__ILP32__)
 	uint8_t dummy[7];
 #else
 	uint8_t dummy[11];

runtime/trampolines-varargs.m

@@ -1,4 +1,4 @@
-#if !defined (__i386__) && !defined (__x86_64__) && !defined (__arm64__)
+#if !defined (__i386__) && !defined (__x86_64__) && !(defined (__arm64__) && !defined(__ILP32__))
 #define __VARARGS_TRAMPOLINES__ 1
 #endif