lang/mono: Invoke CPU_COUNT properly
83c19a7238
did not include a patch to configure.ac that allowed it to properly detect CPU_COUNT. Fixes:83c19a7238
MFH: 2021Q4 (cherry picked from commita8176108d5
)
This commit is contained in:
parent
3fe2fa6e20
commit
ffa043014e
|
@ -1,6 +1,41 @@
|
|||
--- configure.ac.orig 2018-04-18 10:51:42.000000000 +0300
|
||||
+++ configure.ac 2018-06-24 02:38:19.860780000 +0300
|
||||
@@ -3271,6 +3271,8 @@
|
||||
--- configure.ac.orig 2018-08-24 08:19:14.000000000 -0700
|
||||
+++ configure.ac 2021-12-09 07:38:57.727183000 -0800
|
||||
@@ -201,6 +201,12 @@
|
||||
libdl=
|
||||
libgc_threads=pthreads
|
||||
use_sigposix=yes
|
||||
+ case "$host" in
|
||||
+ aarch64-*)
|
||||
+ support_boehm=no
|
||||
+ with_gc=sgen
|
||||
+ ;;
|
||||
+ esac
|
||||
has_dtrace=yes
|
||||
with_sgen_default_concurrent=yes
|
||||
;;
|
||||
@@ -1668,7 +1674,8 @@
|
||||
dnl *** won't always indicate the interface sched_affinity has. ***
|
||||
dnl ****************************************************************
|
||||
AC_MSG_CHECKING(for sched_setaffinity from glibc < 2.3.4)
|
||||
- AC_TRY_COMPILE([#include <sched.h>], [
|
||||
+ AC_TRY_COMPILE([#define _WITH_CPU_SET_T
|
||||
+#include <sched.h>], [
|
||||
int mask = 1;
|
||||
sched_setaffinity(0, &mask);
|
||||
return 0;
|
||||
@@ -1680,8 +1687,9 @@
|
||||
# We have the new, three-parameter version
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
- AC_TRY_COMPILE([#include <sched.h>], [
|
||||
- CPU_COUNT((void *) 0);
|
||||
+ AC_TRY_COMPILE([#define _WITH_CPU_SET_T
|
||||
+#include <sched.h>], [
|
||||
+ CPU_COUNT((cpuset_t *) 0);
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(GLIBC_HAS_CPU_COUNT, 1, [GLIBC has CPU_COUNT macro in sched.h])
|
||||
@@ -3298,6 +3306,8 @@
|
||||
BTLS_PLATFORM=i386
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
|
@ -9,7 +44,7 @@
|
|||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -3295,6 +3297,8 @@
|
||||
@@ -3322,6 +3332,8 @@
|
||||
boehm_supported=false
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
|
@ -18,3 +53,24 @@
|
|||
;;
|
||||
mingw*)
|
||||
;;
|
||||
@@ -3355,11 +3367,10 @@
|
||||
INTL="intl"
|
||||
;;
|
||||
macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
|
||||
- powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc-*-freebsd* )
|
||||
+ powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc*-*-freebsd* )
|
||||
if test "x$ac_cv_sizeof_void_p" = "x8"; then
|
||||
TARGET=POWERPC64;
|
||||
CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__"
|
||||
- CFLAGS="$CFLAGS -mminimal-toc"
|
||||
else
|
||||
TARGET=POWERPC;
|
||||
CPPFLAGS="$CPPFLAGS -D__mono_ppc__"
|
||||
@@ -4425,6 +4436,7 @@
|
||||
;;
|
||||
aarch64)
|
||||
btls_arch=aarch64
|
||||
+ btls_cflags="-march=armv8-a+crypto"
|
||||
;;
|
||||
android-armv5)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
|
|
Loading…
Reference in New Issue