Bump bockbuild

[mono.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 37f6008d6ac225066b20d53475eeac6a1a83d230..c5c7ba58b9e3cfbd99ec0da64a13c1f3872cee0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3`
 # This can be reset to 0 when Mono's version number is bumped
 # since it's part of the corlib version (the prefix '1' in the full
 # version number is to ensure the number isn't treated as octal in C)
-MONO_CORLIB_COUNTER=1
+MONO_CORLIB_COUNTER=2
 MONO_CORLIB_VERSION=`printf "1%02d%02d%02d%03d" $MONO_VERSION_MAJOR $MONO_VERSION_MINOR $MONO_VERSION_BUILD $MONO_CORLIB_COUNTER`
 
 AC_DEFINE_UNQUOTED(MONO_CORLIB_VERSION,$MONO_CORLIB_VERSION,[Version of the corlib-runtime interface])
@@ -3226,6 +3226,14 @@ case "$host" in
                ACCESS_UNALIGNED="no"
                AOT_SUPPORTED="yes"
                CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
+               BTLS_SUPPORTED=yes
+               BTLS_PLATFORM=arm
+               AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no])
+               case "$target" in
+               arm*-linux*-gnueabi)
+                       BTLS_PLATFORM=armsoft
+                       ;;
+               esac
                ;;
        arm*-netbsd*-eabi*)
                TARGET=ARM;
@@ -3246,6 +3254,9 @@ case "$host" in
                arch_target=arm64
                boehm_supported=false
                AOT_SUPPORTED="yes"
+               BTLS_SUPPORTED=yes
+               BTLS_PLATFORM=aarch64
+               AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no])
                ;;
        s390x-*-linux*)
                TARGET=S390X;
@@ -4080,8 +4091,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 +4119,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"
                ;;
@@ -4212,7 +4231,7 @@ AC_SUBST(mono_build_root)
 mono_runtime=mono/mini/mono
 AC_SUBST(mono_runtime)
 
-CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.1.0/tools/csc.exe
+CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.3.0/tools/csc.exe
 
 if test $csc_compiler = mcs; then
   CSC=$mcs_topdir/class/lib/build/mcs.exe
@@ -4592,9 +4611,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