Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Replace embedded libgc with Unity fork of recent Boehm (bdwgc) #16832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vargaz merged 17 commits into from
Nov 22, 2019
Merged

Replace embedded libgc with Unity fork of recent Boehm (bdwgc) #16832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6fe8d1d
Initial commit to migrate libgc to bdwgc.
joncham Sep 14, 2019
76e0c32
Fix submodule url
joncham Sep 14, 2019
211ba2b
Don't force Boehm as runtime wrapper. Was just for testing locally.
joncham Sep 14, 2019
3167441
Build bdwgc as single object file. Helps with performance.
joncham Sep 16, 2019
4caf5f8
Bump bdwgc submodule.
joncham Sep 16, 2019
4fb041b
Attempt to fix windows MSVC based build.
joncham Sep 19, 2019
9debea7
Remove any references to GC_INSIDE_DLL as we manually managed threads…
joncham Nov 4, 2019
aaf7d5c
Allow building boehm on Windows amd64.
joncham Nov 5, 2019
e90a48e
Allow building boehm with msvc.
joncham Nov 5, 2019
446559c
Bump bdwgc to fix line endings
joncham Nov 7, 2019
4c1ec08
Use LF for sh, am, m4, and ac files in bdwgc
joncham Nov 7, 2019
b62a6d2
Bump bdwgc & libatomic_ops with fix for cygwin
joncham Nov 7, 2019
2662417
Bump bdwgc to fix mono-boehm being generated as libtool wrapper script.
joncham Nov 8, 2019
7b438c4
Link the static boehm library.
joncham Nov 12, 2019
e057f9d
Revert "Link the static boehm library."
joncham Nov 12, 2019
a8d1c65
Use --export-all-symbols on cygwin/mingw to fix issues with boehm cau…
joncham Nov 13, 2019
c4ec57d
Fix
joncham Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,6 @@
path = external/llvm-project
url = git://github.com/dotnet/llvm-project.git
branch = release/6.x
[submodule "external/bdwgc"]
path = external/bdwgc
url = git://github.com/Unity-Technologies/bdwgc.git
8 changes: 4 additions & 4 deletions autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ automake $am_opt ||
echo "Running autoconf ..."
autoconf || { echo "**Error**: autoconf failed."; exit 1; }

if test -d $srcdir/libgc; then
echo Running libgc/autogen.sh ...
(cd $srcdir/libgc ; NOCONFIGURE=1 ./autogen.sh "$@")
echo Done running libgc/autogen.sh ...
if test -d $srcdir/external/bdwgc; then
echo Running external/bdwgc/autogen.sh ...
(cd $srcdir/external/bdwgc ; NOCONFIGURE=1 ./autogen.sh "$@")
echo Done running external/bdwgc/autogen.sh ...
fi

if test x$MONO_EXTRA_CONFIGURE_FLAGS != x; then
Expand Down
29 changes: 13 additions & 16 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ case "$host" in
# Boehm not supported on 64-bit Windows.
case "$host" in
x86_64-*-* | amd64-*-*)
support_boehm=no
with_gc=sgen
RID="win-x64"
COREARCH="x64"
Expand All @@ -192,9 +191,6 @@ case "$host" in
with_tls=pthread
with_sgen_default_concurrent=yes
LN_S=cp

# This forces libgc to use the DllMain based thread registration code on win32
libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes"
;;
*-*-*netbsd*)
CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE"
Expand Down Expand Up @@ -2039,14 +2035,14 @@ if test "x$support_boehm" = "xyes"; then
case "x$libgc" in
xincluded)
if test "x$support_boehm" = "xyes"; then
libgc_dir=libgc
libgc_dir=external/bdwgc
fi

LIBGC_CPPFLAGS='-I$(top_srcdir)/libgc/include'
LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la'
LIBGC_CPPFLAGS='-I$(top_srcdir)/external/bdwgc/include -I$(top_srcdir)/external/bdwgc/libatomic_ops/src'
LIBGC_LIBS='$(top_builddir)/external/bdwgc/libgc.la'
LIBGC_STATIC_LIBS='$(top_builddir)/external/bdwgc/libgc-static.la'

BOEHM_DEFINES="-DHAVE_BOEHM_GC"
BOEHM_DEFINES="-DHAVE_BOEHM_GC -DGC_THREADS"

if test x$target_win32 = xyes; then
BOEHM_DEFINES="$BOEHM_DEFINES -DGC_NOT_DLL"
Expand Down Expand Up @@ -5153,7 +5149,12 @@ AC_SEARCH_LIBS(dlopen, dl)
# Apple -bind_at_load
# The rest GNU.
#
AX_APPEND_LINK_FLAGS([-Wl,--export-dynamic -Wl,-Bsymbolic -bsymbolic -Wl,-z,now -Wl,-bind_at_load])
export_link_flags=--export-dynamic
case $host_os in
mingw*|cygwin*)
export_link_flags=--export-all-symbols
esac
AX_APPEND_LINK_FLAGS([-Wl,$export_link_flags -Wl,-Bsymbolic -bsymbolic -Wl,-z,now -Wl,-bind_at_load])

AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h iconv.h sys/types.h sys/resource.h)
dnl giconv.c will check on HAVE_ICONV_H but we need this for link time
Expand Down Expand Up @@ -5605,9 +5606,9 @@ case "x$libgc" in
# if these are instrumented it will be very bad news
# (infinite recursion, undefined parking behavior, etc)
TMP_CPPFLAGS=`echo $TMP_CPPFLAGS | sed -e 's/-finstrument-for-thread-suspension//g'`
ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$TMP_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
ac_configure_args="$ac_configure_args --enable-single-obj-compilation --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$TMP_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
if test "x$support_boehm" = "xyes"; then
AC_CONFIG_SUBDIRS(libgc)
AC_CONFIG_SUBDIRS(external/bdwgc)
fi
;;
esac
Expand Down Expand Up @@ -6043,10 +6044,6 @@ fi
AM_CONDITIONAL(ENABLE_MSVC, test x$enable_msvc = xyes)

if test "x$enable_msvc" = "xyes"; then
if test "x$support_boehm" = "xyes"; then
echo "Error, Boehm GC is not supported when using --enable-msvc."
exit 1
fi
mono_msvc_build_dir='$(top_srcdir)'/msvc/build/sgen
if test "x$host_cpu" = "xi686"; then
mono_msvc_build_lib_dir='$(mono_msvc_build_dir)'/Win32/lib/Release
Expand Down
1 change: 1 addition & 0 deletions external/bdwgc
Open in desktop
Submodule bdwgc added at 6e8db0
4 changes: 0 additions & 4 deletions libgc/.gitattributes
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions libgc/.gitignore
View file
Open in desktop

This file was deleted.

Loading