Merge branch 'upstream'

Former-commit-id: 679598a62b3179631dc2911bdadf42e4e6224c5d
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 11:05:17 +00:00
17047 changed files with 3137615 additions and 392334 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -169,7 +169,7 @@ EXTRA_DIST += add_gc_prefix.c gcname.c if_mach.c if_not_there.c hpux_test_and_cl
# cord package
#
EXTRA_DIST += cord/cordbscs.c cord/cordtest.c cord/de.c cord/de_win.c cord/de_win.ICO cord/cordprnt.c cord/cordxtra.c cord/de_cmds.h cord/de_win.h cord/de_win.RC
EXTRA_DIST += cord cord/cordbscs.c cord/cordtest.c cord/de.c cord/de_win.c cord/de_win.ICO cord/cordprnt.c cord/cordxtra.c cord/de_cmds.h cord/de_win.h cord/de_win.RC
# this is an auxiliary shell file used by Makefile and Makefile.direct
#
@@ -184,3 +184,4 @@ EXTRA_DIST += configure.host
# it will not remove dest if building fails
.S.s:
if $(CPP) $< >$@ ; then :; else rm -f $@; fi

View File

@@ -95,8 +95,8 @@ host_triplet = @host@
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) mkinstalldirs \
depcomp ChangeLog compile config.guess config.sub install-sh \
missing ltmain.sh ltconfig
depcomp compile config.guess config.sub install-sh missing \
ltmain.sh ltconfig
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -462,7 +462,7 @@ EXTRA_DIST = alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S \
hpux_test_and_clear.s pc_excludes gc.mak MacOS.c \
MacProjects.sit.hqx mach_dep.c setjmp_t.c threadlibs.c \
AmigaOS.c version.h Mac_files/datastart.c Mac_files/dataend.c \
Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h cord \
cord/cordbscs.c cord/cordtest.c cord/de.c cord/de_win.c \
cord/de_win.ICO cord/cordprnt.c cord/cordxtra.c cord/de_cmds.h \
cord/de_win.h cord/de_win.RC configure.host

View File

@@ -368,6 +368,9 @@ ptr_t p;
ptr_t GC_approx_sp()
{
#if defined(__GNUC__)
return __builtin_frame_address(0);
#else
VOLATILE word dummy;
dummy = 42; /* Force stack to grow if necessary. Otherwise the */
@@ -375,18 +378,12 @@ ptr_t GC_approx_sp()
/* doing something wrong. */
# ifdef _MSC_VER
# pragma warning(disable:4172)
# endif
# if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 408)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wreturn-local-addr"
# endif
return((ptr_t)(&dummy));
# if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 408)
# pragma GCC diagnostic pop
# endif
# ifdef _MSC_VER
# pragma warning(default:4172)
# endif
#endif // __GNUC__
}
/*

View File

@@ -184,7 +184,7 @@ static GC_thread GC_new_thread(void) {
#ifdef __GNUC__
__inline__
#endif
LONG GC_get_max_thread_index()
static LONG GC_get_max_thread_index()
{
LONG my_max = GC_max_thread_index;