1From 17650f7e0f571287bb14bb9b4fbde7b91d842bb4 Mon Sep 17 00:00:00 2001 2From: monojenkins <jo.shields+jenkins@xamarin.com> 3Date: Thu, 24 Sep 2020 12:17:34 -0400 4Subject: [PATCH] Ongoing work on the cmake build. (#20428) 5 6* Fix some warnings. 7* Avoid creating netcore/config.make. 8* Fix CPU_COUNT test. 9* Add missing source file. 10 11Co-authored-by: vargaz <vargaz@users.noreply.github.com> 12 13[Retrieved (and updated to keep only update of icall.c) from: 14https://github.com/mono/mono/commit/17650f7e0f571287bb14bb9b4fbde7b91d842bb4] 15Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 16--- 17 mono/metadata/CMakeLists.txt | 1 + 18 mono/metadata/icall.c | 2 +- 19 mono/mini/CMakeLists.txt | 5 +++++ 20 3 files changed, 7 insertions(+), 1 deletion(-) 21 22diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c 23index fa991bc72e57..f2c003ac1ff1 100644 24--- a/mono/metadata/icall.c 25+++ b/mono/metadata/icall.c 26@@ -9605,7 +9605,7 @@ mono_create_icall_signatures (void) 27 int n; 28 while ((n = sig->param_count)) { 29 --sig->param_count; // remove ret 30- gsize_a *types = (gsize*)(sig + 1); 31+ gsize_a *types = (gsize_a*)(sig + 1); 32 for (int i = 0; i < n; ++i) { 33 gsize index = *types++; 34 g_assert (index < G_N_ELEMENTS (lookup)); 35