Ivan Maidanski [Wed, 24 Jul 2019 22:19:54 +0000 (01:19 +0300)]
Travis CI: Remove building redundant check-cpp target of Makefile.direct
Now check executes test_cpp, so check-cpp is a redundant target.
Ivan Maidanski [Wed, 24 Jul 2019 21:55:22 +0000 (00:55 +0300)]
Compile gc.c unless building static libraries (NT_MAKEFILE, WCC_MAKEFILE)
This is to match the behavior of CMake and configure scripts.
* NT_MAKEFILE [!ENABLE_STATIC] (OBJS): Set to extra\gc.obj,
extra\msvc_dbg.obj.
* WCC_MAKEFILE (OBJS): Define only if ENABLE_STATIC.
* WCC_MAKEFILE [!ENABLE_STATIC] (gc.obj): New target.
* WCC_MAKEFILE [!ENABLE_STATIC] (gc.dll): Depend on and append gc.obj
instead of $(OBJS) elements.
Ivan Maidanski [Wed, 24 Jul 2019 08:11:29 +0000 (11:11 +0300)]
Build cord.lib by Makefile.direct, NT_MAKEFILE, OS2_MAKEFILE, WCC_MAKEFILE
Note: Makefile.direct builds cord.a (not libcord.a or cord.lib).
* Makefile.direct: Update header comment about all and cords targets.
* Makefile.direct (all): Depend also on cords.
* Makefile.direct (cord.a): New target (duplicates cords target).
* Makefile.direct (cords): Do not depend on base_lib; create cord.a
instead of updating gc.a.
* Makefile.direct (cordtest, de): Depend on cords instead of
$(CORD_OBJS); pass cord.a (instead of $(CORD_OBJS)) to $(CC).
* NT_MAKEFILE (CFLAGS_MT): Move variable definition (which uses cvarsmt) to
be after CORDFLAG one.
* NT_MAKEFILE (CORDFLAG, COBJS): New variable.
* WCC_MAKEFILE (CORDFLAG, COBJS): Likewise.
* NT_MAKEFILE [!ENABLE_STATIC] (cvarsmt): Set variable value to empty;
add comment.
* NT_MAKEFILE (all): Depend also on cord.lib.
* OS2_MAKEFILE (all): Likewise.
* WCC_MAKEFILE (all): Likewise.
* NT_MAKEFILE (check): Depend also on cordtest.exe; run also cordtest.
* WCC_MAKEFILE (check): Likewise.
* NT_MAKEFILE (.c.obj): Remove -DCORD_NOT_DLL; add $(CORDFLAG).
* NT_MAKEFILE (cord.lib, cordtest.exe): New target.
* OS2_MAKEFILE (cord.lib, cordtest.exe, clean): Likewise.
* WCC_MAKEFILE (cord.lib, cordtest.exe, cordbscs.obj, cordxtra.obj,
cordprnt.obj, cordtest.obj): Likewise.
* WCC_MAKEFILE [!ENABLE_STATIC] (cord.dll): Likewise.
* NT_MAKEFILE (de.exe): Depend on cord.lib instead of cordbscs.obj and
cordxtra.obj.
* NT_MAKEFILE (clean): Delete cordtst*.tmp files; delete *.lib, *.dll,
and *.exp files instead of gc*.lib, gc*.dll, gc*.exp, cord\*.exe,
cord\*.exp, cord\*.lib, cord\*.pdb.
* README.md (Installation and Portability): Update information about
"make cords".
Ivan Maidanski [Tue, 23 Jul 2019 21:51:35 +0000 (00:51 +0300)]
Fix gccpp.lib dependency in NT_MAKEFILE
(fix of commit
4a08ae983)
Also, update README that Makefile.direct creates cord.a now (instead
of adding cord files to gc.a).
* NT_MAKEFILE [!ENABLE_STATIC] (gccpp.lib): Add dependency on gc.lib.
* README.QUICK (INSTALLATION): Update information about "make cords".
Ivan Maidanski [Tue, 23 Jul 2019 21:42:21 +0000 (00:42 +0300)]
.gitignore: Ignore all *.a files in the base folder
Ivan Maidanski [Mon, 22 Jul 2019 06:53:32 +0000 (09:53 +0300)]
Compile msvc_dbg.c by CMake script (MS VC)
* CMakeLists.txt [MSVC] (SRC): Add extra/msvc_dbg.c; add comment.
Ivan Maidanski [Mon, 22 Jul 2019 06:40:29 +0000 (09:40 +0300)]
Replace _M_AMD64 macro with _M_X64
(code refactoring)
Also, adjust strcat_s usage in msvc_dbg.c.
* extra/msvc_dbg.c [_MSC_VER]: Check _M_X64 instead of _M_AMD64.
* tests/test.c [CPPCHECK && _MSC_VER] (main): Likewise.
* extra/msvc_dbg.c [_M_X64 && _MSC_VER<1200] (GetModuleBase): Use
strcat() instead of strcat_s().
Ivan Maidanski [Fri, 19 Jul 2019 21:44:38 +0000 (00:44 +0300)]
Rename make_as_lib option to enable_static in NT_MAKEFILE and WCC_MAKEFILE
This is to match the behavior of CMake script.
* NT_MAKEFILE: Update header comment (rename make_as_lib to
enable_static).
* NT_MAKEFILE (MAKE_AS_LIB): Rename to ENABLE_STATIC.
* WCC_MAKEFILE (MAKE_AS_DLL): Remove (check "ndef ENABLE_STATIC"
instead).
* WCC_MAKEFILE (MAKE_AS_LIB): Rename to ENABLE_STATIC; update comment.
* doc/README.win32 (Microsoft Tools): Rename make_as_lib to
enable_static.
* doc/README.win64: Likewise.
Ivan Maidanski [Fri, 19 Jul 2019 18:27:34 +0000 (21:27 +0300)]
Build shared libraries by default (WCC_MAKEFILE)
This is to match the behavior of CMake script.
* WCC_MAKEFILE (MAKE_AS_DLL): Uncomment.
* WCC_MAKEFILE (MAKE_AS_LIB): Comment out.
Ivan Maidanski [Fri, 19 Jul 2019 18:17:18 +0000 (21:17 +0300)]
Rename nothreads option to disable_threads in NT_MAKEFILE
* NT_MAKEFILE: Change nothreads=1 to disable_threads=1 in the header
comment.
* NT_MAKEFILE (CFLAGS_MT): Rename NOTHREADS to DISABLE_THREADS.
* doc/README.win32 (Microsoft Tools): Change nothreads=1 to
disable_threads=1.
* doc/README.win64: Likewise.
Ivan Maidanski [Fri, 19 Jul 2019 17:42:38 +0000 (20:42 +0300)]
Build gccpp library by Makefile.direct, NT_MAKEFILE and WCC_MAKEFILE
* Makefile.direct: Update header comment about all, gc.a (base_lib),
c++, check, check-cpp targets.
* Makefile.direct (CXX): Refine comment.
* Makefile.direct (all): Depend also on c++.
* Makefile.direct (bsd-libgccpp.a): New target (duplicates bsd-libgc.a
one).
* Makefile.direct (bsd-libgc.a): Add a rename of gccpp.a to
bsd-libgccpp.a.
* Makefile.direct (BSD-pkg-install): Copy bsd-libgccpp.a file to
libgccpp.a, install the latter one.
* Makefile.direct (test_cpp): Depend on c++ instead of gc_cpp.o; pass
gccpp.a (instead of gc_cpp.o) to $(CXX).
* Makefile.direct (gccpp.a): New target (duplicates c++ one).
* Makefile.direct (c++): Do not depend on gc_cpp.h and base_lib;
create gccpp.a instead of updating gc.a.
* Makefile.direct (clean): Delete *.a files instead of gc.a.
* Makefile.direct (check): Depend also on test_cpp$(EXEEXT); run also
test_cpp.
* NT_MAKEFILE (LINK_GC, LINK_DLL_FLAGS): Remove variable.
* NT_MAKEFILE (OBJS): Remove gc_cpp.obj.
* NT_MAKEFILE (all, test_cpp.exe): Depend also on gccpp.lib.
* WCC_MAKEFILE (all, test_cpp.exe): Likewise.
* NT_MAKEFILE (gccpp.lib): New target (depending on gc_cpp.obj).
* WCC_MAKEFILE (gccpp.lib): Likewise.
* WCC_MAKEFILE [MAKE_AS_DLL] (gccpp.dll): Likewise.
* NT_MAKEFILE (test_cpp.exe): Pass gccpp.lib to $(link).
* WCC_MAKEFILE [MAKE_AS_LIB] (MAKE_AS_LIB): Set to -DGC_NOT_DLL.
* WCC_MAKEFILE (gc.lib): Do not depend gc_cpp.obj.
* WCC_MAKEFILE [MAKE_AS_DLL] (gc.lib): Do not add gc_cpp.obj to gc.lib.
* WCC_MAKEFILE [MAKE_AS_DLL] (gc.dll): Specify "op case".
Ivan Maidanski [Wed, 17 Jul 2019 08:52:26 +0000 (11:52 +0300)]
Update README.cmake regarding Unix, C++ and tests
Issue #105 (bdwgc).
* doc/README.cmake: Mention that Unix targets are also supported;
remove not that support is not yet complete; update the list of
supported targets (that CMake is able to generate for); use Visual
Studio 9 instead of Visual Studio 8 in the examples; document
enable_cplusplus and build_tests options; provide an example with
--config option; change "build" artifacts folder to "out" one in
the example.
Ivan Maidanski [Wed, 17 Jul 2019 08:39:26 +0000 (11:39 +0300)]
Remove gc.mak script (MS VC)
Issue #105 (bdwgc).
CMake script or NT_MAKEFILE should be used instead of gc.mak.
* ChangeLog (8.1.0): Remove item about gc.mak.
* Makefile.am (EXTRA_DIST): Remove gc.mak.
* gc.mak: Remove file.
* doc/README.win32 (Threads): Remove gc.mak usage information; mention
that CMake script is the preferred way of building for Windows.
Ivan Maidanski [Wed, 17 Jul 2019 07:31:46 +0000 (10:31 +0300)]
.gitattributes: Update after BCC_MAKEFILE removal
Issue #105 (bdwgc).
Ivan Maidanski [Wed, 17 Jul 2019 07:29:36 +0000 (10:29 +0300)]
Remove Borland-specific Makefile (BCC_MAKEFILE)
Issue #105 (bdwgc).
CMake script should be used instead of BCC_MAKEFILE.
* BCC_MAKEFILE: Remove file.
* Makefile.am (EXTRA_DIST): Remove BCC_MAKEFILE.
* doc/README.win32 (Borland Tools): Remove "rarely tested" note; change
BCC_MAKEFILE to cmake -G "Borland Makefiles"; remove note that
Borland 5.5 is assumed.
Ivan Maidanski [Wed, 17 Jul 2019 07:08:12 +0000 (10:08 +0300)]
Enable CMake-based build for Borland and Watcom compilers
Issue #105 (bdwgc).
* CMakeLists.txt [BORLAND] (add_compile_options): Specify /a4 and
/w /w-pro /w-aus /w-par /w-ccc /w-inl /w-rch; add comment.
* CMakeLists.txt [WATCOM] (add_compile_options): Specify /zp4 and /wx.
* CMakeLists.txt [enable_werror && BORLAND] (add_compile_options):
Specify /w!.
* CMakeLists.txt [enable_werror && WATCOM] (add_compile_options):
Specify /we.
* CMakeLists.txt [!enable_single_obj_compilation && !BUILD_SHARED_LIBS
&& BORLAND] (add_compile_options): Specify /w-use; add comment.
* CMakeLists.txt [build_tests && WATCOM] (gctest): Specify /wcd=13
/wcd=201 /wcd=367 /wcd=368 /wcd=726 target compile options; add comment.
* doc/README.win32 (Watcom compiler): Mention that OpenWatcom 2.0 is
tested on; remove note that cord is not ported; add note about the
new way to build the collector using CMake script.
Ivan Maidanski [Tue, 16 Jul 2019 22:13:18 +0000 (01:13 +0300)]
Fix a typo in control_chars() comment in de_win.c
* cord/tests/de_win.c (control_chars): Replace "32" to "64" in comment.
Ivan Maidanski [Tue, 16 Jul 2019 21:44:29 +0000 (00:44 +0300)]
Eliminate 'conversion may lose significant digits' BCC warning in de_win
* cord/tests/de_win.c (control_chars): Cast text[i]+0x40 to char.
Ivan Maidanski [Tue, 16 Jul 2019 21:37:51 +0000 (00:37 +0300)]
Eliminate 'comparing signed and unsigned values' BCC warning in cordtest
* cord/tests/cordtest.c (test_basics): Cast (unsigned char)c to size_t.
Ivan Maidanski [Tue, 16 Jul 2019 07:34:48 +0000 (10:34 +0300)]
Suppress warnings in test_tinyfl() of gctest reported by Watcom C complier
* WCC_MAKEFILE (test.obj): Pass /wcd=13 /wcd=201 /wcd=367 /wcd=368
options to $(CC).
Ivan Maidanski [Tue, 16 Jul 2019 07:29:08 +0000 (10:29 +0300)]
Fix typo in SMakefile filename in README
* doc/README.amiga (WHATS NEW): Change SMakefile.smk to SMakefile.amiga.
Ivan Maidanski [Mon, 15 Jul 2019 06:24:04 +0000 (09:24 +0300)]
Workaround 'expression is only useful for its side effects' WCC warning
* include/ec.h (CORD_ac_append): Cast result of ternary operator to
void.
Ivan Maidanski [Tue, 9 Jul 2019 08:41:18 +0000 (11:41 +0300)]
Fix test_cpp fail when gc_cpp resides in a dll (Borland, Watcom)
* include/gc_cpp.h [(__BORLANDC__ || __WATCOMC__) && !GC_BUILD
&& !GC_NOT_DLL && GC_OPERATOR_NEW_ARRAY] (new[], delete[]): Define
inline operator.
* include/gc_cpp.h [(__BORLANDC__ || __WATCOMC__) && !GC_BUILD
&& !GC_NOT_DLL] (new, delete): Likewise.
Ivan Maidanski [Mon, 8 Jul 2019 22:00:09 +0000 (01:00 +0300)]
windows-untested: Remove all contents
Issue #105 (bdwgc).
CMake script should be used instead.
Ivan Maidanski [Sun, 7 Jul 2019 12:56:12 +0000 (15:56 +0300)]
Do not build tests by default (Makefile.direct and other Makefiles)
This is to match the behavior of configure-based Makefile and the
CMake script. Tests are built and executed now by `make check`.
* BCC_MAKEFILE (all): Depend on gc.lib only (instead of gctest, de
and test_cpp).
* OS2_MAKEFILE (all): Likewise.
* BCC_MAKEFILE (check): New target to build and run the tests (de is
not executed).
* NT_MAKEFILE (check): Likewise.
* Makefile.direct (all): Remove dependency on gctest.
* NT_MAKEFILE (all): Remove dependency on gctest, de and test_cpp; add
dependency on gc.lib.
* OS2_MAKEFILE (check): New target to build and run gctest and
cordtest.
* README.QUICK (INSTALLATION): Change "make test" to "make check".
* README.md (Installation and Portability): Likewise.
* doc/README.arm.cross: Likewise.
* SMakefile.amiga (all): Depend on gc.lib and cord.lib only (instead
of gctest, setjmp_t, cordtest).
* SMakefile.amiga (test): Rename to "check".
* WCC_MAKEFILE (all): Remove dependency on gctest and test_cpp.
* digimars.mak (targets): Likewise.
* WCC_MAKEFILE (check): New symbolic target to build and run gctest
and test_cpp.
* digimars.mak (check): Likewise.
* digimars.mak (gc.lib): New target (depend on gc.dll target).
* doc/README.win32 (Watcom compiler): Remove information that wmake
compiles the tests by default.
* doc/README.win64: Update information about tests building.
Ivan Maidanski [Tue, 16 Jul 2019 07:16:04 +0000 (10:16 +0300)]
Rename gc68060.lib to gc.lib, cord/cord68060.lib to cord.lib in SMakefile
This is to match the behavior of the CMake script.
* SMakefile.amiga (clean): Remove cord/*.lib, cord/*.lnk.
* SMakefile.amiga (gctest, cordtest, gc$(CPU).lib): Rename gc$(CPU).lib
to gc.lib.
* SMakefile.amiga (cordtest, cord/cord$(CPU).lib): Rename
cord/cord$(CPU).lib to cord.lib.
* SMakefile.amiga (cordtest): Use $(LINKER) instead of slink.
* SMakefile.amiga (cord.lib): Use $(LIBER) instead of oml.
* SMakefile.amiga (cord/cordbscs.o, cord/cordprnt.o, cord/cordxtra.o,
cord/cordtest.o): Use $(CC) instead of sc.
Ivan Maidanski [Tue, 16 Jul 2019 07:12:43 +0000 (10:12 +0300)]
Fix cordtest build in SMakefile.amiga
(fix of commit
1ffa0b268)
* SMakefile.amiga (clean): Delete also cord/tests/*.o.
* SMakefile.amiga (cordtest, cord/cordtest.o): Rename cord/cordtest.o
to cord/tests/cordtest.o.
Ivan Maidanski [Sun, 7 Jul 2019 12:26:53 +0000 (15:26 +0300)]
Rename gc64.dll to gc.dll and gc[64]_dll.lib to gc.lib in NT_MAKEFILE
This is to match the behavior of gc.mak and the CMake script.
* NT_MAKEFILE [!MAKE_AS_LIB]: Remove; use gc.dll instead of $(GC_DLL).
* NT_MAKEFILE (GC_LIB): Remove; use gc.lib instead of $(GC_LIB).
Ivan Maidanski [Sun, 7 Jul 2019 07:53:53 +0000 (10:53 +0300)]
.gitignore: Ignore de.dir produced by CMake
Ivan Maidanski [Sun, 7 Jul 2019 07:49:47 +0000 (10:49 +0300)]
AppVeyor CI: enable_werror for all cmake builds
Ivan Maidanski [Sun, 7 Jul 2019 07:45:28 +0000 (10:45 +0300)]
AppVeyor CI: Fail cmake build if deprecated macro and function warnings
Ivan Maidanski [Sun, 7 Jul 2019 07:39:04 +0000 (10:39 +0300)]
Eliminate 'possible loss of data' compiler warning in disclaim_test (MS VC)
(fix of commit
63fd11df9)
* disclaim_test.c (test_misc_sizes): Cast i to unsigned char when
assigning its value to *p.
Ivan Maidanski [Sun, 7 Jul 2019 07:28:09 +0000 (10:28 +0300)]
Eliminate 'possible loss of data' compiler warning in cordprnt (MS VC)
* cordprnt.c (CORD_vsprintf): Cast result of ec_len() to short if
long_arg<0.
Ivan Maidanski [Sat, 6 Jul 2019 05:57:41 +0000 (08:57 +0300)]
Support enable_werror option in CMake script
Issue #281 (bdwgc).
* CMakeLists.txt (enable_werror): New option (OFF by default).
* CMakeLists.txt: Specify add_compile_options to report all warnings;
add TODO about pedantic.
* CMakeLists.txt [enable_werror]: Specify add_compile_options to treat
all warnings as errors.
* CMakeLists.txt [enable_werror && APPLE]: Specify add_compile_options
to ignore deprecated declarations, e.g.
_dyld_bind_fully_image_containing_address.
Ivan Maidanski [Fri, 5 Jul 2019 20:30:37 +0000 (23:30 +0300)]
Remove dependency on user32.dll import library from static libgc (Win32)
* CMakeLists.txt [!BUILD_SHARED_LIBS && WIN32] (DONT_USE_USER32_DLL):
Define C macro; add comment.
* configure.ac [($enable_static=yes || $enable_shared=no)
&& $host=*-*-cygwin*|*-*-mingw*|*-*-msys*] (DONT_USE_USER32_DLL):
Likewise.
Ivan Maidanski [Thu, 4 Jul 2019 20:44:40 +0000 (23:44 +0300)]
New macro (NO_MSGBOX_ON_ERROR) to avoid message box on GC abort (Win32)
NO_MSGBOX_ON_ERROR macro disables Win32 MessageBox() invocation.
* doc/README.macros (NO_MSGBOX_ON_ERROR): Document.
* include/private/gcconfig.h [!MSGBOX_ON_ERROR && !NO_MSGBOX_ON_ERROR
&& !SMALL_CONFIG && MSWIN32 && !MSWINRT_FLAVOR && !MSWIN_XBOX1]
(MSGBOX_ON_ERROR): Define new macro.
* misc.c (GC_win32_MessageBoxA): Define only if MSGBOX_ON_ERROR.
* misc.c [!PCR && !SMALL_CONFIG] (GC_default_on_abort): Do not call
GC_win32_MessageBoxA() unless MSGBOX_ON_ERROR is defined.
Ivan Maidanski [Mon, 1 Jul 2019 10:15:18 +0000 (13:15 +0300)]
Update ChangeLog file
Ivan Maidanski [Sun, 30 Jun 2019 06:00:13 +0000 (09:00 +0300)]
Update ChangeLog file (v8.0 changes)
Ivan Maidanski [Sun, 30 Jun 2019 05:48:37 +0000 (08:48 +0300)]
Update ChangeLog file (v7.6 changes)
Ivan Maidanski [Sat, 29 Jun 2019 16:12:27 +0000 (19:12 +0300)]
Update ChangeLog file (v7.2 - v7.4 changes only)
Ivan Maidanski [Wed, 26 Jun 2019 19:55:42 +0000 (22:55 +0300)]
AppVeyor CI: Fix cmake Release build by passing --config
Ivan Maidanski [Wed, 26 Jun 2019 13:26:28 +0000 (16:26 +0300)]
Fix 'const object must be initialized' MS VC error for debug_header_size
(fix of commit
85e3083ff)
* include/gc_mark.h (GC_debug_header_size): Do not use "const" keyword
unless GC_BUILD; update comment.
Ivan Maidanski [Tue, 25 Jun 2019 21:03:41 +0000 (00:03 +0300)]
Fix 'redefinition of struct GC_ms_entry' compilation error in gc_priv.h
(fix of commit
38962c655)
* include/gc_mark.h [NOT_GCBUILD] (GC_ms_entry): Declare (instead of
an opaque struct definition).
Ivan Maidanski [Tue, 25 Jun 2019 20:55:22 +0000 (23:55 +0300)]
Fix 'GC_debug_header_size is deprecated' GCC warning
(fix of commit
85e3083ff)
* include/private/gc_priv.h [!GC_BUILD && NOT_GCBUILD] (GC_BUILD): Do
not define.
* tests/disclaim_bench.c (NOT_GCBUILD): Define macro (before include
gc_priv.h); remove outdated comment.
* tests/test.c (NOT_GCBUILD): Likewise.
Ivan Maidanski [Mon, 24 Jun 2019 20:20:55 +0000 (23:20 +0300)]
Travis CI: Replace clang-5.0 with clang (update to Xenial image)
Ivan Maidanski [Fri, 21 Jun 2019 21:59:36 +0000 (00:59 +0300)]
Travis CI: Fix out-of-memory during cppcheck build
Number of make parallel jobs is reduced to 8 when building cppcheck.
Ivan Maidanski [Fri, 21 Jun 2019 21:37:58 +0000 (00:37 +0300)]
Update AUTHORS file (add iarspider)
Ivan R [Fri, 14 Jun 2019 09:24:47 +0000 (11:24 +0200)]
Fix 'ISO C++17 does not allow dynamic exception spec' clang-8 error
Issue #287 (bdwgc).
Before this patch, clang 8 (and -std=c++1z) fails for gc_cpp.cc.
The error message produced is: ISO C++17 does not allow dynamic
exception specifications.
The "dynamic exception" syntax was declared deprecated in C++11 and
removed in C++17.
* gc_cpp.cc [!_MSC_VER && !__DMC__ && GC_NEW_DELETE_NEED_THROW
&& __cplusplus >= 201703L] (GC_DECL_NEW_THROW): Define to
noexcept(false); add comment.
Ivan Maidanski [Fri, 21 Jun 2019 20:47:47 +0000 (23:47 +0300)]
Fix 'while clause does not guard' GCC warning in GC_parse_map_entry
* os_dep.c [DYNAMIC_LOADING && USE_PROC_FOR_LIBRARIES || IA64
|| INCLUDE_LINUX_THREAD_DESCR || REDIRECT_MALLOC] (GC_parse_map_entry):
Fix "while" statements indentation; place just one "while" statement on
a line.
Ivan Maidanski [Fri, 21 Jun 2019 20:33:32 +0000 (23:33 +0300)]
Fix fread failure after enable_incremental if malloc is redirected (Linux)
The failure is observed in cord refill_cache() executed by cordtest,
fread() fails with EFAULT. The fix is to disable MPROTECT_VDB on Linux
when REDIRECT_MALLOC is defined.
* include/private/gcconfig.h [(M68K || I386 || ALPHA || IA64 || AARCH64
|| ARM32 || X86_64 || HEXAGON) && LINUX] (MPROTECT_VDB): Do not define
if REDIRECT_MALLOC.
Ivan Maidanski [Fri, 21 Jun 2019 09:24:26 +0000 (12:24 +0300)]
Do not use Manual VDB mode if C malloc is redirected
(fix of commit
06009b0a0)
* misc.c [!GC_DISABLE_INCREMENTAL && (REDIRECT_MALLOC
|| REDIRECT_MALLOC_IN_HEADER)] (GC_init, GC_enable_incremental):
Do not set GC_manual_vdb to true.
Victor Romero [Wed, 19 Jun 2019 22:31:01 +0000 (01:31 +0300)]
Specify rules for installing targets in CMake script
Issue #281 (bdwgc).
* CMakeLists.txt [build_cord] (cord): Specify install(TARGETS).
* CMakeLists.txt (gc): Likewise.
* CMakeLists.txt [enable_cplusplus] (gccpp): Likewise.
Ivan Maidanski [Wed, 19 Jun 2019 22:03:58 +0000 (01:03 +0300)]
.gitignore: Ignore libgccpp shared and static libraries generated by CMake
Ivan Maidanski [Wed, 19 Jun 2019 22:01:30 +0000 (01:01 +0300)]
Build gc_cpp.cc as gccpp library by CMake script
Issue #281 (bdwgc).
This matches the behavior of the Automake-based build script.
* CMakeLists.txt [enable_cplusplus] (SRC): Do not add gc_cpp.cc.
* CMakeLists.txt [enable_cplusplus] (gccpp): Specify add_library and
target_link_libraries.
* CMakeLists.txt [build_tests && enable_cplusplus] (test_cpp): Add gccpp
to target_link_libraries.
Ivan Maidanski [Wed, 19 Jun 2019 21:42:42 +0000 (00:42 +0300)]
Compile 'de' test GUI app with resources by CMake script
* CMakeLists.txt [build_tests && build_cord && WIN32] (de): Add
cord/tests/de_win.rc to add_executable specification.
Ivan Maidanski [Wed, 19 Jun 2019 20:49:22 +0000 (23:49 +0300)]
Fix 'cordtest: command not found' in Makefile.direct
(fix of commit
701ce8de2)
* Makefile.direct (check): Run ./cordtest instead of "cordtest".
Ivan Maidanski [Wed, 19 Jun 2019 20:44:20 +0000 (23:44 +0300)]
.gitignore: Ignore libcord shared and static libraries generated by CMake
Ivan Maidanski [Wed, 19 Jun 2019 20:41:38 +0000 (23:41 +0300)]
Fix 'unresolved external symbol _main' in gctest reported by MS VC
(fix of commit
78c458958)
Issue #281 (bdwgc).
* CMakeLists.txt [build_tests && enable_cplusplus] (test_cpp): Add WIN32
in add_executable specification.
Ivan Maidanski [Wed, 19 Jun 2019 08:48:40 +0000 (11:48 +0300)]
Build libcord by CMake script
Issue #281 (bdwgc).
* CMakeLists.txt [build_cord] (CORD_SRC): Set variable.
* CMakeLists.txt [build_cord] (cord): Specify add_library and
target_link_libraries; remove TODO.
* CMakeLists.txt [install_headers && build_cord] (cord/cord.h,
cord/cord_pos.h, cord/ec.h): Specify install.
* CMakeLists.txt [build_tests && build_cord] (cordtest, de): Do not
compile cord/cordbscs.c, cord/cordprnt.c, cord/cordxtra.c; add cord to
target_link_libraries specification.
Ivan Maidanski [Tue, 18 Jun 2019 22:36:08 +0000 (01:36 +0300)]
AppVeyor CI: Add CMake build with the default release configuration
Ivan Maidanski [Tue, 18 Jun 2019 22:34:23 +0000 (01:34 +0300)]
AppVeyor CI: Test CMake build with enable_large_config
Ivan Maidanski [Tue, 18 Jun 2019 22:26:10 +0000 (01:26 +0300)]
AppVeyor CI: Add CMake build with disabled shared libraries
Ivan Maidanski [Tue, 18 Jun 2019 21:18:27 +0000 (00:18 +0300)]
Generate cordtest and de executable files in GC base folder
This is to match the behavior of Automake- and CMake-based scripts.
* BCC_MAKEFILE (all, cord\de.exe): Rename cord\de.exe to de.exe.
* NT_MAKEFILE (all, cord\de.exe): Likewise.
* doc/README.win32: Likewise.
* Makefile.direct (cord/cordtest, clean, check): Rename cord/cordtest to
cordtest.
* SMakefile.amiga (all, clean, test, cord/cordtest): Likewise.
* Makefile.direct (cord/de): Rename cord/de to de$(EXEEXT); add cord/de
rule depending on de$(EXEEXT).
* Makefile.direct (clean): Rename cord/de to de.
* doc/README.cords: Likewise.
* OS2_MAKEFILE (all, cord\cordtest.exe): Rename cord\cordtest.exe to
cordtest.exe.
Ivan Maidanski [Tue, 18 Jun 2019 08:46:32 +0000 (11:46 +0300)]
Build gc as a shared library by default (CMake)
Issue #281 (bdwgc).
* CMakeLists.txt (BUILD_SHARED_LIBS): Document option and set default to ON.
* CMakeLists.txt: Remove commented out ADD_LIBRARY for atomic_ops.
* CMakeLists.txt [BUILD_SHARED_LIBS] (SRC): Override to extra/gc.c.
* CMakeLists.txt [BUILD_SHARED_LIBS] (GC_DLL): Define macro.
* CMakeLists.txt [!BUILD_SHARED_LIBS] (GC_NOT_DLL): Define macro not only
for tests but also for gc library.
* CMakeLists.txt (gc): Remove STATIC in add_library specification.
Ivan Maidanski [Tue, 18 Jun 2019 08:34:55 +0000 (11:34 +0300)]
Fix 'external linkage required for var because of dllimport' error on MinGW
* include/gc_config_macros.h [GC_DLL && !GC_API && !__CEGCC__
&& __MINGW32__ && !GC_BUILD && !__MINGW32_DELAY_LOAD__] (GC_API): Add
"extern" keyword.
Ivan Maidanski [Mon, 17 Jun 2019 07:51:11 +0000 (10:51 +0300)]
Enable test_cpp in CMake script
Issue #281 (bdwgc).
* CMakeLists.txt [enable_cplusplus] (test_cpp): Uncomment add_executable,
target_link_libraries, add_test; remove TODO.
Ivan Maidanski [Mon, 17 Jun 2019 07:18:52 +0000 (10:18 +0300)]
Fix building of shared library with C++ support on MinGW
* include/gc_config_macros.h [GC_DLL && !GC_API && __MINGW32__
&& GC_BUILD && __cplusplus] (GC_API): Add "extern" keyword.
Ivan Maidanski [Sat, 15 Jun 2019 12:30:32 +0000 (15:30 +0300)]
Move test executable files produced by CMake to the base folder
Issue #281 (bdwgc).
This is done by moving the content of cord/CMakeLists.txt and
tests/CMakeLists.txt files to the base CMakeLists.txt.
* CMakeLists.txt [build_tests && build_cord]: Move content from
cord/CMakeLists.txt.
* CMakeLists.txt [build_tests && build_cord] (cordtest, de): Add
"cord/" to .c files in add_executable.
* CMakeLists.txt [build_tests]: Move content from tests/CMakeLists.txt.
* CMakeLists.txt [build_tests] (gctest, hugetest, leaktest, middletest,
realloc_test, smashtest, tracetest, test_cpp, disclaim_bench,
disclaim_test, disclaim_weakmap_test, disclaim_weakmap_test): Add
"tests/" to .c and .cc files in add_executable.
* Makefile.am (EXTRA_DIST): Remove cord/CMakeLists.txt,
tests/CMakeLists.txt.
* doc/README.cmake: Update info about CMakeLists.txt files (there is
just one file now).
* cord/CMakeLists.txt: Remove file.
* tests/CMakeLists.txt: Likewise.
Victor Romero [Sat, 15 Jun 2019 10:52:08 +0000 (13:52 +0300)]
Rename libgc-lib.a to libgc.a in CMake script
Issue #281 (bdwgc).
Also specify that libgc.a is used privately in test executables.
* CMakeLists.txt (gc-lib): Rename library to gc in add_library and
set_target_properties.
* cord/CMakeLists.txt [build_tests] (cordtest, de): Rename gc-lib to gc
and add PRIVATE in target_link_libraries.
* tests/CMakeLists.txt (gctest, hugetest, leaktest, middletest,
realloc_test, smashtest): Likewise.
* tests/CMakeLists.txt [enable_gc_debug] (tracetest): Likewise.
* tests/CMakeLists.txt [enable_disclaim] (disclaim_bench,
disclaim_test, disclaim_weakmap_test): Likewise.
Ivan Maidanski [Fri, 14 Jun 2019 07:40:09 +0000 (10:40 +0300)]
Remove gcmt-dll generation by CMake
Issue #281 (bdwgc).
Now only gc-lib is produced.
* CMakeLists.txt (gcmt-dll): Remove add_library command.
Ivan Maidanski [Fri, 14 Jun 2019 07:36:48 +0000 (10:36 +0300)]
Remove gcmt-lib generation by CMake
Because of an incorrect definition, gcmt-lib was identical to gc-lib.
* CMakeLists.txt (gcmt-lib): Remove add_library and
set_target_properties commands.
Ivan Maidanski [Fri, 14 Jun 2019 07:12:47 +0000 (10:12 +0300)]
Restrict CMake project to C-only language unless enable_cplusplus
Issue #281 (bdwgc).
* CMakeLists.txt (enable_cplusplus): Move option to above project
command.
* CMakeLists.txt [!enable_cplusplus] (project): Specify C as the only
project language.
Ivan Maidanski [Thu, 13 Jun 2019 22:09:15 +0000 (01:09 +0300)]
Fix gc_cpp.cc compilation by CMake if enable_single_obj_compilation
(fix of commit
17885ab0b)
Issue #281 (bdwgc).
* CMakeLists.txt [enable_cplusplus] (SRC): Add gc_cpp.cc after SRC
overridden to extra/gc.c (not before) if enable_single_obj_compilation.
Ivan Maidanski [Thu, 13 Jun 2019 08:02:15 +0000 (11:02 +0300)]
.gitignore: Ignore CMake-generated libgc.dll.a
Ivan Maidanski [Tue, 11 Jun 2019 07:09:21 +0000 (10:09 +0300)]
Remove unnecessary checks of __ELF__ for NaCl
(code refactoring of commit
9738a14a0)
* dyn_load.c [NACL]: Assume __ELF__ is always defined.
Ivan Maidanski [Tue, 11 Jun 2019 06:37:20 +0000 (09:37 +0300)]
.gitignore: Ignore CMake-generated libgc.a
Ivan Maidanski [Tue, 11 Jun 2019 06:36:09 +0000 (09:36 +0300)]
Update AUTHORS file (add Maya Rashish)
Maya Rashish [Thu, 6 Jun 2019 02:43:51 +0000 (05:43 +0300)]
Get rid of some non-ELF ifdefs
(code refactoring)
Issue #283 (bdwgc).
Linux started switching to ELF in 1995 (Linux-2.0), due to the previous
a.out being really bad.
NetBSD has used ELF since 2002 (NetBSD 1.6), it's OK to let it go now.
FreeBSD switched to ELF in FreeBSD 3.0 (1998).
* include/private/gcconfig.h [(POWERPC || SPARC || MIPS || ALPHA
|| AARCH64 || ARM32 || X86_64) && FREEBSD] (DYNAMIC_LOADING): Define
regardless of __ELF__ (assuming __ELF__ is always defined).
* include/private/gcconfig.h [(ARM32 || X86_64 || HEXAGON) && LINUX]
(DYNAMIC_LOADING, SEARCH_FOR_DATA_START, DATASTART, DATAEND): Likewise.
* include/private/gcconfig.h [X86_64 && NETBSD] (DATASTART,
DYNAMIC_LOADING): Likewise.
Peter Wang [Thu, 6 Jun 2019 07:36:54 +0000 (17:36 +1000)]
Fix mmap(PROT_NONE) failure on AIX
Issue #285 (bdwgc).
Unmap memory using mprotect(PROT_NONE) instead of mmap(PROT_NONE) on AIX.
* os_dep [USE_MUNMAP && AIX] (GC_unmap, GC_unmap_gap): Call mprotect()
instead of mmap(); update comment.
Ivan Maidanski [Fri, 7 Jun 2019 18:33:32 +0000 (21:33 +0300)]
Add CMake option to compile all library .c files into single object file
Issue #281 (bdwgc).
* CMakeLists.txt (enable_single_obj_compilation): New option (off by
default).
* CMakeLists.txt [enable_single_obj_compilation] (SRC): Override value
to extra/gc.c.
* CMakeLists.txt [enable_single_obj_compilation
&& CMAKE_USE_PTHREADS_INIT]: Define GC_PTHREAD_START_STANDALONE macro.
* CMakeLists.txt [enable_single_obj_compilation
&& CMAKE_USE_PTHREADS_INIT] (SRC): Append pthread_start.c (in addition
to extra/gc.c).
Victor Romero [Fri, 7 Jun 2019 07:35:31 +0000 (10:35 +0300)]
Fix build for OS X (CMake)
Issue #275 (bdwgc).
Having "ppc" in CMAKE_OSX_ARCHITECTURES fails the build on Mac
OS X 10.13, at least.
* CMakeLists.txt [APPLE && $CMAKE_OSX_ARCHITECTURES==""]
(CMAKE_OSX_ARCHITECTURES): Set to "x86_64;i386" (instead of
"ppc;i386;x86_64").
Victor Romero [Fri, 7 Jun 2019 06:40:20 +0000 (09:40 +0300)]
Define _CRT_SECURE_NO_DEPRECATE macro in CMake script only for MS VC
(fix of commit
f5006fcc5)
Issue #281 (bdwgc).
* CMakeLists.txt (add_definitions): Define _CRT_SECURE_NO_DEPRECATE
only if MSVC (instead of WIN32).
Victor Romero [Fri, 7 Jun 2019 06:34:27 +0000 (09:34 +0300)]
Support header files installation in CMake script
Issue #281 (bdwgc).
Now, "cmake --target install" copies the public header files (to the
installation destination) unless -Dinstall_headers=OFF is passed to
cmake.
* CMakeLists.txt (install_headers): New option (on by default).
* CMakeLists.txt [install_headers] (include/gc.h, include/gc_backptr.h,
include/gc_config_macros.h, include/gc_gcj.h, include/gc_inline.h,
include/gc_mark.h, include/gc_pthread_redirects.h,
include/gc_tiny_fl.h, include/gc_typed.h, include/gc_version.h,
include/javaxfc.h, include/leak_detector.h): Specify install to
"include/gc" folder.
* CMakeLists.txt [install_headers && enable_cplusplus]
(include/gc_allocator.h, include/gc_cpp.h): Likewise.
* CMakeLists.txt [install_headers && enable_disclaim]
(include/gc_disclaim.h): Likewise.
* CMakeLists.txt [install_headers] (include/extra/gc.h): Specify
install to "include" folder.
* CMakeLists.txt [install_headers && enable_cplusplus]
(include/extra/gc_cpp.h): Likewise.
Ivan Maidanski [Thu, 6 Jun 2019 07:29:56 +0000 (10:29 +0300)]
Appveyor CI: Turn on build_test and enable_cplusplus for CMake
Victor Romero [Thu, 6 Jun 2019 07:24:28 +0000 (10:24 +0300)]
Do not build the tests by default (CMake)
Issue #281 (bdwgc).
build_cord and build_tests options are introduced in the CMake script.
* CMakeLists.txt (build_cord): Add option (on by default); add comment.
* CMakeLists.txt (build_tests): Add option (off by default).
* CMakeLists.txt (cord): Specify add_subdirectory only if build_cord.
* CMakeLists.txt (tests): Specify add_subdirectory only if build_tests.
* cord/CMakeLists.txt: Skip cordtest and de tests unless build_tests.
Peter Wang [Thu, 6 Jun 2019 02:48:17 +0000 (12:48 +1000)]
Fix 'ulong undefined' compilation error on AIX
* include/gc.h [_AIX] (GC_DATASTART, GC_DATAEND): Remove cast to ulong.
Ivan Maidanski [Thu, 6 Jun 2019 06:48:19 +0000 (09:48 +0300)]
Appveyor CI: Pass --build-config to ctest again
(fix of commit
906280234)
Ivan Maidanski [Thu, 6 Jun 2019 06:40:06 +0000 (09:40 +0300)]
Add cordtest to CMake script and rename cord/cord executable to cord/de
Issue #281 (bdwgc).
* cord/CMakeLists.txt (cordtest): Specify add_executable,
set_target_properties, target_link_libraries and add_test.
* cord/CMakeLists.txt [WIN32] (cord): Rename executable to de.
Ivan Maidanski [Wed, 5 Jun 2019 08:50:29 +0000 (11:50 +0300)]
.gitignore: Ignore CMake-generated files in cord folder
Ivan Maidanski [Wed, 5 Jun 2019 08:25:32 +0000 (11:25 +0300)]
Move CMake cord specification and cord executable to cord folder
Issue #281 (bdwgc).
* CMakeLists.txt [WIN32]: Move add_executable, set_target_properties,
target_link_libraries for cord to cord/CMakeLists.txt.
* CMakeLists.txt (cord): Specify add_subdirectory.
* Makefile.am (EXTRA_DIST): Add cord/CMakeLists.txt.
* cord/CMakeLists.txt: New file.
Victor Romero [Wed, 5 Jun 2019 07:49:30 +0000 (10:49 +0300)]
Define _CRT_SECURE_NO_DEPRECATE macro in CMake script only for Win32
Issue #281 (bdwgc).
* CMakeLists.txt (add_definitions): Define _CRT_SECURE_NO_DEPRECATE
only if WIN32.
Ivan Maidanski [Wed, 5 Jun 2019 07:02:28 +0000 (10:02 +0300)]
Add tracetest and disclaim tests to CMake script
Issue #281 (bdwgc).
* tests/CMakeLists.txt [enable_gc_debug] (tracetest): Specify
add_executable, target_link_libraries, add_test.
* tests/CMakeLists.txt [enable_disclaim] (disclaim_bench,
disclaim_test, disclaim_weakmap_test): Likewise.
Ivan Maidanski [Wed, 5 Jun 2019 06:53:15 +0000 (09:53 +0300)]
Turn off C++ API in CMake script by default
Issue #281 (bdwgc).
This is to match the behavior of configure script.
Now, -Denable_cplusplus=ON should be passed to cmake to enable C++ API.
* CMakeLists.txt (enable_cplusplus): Add option (off by default);
remove TODO.
* CMakeLists.txt (SRC): Add gc_cpp.cc only if enable_cplusplus.
* tests/CMakeLists.txt (leak_test.c, test.c): Set CXX langunage
property only if enable_cplusplus.
* tests/CMakeLists.txt [enable_cplusplus]: Add TODO to add test_cpp as
a test.
Ivan Maidanski [Tue, 4 Jun 2019 20:20:43 +0000 (23:20 +0300)]
Support enable_sigrt_signals option by CMake script
Issue #281 (bdwgc).
* CMakeLists.txt (enable_sigrt_signals): Add option (default to OFF).
* CMakeLists.txt [CMAKE_USE_PTHREADS_INIT && enable_sigrt_signals]:
Define GC_USESIGRT_SIGNALS macro.
Ivan Maidanski [Tue, 4 Jun 2019 08:02:18 +0000 (11:02 +0300)]
Appveyor CI: Pass CMAKE_OPTIONS to cmake only when configuring
Ivan Maidanski [Tue, 4 Jun 2019 07:08:57 +0000 (10:08 +0300)]
.gitignore: Ignore libgcmt-dll.dll.a (produced by CMake)
Ivan Maidanski [Fri, 31 May 2019 06:26:35 +0000 (09:26 +0300)]
Travis CI: Output content of threadleaktest.log
Ivan Maidanski [Thu, 30 May 2019 22:07:39 +0000 (01:07 +0300)]
Update AUTHORS file (add Victor Romero)
Victor Romero [Thu, 30 May 2019 22:05:25 +0000 (01:05 +0300)]
Group all options near the top of CMake script
(code refactoring)
Issue #281 (bdwgc).
* CMakeLists.txt (option): Group all items together close to the
beginning of the file; reorder items to match that of configure.
Victor Romero [Thu, 30 May 2019 19:26:26 +0000 (12:26 -0700)]
Upgrade cmake_minimum_required(version) to 3.1
Issue #281 (bdwgc).
* CMakeLists.txt (CMAKE_LEGACY_CYGWIN_WIN32): Remove (do not set).
* CMakeLists.txt (VERSION): Change cmake_minimum_required from 2.6
to 3.1.