[ios] initial watch64_32 support #11691

lewurm · 2018-11-15T01:45:59Z

$ file ios-targetwatch64_32-release/mono/mini/.libs/libmonosgen-2.0.dylib
ios-targetwatch64_32-release/mono/mini/.libs/libmonosgen-2.0.dylib: Mach-O dynamically linked shared library arm64_32_v8

Note, it doesn't add an AOT compiler yet.

Contributes to #10641

lewurm · 2018-11-15T01:46:56Z

sdks/builds/ios.mk


 ios-target32_SYSROOT = $(ios_sysroot)
 ios-target32s_SYSROOT = $(ios_sysroot)
 ios-target64_SYSROOT = $(ios_sysroot)
 ios-targettv_SYSROOT = $(tvos_sysroot)
 ios-targetwatch_SYSROOT = $(watchos_sysroot)
+ios-targetwatch64_32_SYSROOT = $(watchos5_sysroot)


not quite happy with the naming here: watch64_32 gonna need at least watchOS 5.0, which is different to what watch needs. Any suggestions?

I'd suggest naming it simply watch64.

@vargaz what will you name it when Apple releases a watch that does plain arm64 then?

If that ever happens, we can rename it.

That'll be watch6464. :)

lewurm · 2018-11-15T01:47:20Z

sdks/builds/ios.mk

+$(eval $(call iOSDeviceTemplate,target64,aarch64-apple-darwin10,arm64))
+$(eval $(call iOSDeviceTemplate,targettv,aarch64-apple-darwin10,arm64))
+$(eval $(call iOSDeviceTemplate,targetwatch,armv7k-apple-darwin10,armv7k))
+$(eval $(call iOSDeviceTemplate,targetwatch64_32,aarch64-apple-darwin10_ilp32,arm64_32))


@luhenry is the archive target automatically going to pick up that new target?

The target fails on CI because it requires Xcode10, but we only have Xcode9 on the bots. So the answer is yes 🙂

resolved by #12055

vargaz · 2018-11-15T03:11:15Z

configure.ac

+		TARGET=ARM64;
+		arch_target=arm64
+		AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
+		sizeof_register=8


The define was renamed in another PR.

thanks, fixed.

rolfbjarne · 2018-11-15T12:06:52Z

sdks/builds/ios.mk


 ios-target32_CPPFLAGS = -DHOST_IOS
 ios-target32s_CPPFLAGS = -DHOST_IOS
 ios-target64_CPPFLAGS = -DHOST_IOS
 ios-targettv_CPPFLAGS = -DHOST_APPLETVOS -DTARGET_APPLETVOS
 ios-targetwatch_CPPFLAGS = -DHOST_IOS -DHOST_WATCHOS
+ios-targetwatch64_32_CPPFLAGS = -DHOST_IOS -DHOST_WATCHOS


Question related to the surrounding code instead of this PR: why does targettv_CPPFLAGS not define HOST_IOS when both the iOS and watchOS versions do? And why doesn't the iOS and watchOS variables define a TARGET_* variable when the tvOS one does?

good question, I opened an issue: #11697

lewurm · 2018-11-15T20:26:06Z

This doesn't work yet, as we need Xcode94 and Xcode10 on the bots. This requires changes in the build system so that Xcode94 is used for building 32bit macOS binaries, and Xcode10 otherwise.

The bots are already in order:
https://xamarinhq.slack.com/archives/C03CEMRFL/p1542299650611500

So the plan now is:
On bots

xam-mac-pro-2

xam-mac-pro-3

xam-mac-pro-4

xam-mac-pro-5

Do the following

Install Xcode 10.1 to /Applications/Xcode101.app

Rename /Applications/Xcode.app to /Applications/Xcode94.app

Symlink /Applications/Xcode.app -> /Applications/Xcode94.app
(preserving Xcode 9.4 as the default Xcode)

marek-safar · 2018-11-26T15:13:24Z

sdks/builds/ios.mk


 ios-targettv_CFLAGS = -fembed-bitcode -fno-gnu-inline-asm
 ios-targettv_CXXFLAGS = -fembed-bitcode -fno-gnu-inline-asm
 ios-targetwatch_CFLAGS = -fembed-bitcode -fno-gnu-inline-asm
 ios-targetwatch_CXXFLAGS = -fembed-bitcode -fno-gnu-inline-asm
+ios-targetwatch64_32_CFLAGS = -fembed-bitcode -fno-gnu-inline-asm
+5os-targetwatch64_32_CXXFLAGS = -fembed-bitcode -fno-gnu-inline-asm


This looks like typo

mono/utils/mono-log-darwin.c

…it cross compilers. (mono#12055) Forward port of mono#10139 Needed for arm64_32 (mono#11691): We still need to build AOT compilers that are 32bit, which is only possible with Xcode9. However, arm64_32 needs Xcode10.

lewurm · 2019-01-02T12:50:14Z

ready to be reviewed & merged

lewurm · 2019-01-03T14:56:14Z

@monojenkins build Windows x64

…it cross compilers. (mono#12055) Forward port of mono#10139 Needed for arm64_32 (mono#11691): We still need to build AOT compilers that are 32bit, which is only possible with Xcode9. However, arm64_32 needs Xcode10.

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

lewurm · 2019-01-16T10:56:17Z

@monojenkins backport 2018-10
@monojenkins backport 2018-12

monojenkins · 2019-01-16T10:57:16Z

@lewurm backporting to 2018-10 failed, the patch results in conflicts:

Applying: [ios] initial watch64_32 support
Using index info to reconstruct a base tree...
M	configure.ac
M	mono/utils/mono-context.h
M	sdks/builds/ios.mk
M	sdks/versions.mk
Falling back to patching base and 3-way merge...
Auto-merging sdks/versions.mk
Auto-merging sdks/builds/ios.mk
CONFLICT (content): Merge conflict in sdks/builds/ios.mk
Auto-merging mono/utils/mono-context.h
Auto-merging configure.ac
error: Failed to merge in the changes.
Patch failed at 0001 [ios] initial watch64_32 support

Please backport manually!

…it cross compilers. (mono#12055) Forward port of mono#10139 Needed for arm64_32 (mono#11691): We still need to build AOT compilers that are 32bit, which is only possible with Xcode9. However, arm64_32 needs Xcode10.

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

…it cross compilers. (mono#12055) Forward port of mono#10139 Needed for arm64_32 (mono#11691): We still need to build AOT compilers that are 32bit, which is only possible with Xcode9. However, arm64_32 needs Xcode10.

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

[2018-10] [ios] arm64_32 build support Backport of #11652, #12055 and #11691 Heads up: This will require changes to `xamarin-macios` regarding setting the XCODE location. I'll handle that for the XI 2018-10 integration branch when this is merged.

…it cross compilers. (#12055) Forward port of #10139 Needed for arm64_32 (#11691): We still need to build AOT compilers that are 32bit, which is only possible with Xcode9. However, arm64_32 needs Xcode10.

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

…it cross compilers. (#12055) Forward port of #10139 Needed for arm64_32 (#11691): We still need to build AOT compilers that are 32bit, which is only possible with Xcode9. However, arm64_32 needs Xcode10.

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

…it cross compilers. (mono#12055) Forward port of mono#10139 Needed for arm64_32 (mono#11691): We still need to build AOT compilers that are 32bit, which is only possible with Xcode9. However, arm64_32 needs Xcode10.

lewurm requested review from vargaz, rolfbjarne and luhenry November 15, 2018 01:45

lewurm requested a review from marek-safar as a code owner November 15, 2018 01:45

lewurm commented Nov 15, 2018

View reviewed changes

lewurm mentioned this pull request Nov 15, 2018

New arm64_32 architecture (watchOS 5) #10641

Closed

3 tasks

vargaz reviewed Nov 15, 2018

View reviewed changes

rolfbjarne reviewed Nov 15, 2018

View reviewed changes

lewurm force-pushed the mono-watch4 branch from c87a68d to 1180a1b Compare November 15, 2018 13:26

lewurm added the do-not-merge label Nov 15, 2018

luhenry approved these changes Nov 15, 2018

View reviewed changes

marek-safar reviewed Nov 26, 2018

View reviewed changes

jaykrell reviewed Dec 1, 2018

View reviewed changes

mono/utils/mono-log-darwin.c Show resolved Hide resolved

lewurm mentioned this pull request Dec 13, 2018

[sdks] Add a XCODE32_DIR make variable and use it to compile the 32 bit cross compilers. #12055

Merged

lewurm force-pushed the mono-watch4 branch from 1180a1b to 5dd41bd Compare January 2, 2019 10:12

lewurm added 2 commits January 2, 2019 13:33

[ios] initial watch64_32 support

65ea68c

align iOSSimulatorTemplate with iOSDeviceTemplate

6c15674

lewurm force-pushed the mono-watch4 branch from 5dd41bd to 6c15674 Compare January 2, 2019 12:34

lewurm removed the do-not-merge label Jan 2, 2019

luhenry approved these changes Jan 7, 2019

View reviewed changes

luhenry merged commit 333ad86 into mono:master Jan 7, 2019

lewurm added a commit to lewurm/mono that referenced this pull request Jan 10, 2019

[ios] initial watch64_32 support (mono#11691)

2ff0a30

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

This was referenced Jan 16, 2019

[2018-12] [ios] initial watch64_32 support #12444

Closed

[2018-12] [sdks] Add a XCODE32_DIR make variable and use it to compile the 32 bit cross compilers. #12445

Closed

lewurm added a commit to lewurm/mono that referenced this pull request Jan 16, 2019

[ios] initial watch64_32 support (mono#11691)

ff17721

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

lewurm mentioned this pull request Jan 16, 2019

[2018-10] [ios] arm64_32 build support #12447

Merged

lewurm added a commit to lewurm/mono that referenced this pull request Jan 16, 2019

[ios] initial watch64_32 support (mono#11691)

971abcb

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

lewurm added a commit to lewurm/mono that referenced this pull request Jan 16, 2019

[ios] initial watch64_32 support (mono#11691)

29c0cf9

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

lewurm mentioned this pull request Jan 16, 2019

[2018-12] [ios] arm64_32 build support #12451

Merged

marek-safar pushed a commit that referenced this pull request Jan 17, 2019

[ios] initial watch64_32 support (#11691)

10a4623

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

lewurm added a commit that referenced this pull request Jan 23, 2019

[ios] initial watch64_32 support (#11691)

1fcc7b1

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

lewurm added a commit to lewurm/mono that referenced this pull request Jan 23, 2019

[ios] initial watch64_32 support (mono#11691)

70a207a

* [ios] initial watch64_32 support * align iOSSimulatorTemplate with iOSDeviceTemplate

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ios] initial watch64_32 support #11691

[ios] initial watch64_32 support #11691

lewurm commented Nov 15, 2018 •

edited by marek-safar

lewurm Nov 15, 2018

vargaz Nov 15, 2018

rolfbjarne Nov 15, 2018

vargaz Nov 15, 2018

jaykrell Dec 1, 2018

lewurm Nov 15, 2018

lewurm Nov 15, 2018

lewurm Jan 2, 2019

vargaz Nov 15, 2018

lewurm Nov 15, 2018

rolfbjarne Nov 15, 2018

lewurm Nov 15, 2018

lewurm commented Nov 15, 2018

marek-safar Nov 26, 2018 •

edited

lewurm commented Jan 2, 2019 •

edited

lewurm commented Jan 3, 2019

lewurm commented Jan 16, 2019

monojenkins commented Jan 16, 2019

[ios] initial watch64_32 support #11691

[ios] initial watch64_32 support #11691

Conversation

lewurm commented Nov 15, 2018 • edited by marek-safar

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lewurm commented Nov 15, 2018

marek-safar Nov 26, 2018 • edited

Choose a reason for hiding this comment

lewurm commented Jan 2, 2019 • edited

lewurm commented Jan 3, 2019

lewurm commented Jan 16, 2019

monojenkins commented Jan 16, 2019

lewurm commented Nov 15, 2018 •

edited by marek-safar

marek-safar Nov 26, 2018 •

edited

lewurm commented Jan 2, 2019 •

edited