[d16-8][watchOS] Add x86_64 simulator support (#10059) #10133
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [watchOS] Add x86_64 simulator support * Bumps mono binaries to include x86_64 watchOS support * Build runtime/registrar x86_64 slices * Produce a 64 bit version of Xamarin.WatchOS.dll * Allow building x86_64 for watch simulators in mtouch * Let xharness know about x86_64 * [tests] Add x86_64 arch to test-libraries * Make dotnet package aware of x64 * [ObjCRuntime] Fix computing if we're calling a stret function or not in a 64-bit watchOS simulator. * [xharness] Re-enable some watchOS tests. Co-authored-by: Rolf Bjarne Kvinge <[email protected]> New commits in mono/mono: * mono/mono@ac596375c76 Add support for OP_FCONV_TO_I to mini-arm64.c. (xamarin#20548) * mono/mono@392fe5b87b2 [2020-02][watchOS] Add simwatch64 support (xamarin#20552) * mono/mono@a22ed3f094e Fix potential crash for Encoder.Convert (xamarin#20522) * mono/mono@970783731fc Bump to F# 5.0 (xamarin#20511) * mono/mono@32ab5066f72 Bump msbuild to fix a build issue * mono/mono@93a7fe77e8e Ensure special static slots respect alignment. (xamarin#20506) * mono/mono@3db5b358413 [debugger] Switch to GC Unsafe in signal handler callbacks (xamarin#20495) * mono/mono@af315f44c40 [2020-02][corlib] ThreadAbortException protection for ArraySortHelper (xamarin#20468) * mono/mono@ca11fb0fd81 [2020-02] Bump ikvm-fork to include mono/ikvm-fork#20 (xamarin#20452) Diff: https://github.com/mono/mono/compare/be2226b5a1c57df065efc4c1cf008d581e5cec7d..ac596375c762c6b8dbe3c802f0ce626004eab51c
dalexsoto
added
the
note-highlight
|
Build failure Test results6 tests failed, 128 tests passed.Failed tests
|
|
Build failure Test results6 tests failed, 128 tests passed.Failed tests
|
spouliot
approved these changes
Nov 23, 2020
| $(Q_DOTNET_GEN) \ | ||
| $(SYSTEM_CSC) $(DOTNET_FLAGS) -out:$(WATCHOS_DOTNET_BUILD_DIR)/64/Xamarin.WatchOS.dll -optimize \ | ||
| -publicsign -keyfile:$(PRODUCT_KEY_PATH) \ | ||
| -refout:$(WATCHOS_DOTNET_BUILD_DIR)/ref/Xamarin.WatchOS.dll \ |
There was a problem hiding this comment.
you should pick up Rolf's PR to remove the dupe (from /32/)
|
Will cherry-pick once @rolfbjarne merges it into main |
|
@dalexsoto |
| @@ -91,19 +92,34 @@ define NativeCompilationTemplate | |||
| ## watch simulator | |||
|
|
|||
| .libs/watchsimulator/%$(1).x86.o: %.m $(EXTRA_DEPENDENCIES) | .libs/watchsimulator | |||
| $$(call Q_2,OBJC, [watchsimulator]) $(SIMULATOR_CC) $(SIMULATORWATCH_OBJC_CFLAGS) $$(EXTRA_DEFINES) $(SIMW_I) -g $(2) -c $$< -o $$@ | |||
| $$(call Q_2,OBJC, [watchsimulator]) $(SIMULATOR_CC) $(SIMULATORWATCH_OBJC_CFLAGS) $$(EXTRA_DEFINES) $(SIMW_I) -g $(2) -c $$< -o $$@ | |||
mandel-macaque
approved these changes
Nov 23, 2020
…bit variant of Xamarin.WatchOS.dll. (xamarin#10136) * [src] Don't generate a reference assembly for both the 32-bit and 64-bit variant of Xamarin.WatchOS.dll. We only need one version, and in any case the code would write both the same file, causing corruption and random build problems later. Fixes this problem while building .NET packages: /Users/builder/jenkins/workspace/xamarin-macios/xamarin-macios/dotnet/package/common.csproj(75,5): error : Classification matches no files: Xamarin.WatchOS.dll [/Users/builder/jenkins/workspace/xamarin-macios/xamarin-macios/dotnet/package/Microsoft.watchOS.Ref/package.csproj] make[1]: *** [nupkgs/Microsoft.watchOS.Ref.7.1.100-ci.main.35+sha.a4a1fea86.nupkg] Error 1 * Fix the make rule too so that it doesn't claim it can generate the reference assembly.
|
Build failure |
tj-devel709
approved these changes
Nov 23, 2020
|
Build failure Test results5 tests failed, 129 tests passed.Failed tests
|
5 tasks
|
Moving to xcode12.3 |
|
Any ETA on when this will all be included in the next VS release (preview or stable)? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #9949
Bumps mono binaries to include x86_64 watchOS support
Build runtime/registrar x86_64 slices
Produce a 64 bit version of Xamarin.WatchOS.dll
Allow building x86_64 for watch simulators in mtouch
Let xharness know about x86_64
[tests] Add x86_64 arch to test-libraries
Make dotnet package aware of x64
[ObjCRuntime] Fix computing if we're calling a stret function or not in a 64-bit watchOS simulator.
[xharness] Re-enable some watchOS tests.
Co-authored-by: Rolf Bjarne Kvinge [email protected]
New commits in mono/mono:
Diff: https://github.com/mono/mono/compare/be2226b5a1c57df065efc4c1cf008d581e5cec7d..ac596375c762c6b8dbe3c802f0ce626004eab51c