From 61753089e70f0a8dea8de598dc59fa46b17ea957 Mon Sep 17 00:00:00 2001 From: ivmai Date: Wed, 30 Sep 2009 18:46:40 +0000 Subject: [PATCH] 2009-09-30 Ivan Maidanski * Makefile.direct: Remove trailing spaces at EOLn. * Makefile.direct: Document GC_REGISTER_MEM_PRIVATE. * mark_rts.c (GC_is_tmp_root): Define also for WinCE unless NO_DEBUGGING (that is, replace _WIN32_WCE_EMULATION with MSWINCE). * os_dep.c (GC_sysinfo): Remove explicit global variable initialization to "{0}" (revert back the previous change) since it might produce a warning. --- ChangeLog | 10 ++++++++++ Makefile.direct | 22 +++++++++++++--------- mark_rts.c | 5 ++--- os_dep.c | 2 +- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43e01011..f7bbfad2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-09-30 Ivan Maidanski + + * Makefile.direct: Remove trailing spaces at EOLn. + * Makefile.direct: Document GC_REGISTER_MEM_PRIVATE. + * mark_rts.c (GC_is_tmp_root): Define also for WinCE unless + NO_DEBUGGING (that is, replace _WIN32_WCE_EMULATION with MSWINCE). + * os_dep.c (GC_sysinfo): Remove explicit global variable + initialization to "{0}" (revert back the previous change) since it + might produce a warning. + 2009-09-30 Ivan Maidanski * allchblk.c (GC_large_alloc_warn_interval): Move declaration from diff --git a/Makefile.direct b/Makefile.direct index 4c7eac9c..587dd431 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -6,10 +6,10 @@ # c++ - adds C++ interface to library # cords - adds cords (heavyweight strings) to library # test - prints porting information, then builds basic version of gc.a, -# and runs some tests of collector and cords. Does not add cords or -# c++ interface to gc.a +# and runs some tests of collector and cords. Does not add cords or +# c++ interface to gc.a # cord/de - builds dumb editor based on cords. -ABI_FLAG= +ABI_FLAG= # ABI_FLAG should be the cc flag that specifies the ABI. On most # platforms this will be the empty string. Possible values: # +DD64 for 64-bit executable on HP/UX. @@ -96,7 +96,7 @@ HOSTCFLAGS=$(CFLAGS) # to be used. Requires -DGC_WIN32_PTHREADS. # -DGC_PTHREADS_PARAMARK causes pthread-based parallel mark implementation # to be used even if GC_WIN32_PTHREADS is undefined. (Useful for WinCE.) -# +# # -DALL_INTERIOR_POINTERS allows all pointers to the interior # of objects to be recognized. (See gc_priv.h for consequences.) # Alternatively, GC_all_interior_pointers can be set at process @@ -284,6 +284,10 @@ HOSTCFLAGS=$(CFLAGS) # to GC_WinMain; implement the "real" WinMain which starts a new thread to # call GC_WinMain after initializing the GC. Useful for WinCE. # Incompatible with GC_DLL. +# -DGC_REGISTER_MEM_PRIVATE (Win32 only) Force to register MEM_PRIVATE R/W +# sections as data roots. Might be needed for some WinCE 6.0+ custom +# builds. (May result in numerous "Data Abort" messages logged to WinCE +# debugging console.) Incompatible with GCC toolchains for WinCE. # -DNO_GETENV prevents the collector from looking at environment variables. # These may otherwise alter its configuration, or turn off GC altogether. # I don't know of a reason to disable this, except possibly if the @@ -383,7 +387,7 @@ HOSTCFLAGS=$(CFLAGS) # argue about its safety without the collector.) # -CXXFLAGS= $(CFLAGS) +CXXFLAGS= $(CFLAGS) AR= ar RANLIB= ranlib @@ -456,7 +460,7 @@ OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE gc.mak \ PCR-Makefile SMakefile.amiga Makefile.DLLs \ digimars.mak Makefile.direct NT_STATIC_THREADS_MAKEFILE \ NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \ - build_atomic_ops.sh build_atomic_ops.sh.cygwin + build_atomic_ops.sh build_atomic_ops.sh.cygwin OTHER_FILES= Makefile extra/setjmp_t.c callprocs \ MacProjects.sit.hqx extra/MacOS.c \ @@ -489,7 +493,7 @@ all: gc.a gctest # if AO_INSTALL_DIR doesn't exist, we assume that it is pointing to # the default location, and we need to build -$(AO_INSTALL_DIR): +$(AO_INSTALL_DIR): CC=$(CC) MAKE=$(MAKE) $(srcdir)/build_atomic_ops.sh LEAKFLAGS=$(CFLAGS) -DFIND_LEAK @@ -700,10 +704,10 @@ threadlibs: $(srcdir)/extra/threadlibs.c $(srcdir)/include/private/gcconfig.h Ma if_not_there: $(srcdir)/extra/if_not_there.c $(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/extra/if_not_there.c -clean: +clean: rm -f gc.a *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \ setjmp_test mon.out gmon.out a.out core if_not_there if_mach \ - threadlibs $(CORD_OBJS) cord/cordtest cord/de + threadlibs $(CORD_OBJS) cord/cordtest cord/de -rm -f *~ gctest: tests/test.o gc.a $(UTILS) diff --git a/mark_rts.c b/mark_rts.c index 1326d39e..b0944d65 100644 --- a/mark_rts.c +++ b/mark_rts.c @@ -332,8 +332,7 @@ STATIC void GC_remove_roots_inner(ptr_t b, ptr_t e) } #endif /* !defined(MSWIN32) && !defined(MSWINCE) */ -#if (defined(MSWIN32) || defined(_WIN32_WCE_EMULATION)) \ - && !defined(NO_DEBUGGING) +#if (defined(MSWIN32) || defined(MSWINCE)) && !defined(NO_DEBUGGING) /* Not used at present (except for, may be, debugging purpose). */ /* Workaround for the OS mapping and unmapping behind our back: */ /* Is the address p in one of the temporary static root sections? */ @@ -355,7 +354,7 @@ GC_bool GC_is_tmp_root(ptr_t p) } return(FALSE); } -#endif /* MSWIN32 || _WIN32_WCE_EMULATION */ +#endif /* MSWIN32 || MSWINCE */ ptr_t GC_approx_sp(void) { diff --git a/os_dep.c b/os_dep.c index 20f06153..0a6b8d8f 100644 --- a/os_dep.c +++ b/os_dep.c @@ -1873,7 +1873,7 @@ void * os2_alloc(size_t bytes) # if defined(MSWIN32) || defined(MSWINCE) -SYSTEM_INFO GC_sysinfo = {0}; + SYSTEM_INFO GC_sysinfo; # endif # ifdef MSWIN32 -- 2.40.0