[aot] Fix a memory leak related to constraint allocation/deallocation. (#4880)

[mono.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 37f6008d6ac225066b20d53475eeac6a1a83d230..a37a5dc7eeac1a1fc7f05e08361148724156f1cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3226,6 +3226,13 @@ case "$host" in
                ACCESS_UNALIGNED="no"
                AOT_SUPPORTED="yes"
                CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
+               BTLS_SUPPORTED=yes
+               BTLS_PLATFORM=arm
+               case "$target" in
+               arm*-linux*-gnueabi)
+                       BTLS_PLATFORM=armsoft
+                       ;;
+               esac
                ;;
        arm*-netbsd*-eabi*)
                TARGET=ARM;
@@ -3246,6 +3253,8 @@ case "$host" in
                arch_target=arm64
                boehm_supported=false
                AOT_SUPPORTED="yes"
+               BTLS_SUPPORTED=yes
+               BTLS_PLATFORM=aarch64
                ;;
        s390x-*-linux*)
                TARGET=S390X;
@@ -4080,8 +4089,6 @@ dnl **************
 AC_ARG_ENABLE(btls, [  --disable-btls             Disable the BoringTls provider], enable_btls=$enableval, enable_btls=$BTLS_SUPPORTED)
 AC_ARG_WITH(btls_android_ndk, [  --with-btls-android-ndk        Android NDK for BoringTls])
 
-AC_ARG_ENABLE(dynamic-btls, [ --enable-dynamic-btls Place the BTLS provider into a separate shared library/archive.], enable_dynamic_btls=$enableval, enable_dynamic_btls=no)
-
 AM_CONDITIONAL(BTLS, test x$enable_btls = xyes)
 
 btls_android=no
@@ -4110,6 +4117,16 @@ if test "x$enable_btls" = "xyes"; then
        x86_64)
                btls_arch=x86_64
                ;;
+       arm)
+               btls_arch=arm
+               ;;
+       armsoft)
+               btls_arch=arm
+               btls_cflags="-DOPENSSL_NO_ASM=1"
+               ;;
+       aarch64)
+               btls_arch=aarch64
+               ;;
        android-armv5)
                BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=12"
                ;;
@@ -4592,9 +4609,6 @@ fi
 
     if test "x$enable_btls" = "xyes"; then
       echo "HAVE_BTLS=1" >> $srcdir/$mcsdir/build/config.make
-      if test "x$enable_dynamic_btls" = "xyes"; then
-        echo "HAVE_DYNAMIC_BTLS=1" >> $srcdir/$mcsdir/build/config.make
-      fi
     fi
 
   fi