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