From 28653171170ebdca40786da5852338d15a09d0f8 Mon Sep 17 00:00:00 2001
From: Zoltan Varga <vargaz@gmail.com>
Date: Tue, 20 Aug 2019 11:32:46 -0400
Subject: [PATCH] Fix the build.

Commit migrated from https://github.com/mono/mono/commit/8a413fad719ca9068dfd36f0cb39ca94d6c8de2f
---
 src/mono/mono/mini/mini.h                    |  2 +-
 src/mono/mono/mini/simd-intrinsics-netcore.c | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/mono/mono/mini/mini.h b/src/mono/mono/mini/mini.h
index b20f950..0917b89 100644
--- a/src/mono/mono/mini/mini.h
+++ b/src/mono/mono/mini/mini.h
@@ -400,7 +400,7 @@ typedef union MonoInstSpec { // instruction specification
 	char bytes[MONO_INST_MAX];
 } MonoInstSpec;
 
-extern const char mini_ins_info[];
+extern const char mini_ins_info[] MONO_LLVM_INTERNAL;
 extern const gint8 mini_ins_sreg_counts [];
 
 #ifndef DISABLE_JIT
diff --git a/src/mono/mono/mini/simd-intrinsics-netcore.c b/src/mono/mono/mini/simd-intrinsics-netcore.c
index e6b0905..9bf8a4f 100644
--- a/src/mono/mono/mini/simd-intrinsics-netcore.c
+++ b/src/mono/mono/mini/simd-intrinsics-netcore.c
@@ -5,12 +5,19 @@
 #include <config.h>
 #include <mono/utils/mono-compiler.h>
 
+#if defined(DISABLE_JIT)
+
+void
+mono_simd_intrinsics_init (void)
+{
+}
+
+#else
+
 /*
  * Only LLVM is supported as a backend.
  */
 
-#if !defined(DISABLE_JIT) && defined(ENABLE_NETCORE)
-
 #include "mini.h"
 #include "ir-emit.h"
 #ifdef ENABLE_LLVM
@@ -20,6 +27,8 @@
 #include <mono/metadata/abi-details.h>
 #include <mono/metadata/reflection-internals.h>
 
+#if defined (MONO_ARCH_SIMD_INTRINSICS) && defined(ENABLE_NETCORE)
+
 #define MSGSTRFIELD(line) MSGSTRFIELD1(line)
 #define MSGSTRFIELD1(line) str##line
 static const struct msgstr_t {
@@ -591,3 +600,5 @@ mono_simd_simplify_indirection (MonoCompile *cfg)
 MONO_EMPTY_SOURCE_FILE (simd_intrinsics_netcore);
 
 #endif
+
+#endif /* DISABLE_JIT */
-- 
2.7.4