mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: c017f81d173f4c3893612003bbbfc4083907346d
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:11:28 +00:00
parent 6cf6ba5d08 7d05485754
commit 83f21cd847
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libgc/include/gc.h
View File

@@ -93,7 +93,6 @@ GC_API GC_PTR (*GC_oom_fn) GC_PROTO((size_t bytes_requested));
/* pointer to a previously allocated heap */
/* object. */
// Keep somewhat in sync with mono/metadata/profiler.h:enum MonoGCEvent
typedef enum {
GC_EVENT_START,
GC_EVENT_MARK_START,

4
libgc/include/private/gcconfig.h
View File

@@ -733,7 +733,7 @@
# if defined(__GLIBC__)&& __GLIBC__>=2
# define SEARCH_FOR_DATA_START
# else /* !GLIBC2 */
# if defined(PLATFORM_ANDROID)
# if defined(HOST_ANDROID)
# define __environ environ
# endif
extern char **__environ;
@@ -1965,7 +1965,7 @@
# include <features.h>
# if defined(__GLIBC__) && __GLIBC__ >= 2
# define SEARCH_FOR_DATA_START
# elif defined(PLATFORM_ANDROID)
# elif defined(HOST_ANDROID)
# define SEARCH_FOR_DATA_START
# else
extern char **__environ;

2
libgc/include/private/pthread_support.h
View File

@@ -45,7 +45,7 @@ typedef struct GC_Thread_Rep {
/* guaranteed to be dead, but we may */
/* not yet have registered the join.) */
pthread_t id;
#ifdef PLATFORM_ANDROID
#ifdef HOST_ANDROID
pid_t kernel_id;
#endif
/* Extra bookkeeping information the stopping code uses */

6
libgc/pthread_stop_world.c
View File

@@ -337,7 +337,7 @@ void GC_push_all_stacks()
pthread_t GC_stopping_thread;
int GC_stopping_pid;
#ifdef PLATFORM_ANDROID
#ifdef HOST_ANDROID
static
int android_thread_kill(pid_t tid, int sig)
{
@@ -379,7 +379,7 @@ int GC_suspend_all()
GC_printf1("Sending suspend signal to 0x%lx\n", p -> id);
#endif
#ifndef PLATFORM_ANDROID
#ifndef HOST_ANDROID
result = pthread_kill(p -> id, SIG_SUSPEND);
#else
result = android_thread_kill(p -> kernel_id, SIG_SUSPEND);
@@ -658,7 +658,7 @@ static void pthread_start_world()
GC_printf1("Sending restart signal to 0x%lx\n", p -> id);
#endif
#ifndef PLATFORM_ANDROID
#ifndef HOST_ANDROID
result = pthread_kill(p -> id, SIG_THR_RESTART);
#else
result = android_thread_kill(p -> kernel_id, SIG_THR_RESTART);

2
libgc/pthread_support.c
View File

@@ -764,7 +764,7 @@ GC_thread GC_new_thread(pthread_t id)
}
if (result == 0) return(0);
result -> id = id;
#ifdef PLATFORM_ANDROID
#ifdef HOST_ANDROID
result -> kernel_id = gettid();
#endif
result -> next = GC_threads[hv];