Imported Upstream version 6.12.0.156

Former-commit-id: 8ff468edef2b5377f24097610316870b85491049
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2021-09-28 19:45:06 +00:00
parent 4651b7ea22
commit a2828bff8b
80 changed files with 942 additions and 789 deletions

View File

@@ -1 +1 @@
13c7c2a9438dd67e911b9d9e43e7216965338d89
3d10a9a401af64c27b90614806c1340674c38f15

View File

@@ -70,6 +70,7 @@
# define GC_WIN32_THREADS
#endif
#if defined(GC_AIX_THREADS) || defined(GC_DARWIN_THREADS) \
|| defined(GC_DGUX386_THREADS) || defined(GC_FREEBSD_THREADS) \
|| defined(GC_HPUX_THREADS) \
@@ -77,7 +78,7 @@
|| defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \
|| defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \
|| defined(GC_WIN32_THREADS) || defined(GC_RTEMS_PTHREADS) \
|| defined(SN_TARGET_ORBIS) || defined(SN_TARGET_PSP2)
|| defined(SN_TARGET_PSP2)
# ifndef GC_THREADS
# define GC_THREADS
# endif
@@ -91,8 +92,8 @@
# define GC_HAIKU_THREADS
# elif defined(__OpenBSD__)
# define GC_OPENBSD_THREADS
# elif defined(__DragonFly__) || defined(__FreeBSD_kernel__) \
|| (defined(__FreeBSD__) && !defined(SN_TARGET_ORBIS))
# elif ( defined(__DragonFly__) || defined(__FreeBSD_kernel__) \
|| defined(__FreeBSD__) ) && !defined(GC_NO_FREEBSD)
# define GC_FREEBSD_THREADS
# elif defined(__NetBSD__)
# define GC_NETBSD_THREADS

View File

@@ -53,6 +53,7 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_gcj_vector_malloc(size_t /* lb */,
GC_API struct GC_ms_entry *GC_CALL
GC_gcj_vector_mark_proc (struct GC_ms_entry *mark_stack_ptr,
struct GC_ms_entry* mark_stack_limit,
GC_descr element_desc,
GC_word*start,
GC_word*end,

View File

@@ -48,7 +48,7 @@
# endif
# if (!defined(AO_HAVE_test_and_set_acquire) || defined(GC_RTEMS_PTHREADS) \
|| defined(SN_TARGET_ORBIS) || defined(SN_TARGET_PS3) \
|| defined(SN_TARGET_PS3) \
|| defined(GC_WIN32_THREADS) || defined(LINT2)) && defined(GC_PTHREADS)
# define USE_PTHREAD_LOCKS
# undef USE_SPIN_LOCK

View File

@@ -1 +1 @@
6acaabb4d7ff0d1fcb682f7b39d9a0926826e11c
9945f1a480c350f0b9d817ca87aec82361118729

View File

@@ -1 +1 @@
7982ce39fa13ddf857c72df12952ddfbf66e9a2c
242f0a0a7280a594a64445eb069ae8e362f1b7e3

View File

@@ -49,9 +49,8 @@ struct thread_stop_info {
ptr_t reg_storage[NACL_GC_REG_STORAGE_SIZE];
# endif
#if defined(SN_TARGET_ORBIS)
# define ORBIS_GC_REG_STORAGE_SIZE 27
__uint64_t registers[ORBIS_GC_REG_STORAGE_SIZE];
#if defined(PLATFORM_GC_REG_STORAGE_SIZE)
__uint64_t registers[PLATFORM_GC_REG_STORAGE_SIZE];
#endif
};