[wasm] Compile interp.c with -mllvm -join-liveintervals=false to fix compilation...

Commit migrated from https://github.com/mono/mono/commit/476af240d242b557ea82723f601795697fffb2e5

diff --git a/src/mono/configure.ac b/src/mono/configure.ac
index 4e6dcf3..778eca4 100644 (file)
--- a/src/mono/configure.ac
+++ b/src/mono/configure.ac
@@ -4275,6 +4275,7 @@ jit_wanted=true
 boehm_supported=true
 BTLS_SUPPORTED=no
 BTLS_PLATFORM=
+INTERP_CFLAGS=""
 
 case "$host" in
        wasm32*)
@@ -4284,6 +4285,10 @@ case "$host" in
                ACCESS_UNALIGNED="no"
                with_tls=pthread
                target_wasm=yes
+               if test "x$mono_cv_clang" = "xyes"; then
+                  INTERP_CFLAGS="-mllvm -join-liveintervals=false"
+                  AC_SUBST(INTERP_CFLAGS)
+               fi
                ;;
        mips*)
                TARGET=MIPS;

diff --git a/src/mono/mono/mini/Makefile.am.in b/src/mono/mono/mini/Makefile.am.in
index b57870b..a407491 100755 (executable)
--- a/src/mono/mono/mini/Makefile.am.in
+++ b/src/mono/mono/mini/Makefile.am.in
@@ -701,7 +701,7 @@ libmonoldflags += $(JEMALLOC_LDFLAGS)
 endif
 
 libmono_ee_interp_la_SOURCES = $(interp_sources)
-libmono_ee_interp_la_CFLAGS = $(AM_CFLAGS) @CXX_ADD_CFLAGS@
+libmono_ee_interp_la_CFLAGS = $(AM_CFLAGS) @CXX_ADD_CFLAGS@ $(INTERP_CFLAGS)
 if BITCODE
 libmono_ee_interp_la_LDFLAGS = $(libmonoldflags)
 if DISABLE_INTERPRETER