[BACK]Return to gc-7.4.2-risa.diff CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir-gc

Diff for /OpenXM_contrib2/asir-gc/gc-7.4.2-risa.diff between version 1.1 and 1.2

version 1.1, 2020/01/08 16:02:00 version 1.2, 2020/01/09 12:56:05
Line 1 
Line 1 
 diff -ubBr gc-7.4.2.orig/Makefile.am gc-7.4.2/Makefile.am  diff -ubBr gc-7.6.12.orig/Makefile.am gc-7.6.12/Makefile.am
 --- gc-7.4.2.orig/Makefile.am   2014-06-03 15:08:01.000000000 +0900  --- gc-7.6.12.orig/Makefile.am  2019-03-02 05:53:14.000000000 +0900
 +++ gc-7.4.2/Makefile.am        2020-01-08 13:36:45.002761000 +0900  +++ gc-7.6.12/Makefile.am       2020-01-09 21:27:12.462046000 +0900
 @@ -48,12 +48,12 @@  @@ -54,21 +54,21 @@
  # C Library   # C Library
  # ---------   # ---------
   
 -lib_LTLIBRARIES += libgc.la  -lib_LTLIBRARIES += libgc.la
 +lib_LTLIBRARIES += libasir-gc.la  +lib_LTLIBRARIES += libasir-gc.la
   
  if SINGLE_GC_OBJ   if SINGLE_GC_OBJ
   
 -libgc_la_SOURCES = extra/gc.c  -libgc_la_SOURCES = extra/gc.c
 +libasir-gc_la_SOURCES = extra/gc.c  +libasir-gc_la_SOURCES = extra/gc.c
   
    if PTHREAD_START_STANDALONE
    AM_CPPFLAGS += -DGC_PTHREAD_START_STANDALONE
   -libgc_la_SOURCES += pthread_start.c
   +libasir-gc_la_SOURCES += pthread_start.c
    endif
   
  else   else
   
  EXTRA_DIST += extra/gc.c   EXTRA_DIST += extra/gc.c
 -libgc_la_SOURCES = \  -libgc_la_SOURCES = \
 +libasir-gc_la_SOURCES = \  +libasir-gc_la_SOURCES = \
      allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \       allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
      dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \       dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
      mach_dep.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \       mach_dep.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
 @@ -64,43 +64,43 @@  @@ -79,46 +79,46 @@
  # ---------------------------------   # ---------------------------------
   
  if WIN32_THREADS   if WIN32_THREADS
 -libgc_la_SOURCES += win32_threads.c  -libgc_la_SOURCES += thread_local_alloc.c win32_threads.c
 +libasir-gc_la_SOURCES += win32_threads.c  +libasir-gc_la_SOURCES += thread_local_alloc.c win32_threads.c
  else   else
  if PTHREADS   if PTHREADS
 -libgc_la_SOURCES += pthread_start.c pthread_support.c   # Not Cygwin or MinGW.
 +libasir-gc_la_SOURCES += pthread_start.c pthread_support.c  -libgc_la_SOURCES += pthread_start.c pthread_support.c thread_local_alloc.c
   +libasir-gc_la_SOURCES += pthread_start.c pthread_support.c thread_local_alloc.c
  if DARWIN_THREADS   if DARWIN_THREADS
 -libgc_la_SOURCES += darwin_stop_world.c  -libgc_la_SOURCES += darwin_stop_world.c
 +libasir-gc_la_SOURCES += darwin_stop_world.c  +libasir-gc_la_SOURCES += darwin_stop_world.c
Line 47  diff -ubBr gc-7.4.2.orig/Makefile.am gc-7.4.2/Makefile
Line 58  diff -ubBr gc-7.4.2.orig/Makefile.am gc-7.4.2/Makefile
 +libasir-gc_la_SOURCES += fnlz_mlc.c  +libasir-gc_la_SOURCES += fnlz_mlc.c
  endif   endif
   
    ## End of !SINGLE_GC_OBJ
  endif   endif
   
  if USE_INTERNAL_LIBATOMIC_OPS   if USE_INTERNAL_LIBATOMIC_OPS
Line 63  diff -ubBr gc-7.4.2.orig/Makefile.am gc-7.4.2/Makefile
Line 75  diff -ubBr gc-7.4.2.orig/Makefile.am gc-7.4.2/Makefile
  # linuxthread semaphore functions get linked:   # linuxthread semaphore functions get linked:
 -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)  -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
 -libgc_la_DEPENDENCIES = @addobjs@  -libgc_la_DEPENDENCIES = @addobjs@
 -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined  -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
 +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)  +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
 +libasir-gc_la_DEPENDENCIES = @addobjs@  +libasir-gc_la_DEPENDENCIES = @addobjs@
 +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined  +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
        -no-undefined
   
 -EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \  -EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
 +EXTRA_libasir-gc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \  +EXTRA_libasir-gc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
      src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s       sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s
   
    if CPLUSPLUS
 @@ -112,7 +112,7 @@  @@ -128,7 +128,7 @@
  pkginclude_HEADERS += include/gc_cpp.h   pkginclude_HEADERS += include/gc_cpp.h
  include_HEADERS += include/extra/gc_cpp.h   include_HEADERS += include/extra/gc_cpp.h
  libgccpp_la_SOURCES = gc_cpp.cc   libgccpp_la_SOURCES = gc_cpp.cc
 -libgccpp_la_LIBADD = ./libgc.la  -libgccpp_la_LIBADD = ./libgc.la
 +libgccpp_la_LIBADD = ./libasir-gc.la  +libgccpp_la_LIBADD = ./libasir-gc.la
  libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined   libgccpp_la_LDFLAGS = -version-info $(LIBGCCPP_VER_INFO) -no-undefined
  endif   endif
   
 @@ -130,7 +130,7 @@  @@ -149,7 +149,7 @@
   
  ## FIXME: relies on internal code generated by automake.   ## FIXME: relies on internal code generated by automake.
  ## FIXME: ./configure --enable-dependency-tracking should be used   ## FIXME: ./configure --enable-dependency-tracking should be used
Line 91  diff -ubBr gc-7.4.2.orig/Makefile.am gc-7.4.2/Makefile
Line 104  diff -ubBr gc-7.4.2.orig/Makefile.am gc-7.4.2/Makefile
  #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \   #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
  #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \   #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
  #include/gc_pthread_redirects.h include/gc_config_macros.h \   #include/gc_pthread_redirects.h include/gc_config_macros.h \
 diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile.in  diff -ubBr gc-7.6.12.orig/Makefile.in gc-7.6.12/Makefile.in
 --- gc-7.4.2.orig/Makefile.in   2014-06-04 05:09:25.000000000 +0900  --- gc-7.6.12.orig/Makefile.in  2019-03-02 05:55:05.000000000 +0900
 +++ gc-7.4.2/Makefile.in        2020-01-08 13:37:03.227679000 +0900  +++ gc-7.6.12/Makefile.in       2020-01-09 21:27:06.542517000 +0900
 @@ -215,7 +215,7 @@  @@ -219,7 +219,7 @@
         "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" \          "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" \
         "$(DESTDIR)$(pkgincludedir)"          "$(DESTDIR)$(includedir)" "$(DESTDIR)$(pkgincludedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES)   LTLIBRARIES = $(lib_LTLIBRARIES)
 -libcord_la_DEPENDENCIES = $(top_builddir)/libgc.la  -libcord_la_DEPENDENCIES = $(top_builddir)/libgc.la
 +libcord_la_DEPENDENCIES = $(top_builddir)/libasir-gc.la  +libcord_la_DEPENDENCIES = $(top_builddir)/libasir-gc.la
  am__dirstamp = $(am__leading_dot)dirstamp   am__dirstamp = $(am__leading_dot)dirstamp
  am_libcord_la_OBJECTS = cord/libcord_la-cordbscs.lo \   am_libcord_la_OBJECTS = cord/libcord_la-cordbscs.lo \
         cord/libcord_la-cordprnt.lo cord/libcord_la-cordxtra.lo          cord/libcord_la-cordprnt.lo cord/libcord_la-cordxtra.lo
 @@ -228,7 +228,7 @@  @@ -232,7 +232,7 @@
         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \          $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
         $(libcord_la_LDFLAGS) $(LDFLAGS) -o $@          $(libcord_la_LDFLAGS) $(LDFLAGS) -o $@
  am__DEPENDENCIES_1 =   am__DEPENDENCIES_1 =
Line 112  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 125  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
         dbg_mlc.c dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c \          dbg_mlc.c dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c \
         headers.c mach_dep.c malloc.c mallocx.c mark.c mark_rts.c \          headers.c mach_dep.c malloc.c mallocx.c mark.c mark_rts.c \
         misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c \          misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c \
 @@ -246,7 +246,7 @@  @@ -252,7 +252,7 @@
  @MAKE_BACK_GRAPH_TRUE@@SINGLE_GC_OBJ_FALSE@    backgraph.lo  
  @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@am__objects_6 =  \   @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@am__objects_6 =  \
  @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@    fnlz_mlc.lo   @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@    fnlz_mlc.lo
    @PTHREAD_START_STANDALONE_TRUE@@SINGLE_GC_OBJ_TRUE@am__objects_7 = pthread_start.lo
 -@SINGLE_GC_OBJ_FALSE@am_libgc_la_OBJECTS = allchblk.lo alloc.lo \  -@SINGLE_GC_OBJ_FALSE@am_libgc_la_OBJECTS = allchblk.lo alloc.lo \
 +@SINGLE_GC_OBJ_FALSE@am_libasir-gc_la_OBJECTS = allchblk.lo alloc.lo \  +@SINGLE_GC_OBJ_FALSE@am_libasir-gc_la_OBJECTS = allchblk.lo alloc.lo \
  @SINGLE_GC_OBJ_FALSE@  blacklst.lo checksums.lo dbg_mlc.lo \   @SINGLE_GC_OBJ_FALSE@  blacklst.lo checksums.lo dbg_mlc.lo \
  @SINGLE_GC_OBJ_FALSE@  dyn_load.lo finalize.lo gc_dlopen.lo \   @SINGLE_GC_OBJ_FALSE@  dyn_load.lo finalize.lo gc_dlopen.lo \
  @SINGLE_GC_OBJ_FALSE@  gcj_mlc.lo headers.lo mach_dep.lo \   @SINGLE_GC_OBJ_FALSE@  gcj_mlc.lo headers.lo mach_dep.lo \
 @@ -259,17 +259,17 @@  @@ -264,17 +264,17 @@
  @SINGLE_GC_OBJ_FALSE@  $(am__objects_2) $(am__objects_3) \   @SINGLE_GC_OBJ_FALSE@  $(am__objects_2) $(am__objects_3) \
  @SINGLE_GC_OBJ_FALSE@  $(am__objects_4) $(am__objects_5) \   @SINGLE_GC_OBJ_FALSE@  $(am__objects_4) $(am__objects_5) \
  @SINGLE_GC_OBJ_FALSE@  $(am__objects_6)   @SINGLE_GC_OBJ_FALSE@  $(am__objects_6)
 -@SINGLE_GC_OBJ_TRUE@am_libgc_la_OBJECTS = extra/gc.lo $(am__objects_1) \  -@SINGLE_GC_OBJ_TRUE@am_libgc_la_OBJECTS = extra/gc.lo $(am__objects_7) \
 +@SINGLE_GC_OBJ_TRUE@am_libasir-gc_la_OBJECTS = extra/gc.lo $(am__objects_1) \  +@SINGLE_GC_OBJ_TRUE@am_libasir-gc_la_OBJECTS = extra/gc.lo $(am__objects_7) \
  @SINGLE_GC_OBJ_TRUE@   $(am__objects_2) $(am__objects_3) \   @SINGLE_GC_OBJ_TRUE@   $(am__objects_1) $(am__objects_2) \
  @SINGLE_GC_OBJ_TRUE@   $(am__objects_4) $(am__objects_5) \   @SINGLE_GC_OBJ_TRUE@   $(am__objects_3) $(am__objects_4) \
  @SINGLE_GC_OBJ_TRUE@   $(am__objects_6)   @SINGLE_GC_OBJ_TRUE@   $(am__objects_5) $(am__objects_6)
 -@NEED_ATOMIC_OPS_ASM_FALSE@@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops.lo  -@NEED_ATOMIC_OPS_ASM_FALSE@@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops.lo
 -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops_sysdeps.lo  -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops_sysdeps.lo
 -libgc_la_OBJECTS = $(am_libgc_la_OBJECTS) $(nodist_libgc_la_OBJECTS)  -libgc_la_OBJECTS = $(am_libgc_la_OBJECTS) $(nodist_libgc_la_OBJECTS)
Line 146  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 159  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
  am__libgccpp_la_SOURCES_DIST = gc_cpp.cc   am__libgccpp_la_SOURCES_DIST = gc_cpp.cc
  @CPLUSPLUS_TRUE@am_libgccpp_la_OBJECTS = gc_cpp.lo   @CPLUSPLUS_TRUE@am_libgccpp_la_OBJECTS = gc_cpp.lo
  libgccpp_la_OBJECTS = $(am_libgccpp_la_OBJECTS)   libgccpp_la_OBJECTS = $(am_libgccpp_la_OBJECTS)
 @@ -277,7 +277,7 @@  @@ -282,8 +282,8 @@
         $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \          $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
         $(CXXFLAGS) $(libgccpp_la_LDFLAGS) $(LDFLAGS) -o $@          $(CXXFLAGS) $(libgccpp_la_LDFLAGS) $(LDFLAGS) -o $@
  @CPLUSPLUS_TRUE@am_libgccpp_la_rpath = -rpath $(libdir)   @CPLUSPLUS_TRUE@am_libgccpp_la_rpath = -rpath $(libdir)
 -am__DEPENDENCIES_2 = $(top_builddir)/libgc.la $(am__DEPENDENCIES_1)  -am__DEPENDENCIES_2 = $(nodist_libgc_la_OBJECTS) \
 +am__DEPENDENCIES_2 = $(top_builddir)/libasir-gc.la $(am__DEPENDENCIES_1)  -       $(top_builddir)/libgc.la $(am__DEPENDENCIES_1)
   +am__DEPENDENCIES_2 = $(nodist_libasir-gc_la_OBJECTS) \
   +       $(top_builddir)/libasir-gc.la $(am__DEPENDENCIES_1)
  libstaticrootslib2_test_la_DEPENDENCIES = $(am__DEPENDENCIES_2)   libstaticrootslib2_test_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
  am_libstaticrootslib2_test_la_OBJECTS =  \   am_libstaticrootslib2_test_la_OBJECTS =  \
         tests/libstaticrootslib2_test_la-staticrootslib.lo          tests/libstaticrootslib2_test_la-staticrootslib.lo
 @@ -304,7 +304,7 @@  @@ -310,7 +310,7 @@
  @ENABLE_DISCLAIM_TRUE@ disclaim_bench$(EXEEXT)   @ENABLE_DISCLAIM_TRUE@ disclaim_bench$(EXEEXT)
  am_cordtest_OBJECTS = cord/tests/cordtest.$(OBJEXT)   am_cordtest_OBJECTS = cord/tests/cordtest.$(OBJEXT)
  cordtest_OBJECTS = $(am_cordtest_OBJECTS)   cordtest_OBJECTS = $(am_cordtest_OBJECTS)
Line 164  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 179  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
         $(top_builddir)/libcord.la          $(top_builddir)/libcord.la
  am__disclaim_bench_SOURCES_DIST = tests/disclaim_bench.c   am__disclaim_bench_SOURCES_DIST = tests/disclaim_bench.c
  @ENABLE_DISCLAIM_TRUE@am_disclaim_bench_OBJECTS =  \   @ENABLE_DISCLAIM_TRUE@am_disclaim_bench_OBJECTS =  \
 @@ -459,8 +459,8 @@  @@ -465,8 +465,8 @@
  am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@)   am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@)
  am__v_CCAS_0 = @echo "  CCAS    " $@;   am__v_CCAS_0 = @echo "  CCAS    " $@;
  am__v_CCAS_1 =   am__v_CCAS_1 =
Line 175  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 190  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
         $(libgccpp_la_SOURCES) $(libstaticrootslib2_test_la_SOURCES) \          $(libgccpp_la_SOURCES) $(libstaticrootslib2_test_la_SOURCES) \
         $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \          $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \
         $(disclaim_bench_SOURCES) $(disclaim_test_SOURCES) \          $(disclaim_bench_SOURCES) $(disclaim_test_SOURCES) \
 @@ -471,8 +471,8 @@  @@ -477,8 +477,8 @@
         $(subthreadcreate_test_SOURCES) $(test_cpp_SOURCES) \          $(subthreadcreate_test_SOURCES) $(test_cpp_SOURCES) \
         $(threadkey_test_SOURCES) $(threadleaktest_SOURCES) \          $(threadkey_test_SOURCES) $(threadleaktest_SOURCES) \
         $(tracetest_SOURCES)          $(tracetest_SOURCES)
Line 186  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 201  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
         $(libstaticrootslib2_test_la_SOURCES) \          $(libstaticrootslib2_test_la_SOURCES) \
         $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \          $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \
         $(am__disclaim_bench_SOURCES_DIST) \          $(am__disclaim_bench_SOURCES_DIST) \
 @@ -960,7 +960,7 @@  @@ -985,7 +985,7 @@
   
  # C Library   # C Library
  # ---------   # ---------
 -lib_LTLIBRARIES = libgc.la $(am__append_8) libcord.la  -lib_LTLIBRARIES = libgc.la $(am__append_10) libcord.la
 +lib_LTLIBRARIES = libasir-gc.la $(am__append_8) libcord.la  +lib_LTLIBRARIES = libasir-gc.la $(am__append_10) libcord.la
   
  # unprefixed header   # unprefixed header
  include_HEADERS = $(am__append_10) include/extra/gc.h   include_HEADERS = $(am__append_12) include/extra/gc.h
 @@ -990,7 +990,7 @@  @@ -1021,7 +1021,7 @@
         libstaticrootslib2_test.la          $(am__append_20)
  pkgconfigdir = $(libdir)/pkgconfig   pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = bdw-gc.pc   pkgconfig_DATA = bdw-gc.pc
 -@SINGLE_GC_OBJ_FALSE@libgc_la_SOURCES = allchblk.c alloc.c blacklst.c \  -@SINGLE_GC_OBJ_FALSE@libgc_la_SOURCES = allchblk.c alloc.c blacklst.c \
Line 204  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 219  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
  @SINGLE_GC_OBJ_FALSE@  checksums.c dbg_mlc.c dyn_load.c \   @SINGLE_GC_OBJ_FALSE@  checksums.c dbg_mlc.c dyn_load.c \
  @SINGLE_GC_OBJ_FALSE@  finalize.c gc_dlopen.c gcj_mlc.c \   @SINGLE_GC_OBJ_FALSE@  finalize.c gc_dlopen.c gcj_mlc.c \
  @SINGLE_GC_OBJ_FALSE@  headers.c mach_dep.c malloc.c mallocx.c \   @SINGLE_GC_OBJ_FALSE@  headers.c mach_dep.c malloc.c mallocx.c \
 @@ -1002,23 +1002,23 @@  @@ -1032,25 +1032,25 @@
  @SINGLE_GC_OBJ_FALSE@  $(am__append_2) $(am__append_3) \  
  @SINGLE_GC_OBJ_FALSE@  $(am__append_4) $(am__append_5) \   @SINGLE_GC_OBJ_FALSE@  $(am__append_4) $(am__append_5) \
  @SINGLE_GC_OBJ_FALSE@  $(am__append_6) $(am__append_7)   @SINGLE_GC_OBJ_FALSE@  $(am__append_6) $(am__append_7) \
    @SINGLE_GC_OBJ_FALSE@  $(am__append_8) $(am__append_9)
 -@SINGLE_GC_OBJ_TRUE@libgc_la_SOURCES = extra/gc.c $(am__append_2) \  -@SINGLE_GC_OBJ_TRUE@libgc_la_SOURCES = extra/gc.c $(am__append_2) \
 +@SINGLE_GC_OBJ_TRUE@libasir-gc_la_SOURCES = extra/gc.c $(am__append_2) \  +@SINGLE_GC_OBJ_TRUE@libasir-gc_la_SOURCES = extra/gc.c $(am__append_2) \
  @SINGLE_GC_OBJ_TRUE@   $(am__append_3) $(am__append_4) \   @SINGLE_GC_OBJ_TRUE@   $(am__append_4) $(am__append_5) \
  @SINGLE_GC_OBJ_TRUE@   $(am__append_5) $(am__append_6) \   @SINGLE_GC_OBJ_TRUE@   $(am__append_6) $(am__append_7) \
  @SINGLE_GC_OBJ_TRUE@   $(am__append_7)   @SINGLE_GC_OBJ_TRUE@   $(am__append_8) $(am__append_9)
 -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S  -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
 -@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c  -@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
 +@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S  +@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
Line 222  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 237  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
  # linuxthread semaphore functions get linked:   # linuxthread semaphore functions get linked:
 -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)  -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
 -libgc_la_DEPENDENCIES = @addobjs@  -libgc_la_DEPENDENCIES = @addobjs@
 -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined  -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
 -EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \  
 +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)  +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
 +libasir-gc_la_DEPENDENCIES = @addobjs@  +libasir-gc_la_DEPENDENCIES = @addobjs@
 +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined  +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
 +EXTRA_libasir-gc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \       -no-undefined
      src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s  
   
   -EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
   +EXTRA_libasir-gc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
        sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s
   
  @CPLUSPLUS_TRUE@libgccpp_la_SOURCES = gc_cpp.cc   @CPLUSPLUS_TRUE@libgccpp_la_SOURCES = gc_cpp.cc
 -@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libgc.la  -@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libgc.la
 +@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libasir-gc.la  +@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libasir-gc.la
  @CPLUSPLUS_TRUE@libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined   @CPLUSPLUS_TRUE@libgccpp_la_LDFLAGS = -version-info $(LIBGCCPP_VER_INFO) -no-undefined
   
  # Misc   # Misc
 @@ -1026,7 +1026,7 @@  @@ -1058,7 +1058,7 @@
  AM_CXXFLAGS = @GC_CFLAGS@   AM_CXXFLAGS = @GC_CFLAGS@
  @COMPILER_XLC_FALSE@ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp   @ASM_WITH_CPP_UNSUPPORTED_FALSE@ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
   
 -#all_objs = @addobjs@ $(libgc_la_OBJECTS)  -#all_objs = @addobjs@ $(libgc_la_OBJECTS)
 +#all_objs = @addobjs@ $(libasir-gc_la_OBJECTS)  +#all_objs = @addobjs@ $(libasir-gc_la_OBJECTS)
  #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \   #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
  #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \   #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
  #include/gc_pthread_redirects.h include/gc_config_macros.h \   #include/gc_pthread_redirects.h include/gc_config_macros.h \
 @@ -1034,7 +1034,7 @@  @@ -1071,7 +1071,7 @@
  #include/private/pthread_stop_world.h \   # These numbers should be updated at most once just before the release,
  #include/gc_mark.h @addincludes@   # and, optionally, at most once during the development (after the release).
  @COMPILER_XLC_TRUE@ASM_CPP_OPTIONS =   LIBCORD_VER_INFO = 4:2:3
 -libcord_la_LIBADD = $(top_builddir)/libgc.la  -libcord_la_LIBADD = $(top_builddir)/libgc.la
 +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la  +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la
  libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined   libcord_la_LDFLAGS = -version-info $(LIBCORD_VER_INFO) -no-undefined
  libcord_la_CPPFLAGS = $(AM_CPPFLAGS)   libcord_la_CPPFLAGS = $(AM_CPPFLAGS)
  libcord_la_SOURCES = \   libcord_la_SOURCES = \
 @@ -1043,13 +1043,13 @@  @@ -1080,15 +1080,15 @@
          cord/cordxtra.c           cord/cordxtra.c
   
  cordtest_SOURCES = cord/tests/cordtest.c   cordtest_SOURCES = cord/tests/cordtest.c
Line 262  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 279  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
 +cordtest_LDADD = $(top_builddir)/libasir-gc.la $(top_builddir)/libcord.la  +cordtest_LDADD = $(top_builddir)/libasir-gc.la $(top_builddir)/libcord.la
   
  # Common libs to _LDADD for all tests.   # Common libs to _LDADD for all tests.
 -test_ldadd = $(top_builddir)/libgc.la $(EXTRA_TEST_LIBS)  -test_ldadd = $(nodist_libgc_la_OBJECTS) $(top_builddir)/libgc.la \
 +test_ldadd = $(top_builddir)/libasir-gc.la $(EXTRA_TEST_LIBS)  +test_ldadd = $(nodist_libasir-gc_la_OBJECTS) $(top_builddir)/libasir-gc.la \
                $(EXTRA_TEST_LIBS)
   
  gctest_SOURCES = tests/test.c   gctest_SOURCES = tests/test.c
  gctest_LDADD = $(test_ldadd) $(am__append_11)   gctest_LDADD = $(test_ldadd) $(am__append_13)
 -gctest_DEPENDENCIES = $(top_builddir)/libgc.la  -gctest_DEPENDENCIES = $(top_builddir)/libgc.la
 +gctest_DEPENDENCIES = $(top_builddir)/libasir-gc.la  +gctest_DEPENDENCIES = $(top_builddir)/libasir-gc.la
  leaktest_SOURCES = tests/leak_test.c   leaktest_SOURCES = tests/leak_test.c
  leaktest_LDADD = $(test_ldadd)   leaktest_LDADD = $(test_ldadd)
  middletest_SOURCES = tests/middle.c   middletest_SOURCES = tests/middle.c
 @@ -1070,7 +1070,7 @@  @@ -1109,7 +1109,7 @@
  libstaticrootslib_test_la_LDFLAGS = -version-info 1:3:0 -no-undefined \   libstaticrootslib_test_la_LDFLAGS = -version-info 1:3:0 -no-undefined \
                                      -rpath /nowhere                                       -rpath /nowhere
   
Line 280  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 299  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
  libstaticrootslib2_test_la_SOURCES = tests/staticrootslib.c   libstaticrootslib2_test_la_SOURCES = tests/staticrootslib.c
  libstaticrootslib2_test_la_LIBADD = $(test_ldadd)   libstaticrootslib2_test_la_LIBADD = $(test_ldadd)
  libstaticrootslib2_test_la_CFLAGS = -DSTATICROOTSLIB2   libstaticrootslib2_test_la_CFLAGS = -DSTATICROOTSLIB2
 @@ -1285,8 +1285,8 @@  @@ -1307,8 +1307,8 @@
  libatomic_ops/src/atomic_ops.lo: libatomic_ops/src/$(am__dirstamp) \   libatomic_ops/src/atomic_ops.lo: libatomic_ops/src/$(am__dirstamp) \
         libatomic_ops/src/$(DEPDIR)/$(am__dirstamp)          libatomic_ops/src/$(DEPDIR)/$(am__dirstamp)
   
Line 291  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
Line 310  diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile
   
  libgccpp.la: $(libgccpp_la_OBJECTS) $(libgccpp_la_DEPENDENCIES) $(EXTRA_libgccpp_la_DEPENDENCIES)   libgccpp.la: $(libgccpp_la_OBJECTS) $(libgccpp_la_DEPENDENCIES) $(EXTRA_libgccpp_la_DEPENDENCIES)
         $(AM_V_CXXLD)$(libgccpp_la_LINK) $(am_libgccpp_la_rpath) $(libgccpp_la_OBJECTS) $(libgccpp_la_LIBADD) $(LIBS)          $(AM_V_CXXLD)$(libgccpp_la_LINK) $(am_libgccpp_la_rpath) $(libgccpp_la_OBJECTS) $(libgccpp_la_LIBADD) $(LIBS)
 diff -ubBr gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_STATIC_THREADS_MAKEFILE  diff -ubBr gc-7.6.12.orig/NT_MAKEFILE gc-7.6.12/NT_MAKEFILE
 --- gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE    2014-06-03 15:08:01.000000000 +0900  --- gc-7.6.12.orig/NT_MAKEFILE  2019-03-02 05:53:14.000000000 +0900
 +++ gc-7.4.2/NT_STATIC_THREADS_MAKEFILE 2020-01-08 12:56:11.435813000 +0900  +++ gc-7.6.12/NT_MAKEFILE       2020-01-09 21:34:36.957823000 +0900
 @@ -3,7 +3,11 @@  @@ -23,6 +23,7 @@
    !ENDIF
   
  MY_CPU=X86   cflags = $(cflags) -c -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -GS -D_WINNT -W4
  CPU=$(MY_CPU)  +cflags = $(cflags) -nologo -DLARGE_CONFIG
 -!include <ntwin32.mak>   !IF "$(CPU)" == "i386"
 +#!include <ntwin32.mak>   cflags = $(cflags) -D_X86_=1  -DWIN32 -D_WIN32
 +cc=cl   !ELSEIF "$(CPU)" == "AMD64"
 +cdebug=-Ox -DNDEBUG  diff -ubBr gc-7.6.12.orig/alloc.c gc-7.6.12/alloc.c
 +cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_X86_=1  -DWIN32 -D_WIN32 -W3 -D_WINNT -DLARGE_CONFIG  --- gc-7.6.12.orig/alloc.c      2019-03-02 05:53:14.000000000 +0900
 +cvarsmt= -D_MT -MT  +++ gc-7.6.12/alloc.c   2020-01-09 21:24:08.355199000 +0900
   @@ -126,6 +126,7 @@
  # Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but   #else
  # not earlier versions.  We can deal with either, but not inconsistency.     word GC_free_space_divisor = 3;
 diff -ubBr gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE  
 --- gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE        2014-06-03 15:08:01.000000000 +0900  
 +++ gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE     2020-01-08 12:56:11.435924000 +0900  
 @@ -3,7 +3,11 @@  
   
  MY_CPU=AMD64  
  CPU=$(MY_CPU)  
 -!include <ntwin32.mak>  
 +#!include <ntwin32.mak>  
 +cc=cl  
 +cdebug=-Ox -DNDEBUG  
 +cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_AMD64_=1 -DWIN64 -D_WIN64  -DWIN32 -D_WIN32 -D_WINNT -DLARGE_CONFIG  
 +cvarsmt= -D_MT -MT  
   
  # Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but  
  # not earlier versions.  We can deal with either, but not inconsistency.  
 diff -ubBr gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c  
 --- gc-7.4.2.orig/alloc.c       2014-06-03 15:08:01.000000000 +0900  
 +++ gc-7.4.2/alloc.c    2020-01-08 12:56:11.436247000 +0900  
 @@ -121,6 +121,7 @@  
  #endif   #endif
   
  word GC_free_space_divisor = GC_FREE_SPACE_DIVISOR;  
 +word GC_free_space_numerator = 1;  +word GC_free_space_numerator = 1;
   
  GC_INNER int GC_CALLBACK GC_never_stop_func(void)   GC_INNER int GC_CALLBACK GC_never_stop_func(void)
  {   {
 @@ -227,8 +228,8 @@  @@ -236,8 +237,8 @@
      total_root_size = 2 * stack_size + GC_root_size;       total_root_size = 2 * stack_size + GC_root_size;
      scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4       scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4
                  + total_root_size;                   + total_root_size;
Line 345  diff -ubBr gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c
Line 343  diff -ubBr gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c
        result /= 2;         result /= 2;
      }       }
      return result > 0 ? result : 1;       return result > 0 ? result : 1;
 @@ -1215,6 +1216,9 @@  @@ -1300,6 +1301,9 @@
      if (GC_on_heap_resize)       if (GC_on_heap_resize)
        (*GC_on_heap_resize)(GC_heapsize);         (*GC_on_heap_resize)(GC_heapsize);
   
Line 355  diff -ubBr gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c
Line 353  diff -ubBr gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c
      return(TRUE);       return(TRUE);
  }   }
   
 @@ -1276,7 +1280,7 @@  @@ -1364,6 +1368,7 @@
        }  
      }       }
   
 -    blocks_to_get = GC_heapsize/(HBLKSIZE*GC_free_space_divisor)       blocks_to_get = (GC_heapsize - GC_heapsize_at_forced_unmap)
 +    blocks_to_get = GC_heapsize * GC_free_space_numerator /(HBLKSIZE*GC_free_space_divisor)  +                        * GC_free_space_numerator
                          + needed_blocks;                           / (HBLKSIZE * GC_free_space_divisor)
                        + needed_blocks;
      if (blocks_to_get > MAXHINCR) {       if (blocks_to_get > MAXHINCR) {
        word slop;  diff -ubBr gc-7.6.12.orig/configure gc-7.6.12/configure
 diff -ubBr gc-7.4.2.orig/configure gc-7.4.2/configure  --- gc-7.6.12.orig/configure    2019-03-02 05:55:04.000000000 +0900
 --- gc-7.4.2.orig/configure     2014-06-04 05:08:54.000000000 +0900  +++ gc-7.6.12/configure 2020-01-09 21:18:23.826366000 +0900
 +++ gc-7.4.2/configure  2020-01-08 13:41:29.341306000 +0900  @@ -16995,7 +16995,7 @@
 @@ -16339,7 +16339,7 @@  
   
   
   
Line 376  diff -ubBr gc-7.4.2.orig/configure gc-7.4.2/configure
Line 373  diff -ubBr gc-7.4.2.orig/configure gc-7.4.2/configure
   
   
  TARGET_ECOS="no"   TARGET_ECOS="no"
 diff -ubBr gc-7.4.2.orig/configure.ac gc-7.4.2/configure.ac  diff -ubBr gc-7.6.12.orig/configure.ac gc-7.6.12/configure.ac
 --- gc-7.4.2.orig/configure.ac  2014-06-03 15:08:01.000000000 +0900  --- gc-7.6.12.orig/configure.ac 2019-03-02 05:53:14.000000000 +0900
 +++ gc-7.4.2/configure.ac       2020-01-08 13:40:51.882777000 +0900  +++ gc-7.6.12/configure.ac      2020-01-09 21:18:23.826825000 +0900
 @@ -471,7 +471,7 @@  @@ -537,7 +537,7 @@
   
  AC_SUBST(EXTRA_TEST_LIBS)   AC_SUBST(EXTRA_TEST_LIBS)
   
Line 388  diff -ubBr gc-7.4.2.orig/configure.ac gc-7.4.2/configu
Line 385  diff -ubBr gc-7.4.2.orig/configure.ac gc-7.4.2/configu
  AC_SUBST(target_all)   AC_SUBST(target_all)
   
  dnl If the target is an eCos system, use the appropriate eCos   dnl If the target is an eCos system, use the appropriate eCos
 diff -ubBr gc-7.4.2.orig/cord/cord.am gc-7.4.2/cord/cord.am  diff -ubBr gc-7.6.12.orig/cord/cord.am gc-7.6.12/cord/cord.am
 --- gc-7.4.2.orig/cord/cord.am  2014-06-03 15:08:01.000000000 +0900  --- gc-7.6.12.orig/cord/cord.am 2019-03-02 05:53:14.000000000 +0900
 +++ gc-7.4.2/cord/cord.am       2020-01-08 13:40:40.234365000 +0900  +++ gc-7.6.12/cord/cord.am      2020-01-09 21:40:55.885610000 +0900
 @@ -1,7 +1,7 @@  @@ -7,7 +7,7 @@
   
  lib_LTLIBRARIES += libcord.la   lib_LTLIBRARIES += libcord.la
   
 -libcord_la_LIBADD = $(top_builddir)/libgc.la  -libcord_la_LIBADD = $(top_builddir)/libgc.la
 +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la  +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la
  libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined   libcord_la_LDFLAGS = -version-info $(LIBCORD_VER_INFO) -no-undefined
  libcord_la_CPPFLAGS = $(AM_CPPFLAGS)   libcord_la_CPPFLAGS = $(AM_CPPFLAGS)
   
 @@ -13,7 +13,7 @@  @@ -19,7 +19,7 @@
  TESTS += cordtest$(EXEEXT)   TESTS += cordtest$(EXEEXT)
  check_PROGRAMS += cordtest   check_PROGRAMS += cordtest
  cordtest_SOURCES = cord/tests/cordtest.c   cordtest_SOURCES = cord/tests/cordtest.c
Line 409  diff -ubBr gc-7.4.2.orig/cord/cord.am gc-7.4.2/cord/co
Line 406  diff -ubBr gc-7.4.2.orig/cord/cord.am gc-7.4.2/cord/co
   
  EXTRA_DIST += \   EXTRA_DIST += \
          cord/tests/de.c \           cord/tests/de.c \
 diff -ubBr gc-7.4.2.orig/include/private/gcconfig.h gc-7.4.2/include/private/gcconfig.h  diff -ubBr gc-7.6.12.orig/include/private/gcconfig.h gc-7.6.12/include/private/gcconfig.h
 --- gc-7.4.2.orig/include/private/gcconfig.h    2014-06-03 15:08:02.000000000 +0900  --- gc-7.6.12.orig/include/private/gcconfig.h   2019-03-02 05:53:14.000000000 +0900
 +++ gc-7.4.2/include/private/gcconfig.h 2020-01-08 12:56:11.436750000 +0900  +++ gc-7.6.12/include/private/gcconfig.h        2020-01-09 21:43:57.934071000 +0900
 @@ -2622,6 +2622,7 @@  @@ -2974,6 +2974,7 @@
  #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \                                || defined(ARM32) \
                               || defined(OPENBSD) || defined(ARM32) \                                || defined(AVR32) || defined(MIPS) \
                               || defined(MIPS) || defined(AVR32))) \                                || defined(NIOS2) || defined(OR1K))) \
 +     || (defined(FREEBSD) && defined(__FreeBSD__) && __FreeBSD__ < 5) \  +     || (defined(FREEBSD) && defined(__FreeBSD__) && __FreeBSD__ < 5) \
       || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \        || (defined(LINUX) && !defined(__gnu_linux__)) \
       || ((defined(RTEMS) || defined(PLATFORM_ANDROID)) && defined(I386))) \        || (defined(RTEMS) && defined(I386)) || defined(PLATFORM_ANDROID)) \
      && !defined(NO_GETCONTEXT)       && !defined(NO_GETCONTEXT)

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>