Annotation of OpenXM_contrib2/asir-gc/gc-7.4.2-risa.diff, Revision 1.1
1.1 ! ohara 1: diff -ubBr gc-7.4.2.orig/Makefile.am gc-7.4.2/Makefile.am
! 2: --- gc-7.4.2.orig/Makefile.am 2014-06-03 15:08:01.000000000 +0900
! 3: +++ gc-7.4.2/Makefile.am 2020-01-08 13:36:45.002761000 +0900
! 4: @@ -48,12 +48,12 @@
! 5: # C Library
! 6: # ---------
! 7:
! 8: -lib_LTLIBRARIES += libgc.la
! 9: +lib_LTLIBRARIES += libasir-gc.la
! 10: if SINGLE_GC_OBJ
! 11: -libgc_la_SOURCES = extra/gc.c
! 12: +libasir-gc_la_SOURCES = extra/gc.c
! 13: else
! 14: EXTRA_DIST += extra/gc.c
! 15: -libgc_la_SOURCES = \
! 16: +libasir-gc_la_SOURCES = \
! 17: allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
! 18: dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
! 19: mach_dep.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
! 20: @@ -64,43 +64,43 @@
! 21: # ---------------------------------
! 22:
! 23: if WIN32_THREADS
! 24: -libgc_la_SOURCES += win32_threads.c
! 25: +libasir-gc_la_SOURCES += win32_threads.c
! 26: else
! 27: if PTHREADS
! 28: -libgc_la_SOURCES += pthread_start.c pthread_support.c
! 29: +libasir-gc_la_SOURCES += pthread_start.c pthread_support.c
! 30: if DARWIN_THREADS
! 31: -libgc_la_SOURCES += darwin_stop_world.c
! 32: +libasir-gc_la_SOURCES += darwin_stop_world.c
! 33: else
! 34: -libgc_la_SOURCES += pthread_stop_world.c
! 35: +libasir-gc_la_SOURCES += pthread_stop_world.c
! 36: endif
! 37: endif
! 38: endif
! 39:
! 40: if MAKE_BACK_GRAPH
! 41: -libgc_la_SOURCES += backgraph.c
! 42: +libasir-gc_la_SOURCES += backgraph.c
! 43: endif
! 44:
! 45: if ENABLE_DISCLAIM
! 46: -libgc_la_SOURCES += fnlz_mlc.c
! 47: +libasir-gc_la_SOURCES += fnlz_mlc.c
! 48: endif
! 49:
! 50: endif
! 51:
! 52: if USE_INTERNAL_LIBATOMIC_OPS
! 53: -nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
! 54: +nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops.c
! 55: endif
! 56:
! 57: if NEED_ATOMIC_OPS_ASM
! 58: -nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
! 59: +nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
! 60: endif
! 61:
! 62: # Include THREADDLLIBS here to ensure that the correct versions of
! 63: # linuxthread semaphore functions get linked:
! 64: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
! 65: -libgc_la_DEPENDENCIES = @addobjs@
! 66: -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
! 67: +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
! 68: +libasir-gc_la_DEPENDENCIES = @addobjs@
! 69: +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
! 70:
! 71: -EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
! 72: +EXTRA_libasir-gc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
! 73: src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s
! 74:
! 75:
! 76: @@ -112,7 +112,7 @@
! 77: pkginclude_HEADERS += include/gc_cpp.h
! 78: include_HEADERS += include/extra/gc_cpp.h
! 79: libgccpp_la_SOURCES = gc_cpp.cc
! 80: -libgccpp_la_LIBADD = ./libgc.la
! 81: +libgccpp_la_LIBADD = ./libasir-gc.la
! 82: libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined
! 83: endif
! 84:
! 85: @@ -130,7 +130,7 @@
! 86:
! 87: ## FIXME: relies on internal code generated by automake.
! 88: ## FIXME: ./configure --enable-dependency-tracking should be used
! 89: -#all_objs = @addobjs@ $(libgc_la_OBJECTS)
! 90: +#all_objs = @addobjs@ $(libasir-gc_la_OBJECTS)
! 91: #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
! 92: #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
! 93: #include/gc_pthread_redirects.h include/gc_config_macros.h \
! 94: diff -ubBr gc-7.4.2.orig/Makefile.in gc-7.4.2/Makefile.in
! 95: --- gc-7.4.2.orig/Makefile.in 2014-06-04 05:09:25.000000000 +0900
! 96: +++ gc-7.4.2/Makefile.in 2020-01-08 13:37:03.227679000 +0900
! 97: @@ -215,7 +215,7 @@
! 98: "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" \
! 99: "$(DESTDIR)$(pkgincludedir)"
! 100: LTLIBRARIES = $(lib_LTLIBRARIES)
! 101: -libcord_la_DEPENDENCIES = $(top_builddir)/libgc.la
! 102: +libcord_la_DEPENDENCIES = $(top_builddir)/libasir-gc.la
! 103: am__dirstamp = $(am__leading_dot)dirstamp
! 104: am_libcord_la_OBJECTS = cord/libcord_la-cordbscs.lo \
! 105: cord/libcord_la-cordprnt.lo cord/libcord_la-cordxtra.lo
! 106: @@ -228,7 +228,7 @@
! 107: $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! 108: $(libcord_la_LDFLAGS) $(LDFLAGS) -o $@
! 109: am__DEPENDENCIES_1 =
! 110: -am__libgc_la_SOURCES_DIST = allchblk.c alloc.c blacklst.c checksums.c \
! 111: +am__libasir-gc_la_SOURCES_DIST = allchblk.c alloc.c blacklst.c checksums.c \
! 112: dbg_mlc.c dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c \
! 113: headers.c mach_dep.c malloc.c mallocx.c mark.c mark_rts.c \
! 114: misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c \
! 115: @@ -246,7 +246,7 @@
! 116: @MAKE_BACK_GRAPH_TRUE@@SINGLE_GC_OBJ_FALSE@ backgraph.lo
! 117: @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@am__objects_6 = \
! 118: @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@ fnlz_mlc.lo
! 119: -@SINGLE_GC_OBJ_FALSE@am_libgc_la_OBJECTS = allchblk.lo alloc.lo \
! 120: +@SINGLE_GC_OBJ_FALSE@am_libasir-gc_la_OBJECTS = allchblk.lo alloc.lo \
! 121: @SINGLE_GC_OBJ_FALSE@ blacklst.lo checksums.lo dbg_mlc.lo \
! 122: @SINGLE_GC_OBJ_FALSE@ dyn_load.lo finalize.lo gc_dlopen.lo \
! 123: @SINGLE_GC_OBJ_FALSE@ gcj_mlc.lo headers.lo mach_dep.lo \
! 124: @@ -259,17 +259,17 @@
! 125: @SINGLE_GC_OBJ_FALSE@ $(am__objects_2) $(am__objects_3) \
! 126: @SINGLE_GC_OBJ_FALSE@ $(am__objects_4) $(am__objects_5) \
! 127: @SINGLE_GC_OBJ_FALSE@ $(am__objects_6)
! 128: -@SINGLE_GC_OBJ_TRUE@am_libgc_la_OBJECTS = extra/gc.lo $(am__objects_1) \
! 129: +@SINGLE_GC_OBJ_TRUE@am_libasir-gc_la_OBJECTS = extra/gc.lo $(am__objects_1) \
! 130: @SINGLE_GC_OBJ_TRUE@ $(am__objects_2) $(am__objects_3) \
! 131: @SINGLE_GC_OBJ_TRUE@ $(am__objects_4) $(am__objects_5) \
! 132: @SINGLE_GC_OBJ_TRUE@ $(am__objects_6)
! 133: -@NEED_ATOMIC_OPS_ASM_FALSE@@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops.lo
! 134: -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops_sysdeps.lo
! 135: -libgc_la_OBJECTS = $(am_libgc_la_OBJECTS) $(nodist_libgc_la_OBJECTS)
! 136: -libgc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
! 137: +@NEED_ATOMIC_OPS_ASM_FALSE@@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libasir-gc_la_OBJECTS = libatomic_ops/src/atomic_ops.lo
! 138: +@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libasir-gc_la_OBJECTS = libatomic_ops/src/atomic_ops_sysdeps.lo
! 139: +libasir-gc_la_OBJECTS = $(am_libasir-gc_la_OBJECTS) $(nodist_libasir-gc_la_OBJECTS)
! 140: +libasir-gc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
! 141: $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! 142: - $(libgc_la_LDFLAGS) $(LDFLAGS) -o $@
! 143: -@CPLUSPLUS_TRUE@libgccpp_la_DEPENDENCIES = ./libgc.la
! 144: + $(libasir-gc_la_LDFLAGS) $(LDFLAGS) -o $@
! 145: +@CPLUSPLUS_TRUE@libgccpp_la_DEPENDENCIES = ./libasir-gc.la
! 146: am__libgccpp_la_SOURCES_DIST = gc_cpp.cc
! 147: @CPLUSPLUS_TRUE@am_libgccpp_la_OBJECTS = gc_cpp.lo
! 148: libgccpp_la_OBJECTS = $(am_libgccpp_la_OBJECTS)
! 149: @@ -277,7 +277,7 @@
! 150: $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
! 151: $(CXXFLAGS) $(libgccpp_la_LDFLAGS) $(LDFLAGS) -o $@
! 152: @CPLUSPLUS_TRUE@am_libgccpp_la_rpath = -rpath $(libdir)
! 153: -am__DEPENDENCIES_2 = $(top_builddir)/libgc.la $(am__DEPENDENCIES_1)
! 154: +am__DEPENDENCIES_2 = $(top_builddir)/libasir-gc.la $(am__DEPENDENCIES_1)
! 155: libstaticrootslib2_test_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
! 156: am_libstaticrootslib2_test_la_OBJECTS = \
! 157: tests/libstaticrootslib2_test_la-staticrootslib.lo
! 158: @@ -304,7 +304,7 @@
! 159: @ENABLE_DISCLAIM_TRUE@ disclaim_bench$(EXEEXT)
! 160: am_cordtest_OBJECTS = cord/tests/cordtest.$(OBJEXT)
! 161: cordtest_OBJECTS = $(am_cordtest_OBJECTS)
! 162: -cordtest_DEPENDENCIES = $(top_builddir)/libgc.la \
! 163: +cordtest_DEPENDENCIES = $(top_builddir)/libasir-gc.la \
! 164: $(top_builddir)/libcord.la
! 165: am__disclaim_bench_SOURCES_DIST = tests/disclaim_bench.c
! 166: @ENABLE_DISCLAIM_TRUE@am_disclaim_bench_OBJECTS = \
! 167: @@ -459,8 +459,8 @@
! 168: am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@)
! 169: am__v_CCAS_0 = @echo " CCAS " $@;
! 170: am__v_CCAS_1 =
! 171: -SOURCES = $(libcord_la_SOURCES) $(libgc_la_SOURCES) \
! 172: - $(EXTRA_libgc_la_SOURCES) $(nodist_libgc_la_SOURCES) \
! 173: +SOURCES = $(libcord_la_SOURCES) $(libasir-gc_la_SOURCES) \
! 174: + $(EXTRA_libasir-gc_la_SOURCES) $(nodist_libasir-gc_la_SOURCES) \
! 175: $(libgccpp_la_SOURCES) $(libstaticrootslib2_test_la_SOURCES) \
! 176: $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \
! 177: $(disclaim_bench_SOURCES) $(disclaim_test_SOURCES) \
! 178: @@ -471,8 +471,8 @@
! 179: $(subthreadcreate_test_SOURCES) $(test_cpp_SOURCES) \
! 180: $(threadkey_test_SOURCES) $(threadleaktest_SOURCES) \
! 181: $(tracetest_SOURCES)
! 182: -DIST_SOURCES = $(libcord_la_SOURCES) $(am__libgc_la_SOURCES_DIST) \
! 183: - $(EXTRA_libgc_la_SOURCES) $(am__libgccpp_la_SOURCES_DIST) \
! 184: +DIST_SOURCES = $(libcord_la_SOURCES) $(am__libasir-gc_la_SOURCES_DIST) \
! 185: + $(EXTRA_libasir-gc_la_SOURCES) $(am__libgccpp_la_SOURCES_DIST) \
! 186: $(libstaticrootslib2_test_la_SOURCES) \
! 187: $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \
! 188: $(am__disclaim_bench_SOURCES_DIST) \
! 189: @@ -960,7 +960,7 @@
! 190:
! 191: # C Library
! 192: # ---------
! 193: -lib_LTLIBRARIES = libgc.la $(am__append_8) libcord.la
! 194: +lib_LTLIBRARIES = libasir-gc.la $(am__append_8) libcord.la
! 195:
! 196: # unprefixed header
! 197: include_HEADERS = $(am__append_10) include/extra/gc.h
! 198: @@ -990,7 +990,7 @@
! 199: libstaticrootslib2_test.la
! 200: pkgconfigdir = $(libdir)/pkgconfig
! 201: pkgconfig_DATA = bdw-gc.pc
! 202: -@SINGLE_GC_OBJ_FALSE@libgc_la_SOURCES = allchblk.c alloc.c blacklst.c \
! 203: +@SINGLE_GC_OBJ_FALSE@libasir-gc_la_SOURCES = allchblk.c alloc.c blacklst.c \
! 204: @SINGLE_GC_OBJ_FALSE@ checksums.c dbg_mlc.c dyn_load.c \
! 205: @SINGLE_GC_OBJ_FALSE@ finalize.c gc_dlopen.c gcj_mlc.c \
! 206: @SINGLE_GC_OBJ_FALSE@ headers.c mach_dep.c malloc.c mallocx.c \
! 207: @@ -1002,23 +1002,23 @@
! 208: @SINGLE_GC_OBJ_FALSE@ $(am__append_2) $(am__append_3) \
! 209: @SINGLE_GC_OBJ_FALSE@ $(am__append_4) $(am__append_5) \
! 210: @SINGLE_GC_OBJ_FALSE@ $(am__append_6) $(am__append_7)
! 211: -@SINGLE_GC_OBJ_TRUE@libgc_la_SOURCES = extra/gc.c $(am__append_2) \
! 212: +@SINGLE_GC_OBJ_TRUE@libasir-gc_la_SOURCES = extra/gc.c $(am__append_2) \
! 213: @SINGLE_GC_OBJ_TRUE@ $(am__append_3) $(am__append_4) \
! 214: @SINGLE_GC_OBJ_TRUE@ $(am__append_5) $(am__append_6) \
! 215: @SINGLE_GC_OBJ_TRUE@ $(am__append_7)
! 216: -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
! 217: -@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
! 218: +@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
! 219: +@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops.c
! 220:
! 221: # Include THREADDLLIBS here to ensure that the correct versions of
! 222: # linuxthread semaphore functions get linked:
! 223: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
! 224: -libgc_la_DEPENDENCIES = @addobjs@
! 225: -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
! 226: -EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
! 227: +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
! 228: +libasir-gc_la_DEPENDENCIES = @addobjs@
! 229: +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
! 230: +EXTRA_libasir-gc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
! 231: src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s
! 232:
! 233: @CPLUSPLUS_TRUE@libgccpp_la_SOURCES = gc_cpp.cc
! 234: -@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libgc.la
! 235: +@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libasir-gc.la
! 236: @CPLUSPLUS_TRUE@libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined
! 237:
! 238: # Misc
! 239: @@ -1026,7 +1026,7 @@
! 240: AM_CXXFLAGS = @GC_CFLAGS@
! 241: @COMPILER_XLC_FALSE@ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
! 242:
! 243: -#all_objs = @addobjs@ $(libgc_la_OBJECTS)
! 244: +#all_objs = @addobjs@ $(libasir-gc_la_OBJECTS)
! 245: #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
! 246: #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
! 247: #include/gc_pthread_redirects.h include/gc_config_macros.h \
! 248: @@ -1034,7 +1034,7 @@
! 249: #include/private/pthread_stop_world.h \
! 250: #include/gc_mark.h @addincludes@
! 251: @COMPILER_XLC_TRUE@ASM_CPP_OPTIONS =
! 252: -libcord_la_LIBADD = $(top_builddir)/libgc.la
! 253: +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la
! 254: libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined
! 255: libcord_la_CPPFLAGS = $(AM_CPPFLAGS)
! 256: libcord_la_SOURCES = \
! 257: @@ -1043,13 +1043,13 @@
! 258: cord/cordxtra.c
! 259:
! 260: cordtest_SOURCES = cord/tests/cordtest.c
! 261: -cordtest_LDADD = $(top_builddir)/libgc.la $(top_builddir)/libcord.la
! 262: +cordtest_LDADD = $(top_builddir)/libasir-gc.la $(top_builddir)/libcord.la
! 263:
! 264: # Common libs to _LDADD for all tests.
! 265: -test_ldadd = $(top_builddir)/libgc.la $(EXTRA_TEST_LIBS)
! 266: +test_ldadd = $(top_builddir)/libasir-gc.la $(EXTRA_TEST_LIBS)
! 267: gctest_SOURCES = tests/test.c
! 268: gctest_LDADD = $(test_ldadd) $(am__append_11)
! 269: -gctest_DEPENDENCIES = $(top_builddir)/libgc.la
! 270: +gctest_DEPENDENCIES = $(top_builddir)/libasir-gc.la
! 271: leaktest_SOURCES = tests/leak_test.c
! 272: leaktest_LDADD = $(test_ldadd)
! 273: middletest_SOURCES = tests/middle.c
! 274: @@ -1070,7 +1070,7 @@
! 275: libstaticrootslib_test_la_LDFLAGS = -version-info 1:3:0 -no-undefined \
! 276: -rpath /nowhere
! 277:
! 278: -libstaticrootslib_test_la_DEPENDENCIES = $(top_builddir)/libgc.la
! 279: +libstaticrootslib_test_la_DEPENDENCIES = $(top_builddir)/libasir-gc.la
! 280: libstaticrootslib2_test_la_SOURCES = tests/staticrootslib.c
! 281: libstaticrootslib2_test_la_LIBADD = $(test_ldadd)
! 282: libstaticrootslib2_test_la_CFLAGS = -DSTATICROOTSLIB2
! 283: @@ -1285,8 +1285,8 @@
! 284: libatomic_ops/src/atomic_ops.lo: libatomic_ops/src/$(am__dirstamp) \
! 285: libatomic_ops/src/$(DEPDIR)/$(am__dirstamp)
! 286:
! 287: -libgc.la: $(libgc_la_OBJECTS) $(libgc_la_DEPENDENCIES) $(EXTRA_libgc_la_DEPENDENCIES)
! 288: - $(AM_V_CCLD)$(libgc_la_LINK) -rpath $(libdir) $(libgc_la_OBJECTS) $(libgc_la_LIBADD) $(LIBS)
! 289: +libasir-gc.la: $(libasir-gc_la_OBJECTS) $(libasir-gc_la_DEPENDENCIES) $(EXTRA_libasir-gc_la_DEPENDENCIES)
! 290: + $(AM_V_CCLD)$(libasir-gc_la_LINK) -rpath $(libdir) $(libasir-gc_la_OBJECTS) $(libasir-gc_la_LIBADD) $(LIBS)
! 291:
! 292: libgccpp.la: $(libgccpp_la_OBJECTS) $(libgccpp_la_DEPENDENCIES) $(EXTRA_libgccpp_la_DEPENDENCIES)
! 293: $(AM_V_CXXLD)$(libgccpp_la_LINK) $(am_libgccpp_la_rpath) $(libgccpp_la_OBJECTS) $(libgccpp_la_LIBADD) $(LIBS)
! 294: diff -ubBr gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_STATIC_THREADS_MAKEFILE
! 295: --- gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE 2014-06-03 15:08:01.000000000 +0900
! 296: +++ gc-7.4.2/NT_STATIC_THREADS_MAKEFILE 2020-01-08 12:56:11.435813000 +0900
! 297: @@ -3,7 +3,11 @@
! 298:
! 299: MY_CPU=X86
! 300: CPU=$(MY_CPU)
! 301: -!include <ntwin32.mak>
! 302: +#!include <ntwin32.mak>
! 303: +cc=cl
! 304: +cdebug=-Ox -DNDEBUG
! 305: +cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_X86_=1 -DWIN32 -D_WIN32 -W3 -D_WINNT -DLARGE_CONFIG
! 306: +cvarsmt= -D_MT -MT
! 307:
! 308: # Make sure that .cc is not viewed as a suffix. It is for VC++2005, but
! 309: # not earlier versions. We can deal with either, but not inconsistency.
! 310: diff -ubBr gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE
! 311: --- gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE 2014-06-03 15:08:01.000000000 +0900
! 312: +++ gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE 2020-01-08 12:56:11.435924000 +0900
! 313: @@ -3,7 +3,11 @@
! 314:
! 315: MY_CPU=AMD64
! 316: CPU=$(MY_CPU)
! 317: -!include <ntwin32.mak>
! 318: +#!include <ntwin32.mak>
! 319: +cc=cl
! 320: +cdebug=-Ox -DNDEBUG
! 321: +cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_AMD64_=1 -DWIN64 -D_WIN64 -DWIN32 -D_WIN32 -D_WINNT -DLARGE_CONFIG
! 322: +cvarsmt= -D_MT -MT
! 323:
! 324: # Make sure that .cc is not viewed as a suffix. It is for VC++2005, but
! 325: # not earlier versions. We can deal with either, but not inconsistency.
! 326: diff -ubBr gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c
! 327: --- gc-7.4.2.orig/alloc.c 2014-06-03 15:08:01.000000000 +0900
! 328: +++ gc-7.4.2/alloc.c 2020-01-08 12:56:11.436247000 +0900
! 329: @@ -121,6 +121,7 @@
! 330: #endif
! 331:
! 332: word GC_free_space_divisor = GC_FREE_SPACE_DIVISOR;
! 333: +word GC_free_space_numerator = 1;
! 334:
! 335: GC_INNER int GC_CALLBACK GC_never_stop_func(void)
! 336: {
! 337: @@ -227,8 +228,8 @@
! 338: total_root_size = 2 * stack_size + GC_root_size;
! 339: scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4
! 340: + total_root_size;
! 341: - result = scan_size / GC_free_space_divisor;
! 342: - if (GC_incremental) {
! 343: + result = scan_size * GC_free_space_numerator / GC_free_space_divisor;
! 344: + if (1 || GC_incremental) {
! 345: result /= 2;
! 346: }
! 347: return result > 0 ? result : 1;
! 348: @@ -1215,6 +1216,9 @@
! 349: if (GC_on_heap_resize)
! 350: (*GC_on_heap_resize)(GC_heapsize);
! 351:
! 352: +#if defined(VISUAL)
! 353: + SendHeapSize();
! 354: +#endif
! 355: return(TRUE);
! 356: }
! 357:
! 358: @@ -1276,7 +1280,7 @@
! 359: }
! 360: }
! 361:
! 362: - blocks_to_get = GC_heapsize/(HBLKSIZE*GC_free_space_divisor)
! 363: + blocks_to_get = GC_heapsize * GC_free_space_numerator /(HBLKSIZE*GC_free_space_divisor)
! 364: + needed_blocks;
! 365: if (blocks_to_get > MAXHINCR) {
! 366: word slop;
! 367: diff -ubBr gc-7.4.2.orig/configure gc-7.4.2/configure
! 368: --- gc-7.4.2.orig/configure 2014-06-04 05:08:54.000000000 +0900
! 369: +++ gc-7.4.2/configure 2020-01-08 13:41:29.341306000 +0900
! 370: @@ -16339,7 +16339,7 @@
! 371:
! 372:
! 373:
! 374: -target_all=libgc.la
! 375: +target_all=libasir-gc.la
! 376:
! 377:
! 378: TARGET_ECOS="no"
! 379: diff -ubBr gc-7.4.2.orig/configure.ac gc-7.4.2/configure.ac
! 380: --- gc-7.4.2.orig/configure.ac 2014-06-03 15:08:01.000000000 +0900
! 381: +++ gc-7.4.2/configure.ac 2020-01-08 13:40:51.882777000 +0900
! 382: @@ -471,7 +471,7 @@
! 383:
! 384: AC_SUBST(EXTRA_TEST_LIBS)
! 385:
! 386: -target_all=libgc.la
! 387: +target_all=libasir-gc.la
! 388: AC_SUBST(target_all)
! 389:
! 390: dnl If the target is an eCos system, use the appropriate eCos
! 391: diff -ubBr gc-7.4.2.orig/cord/cord.am gc-7.4.2/cord/cord.am
! 392: --- gc-7.4.2.orig/cord/cord.am 2014-06-03 15:08:01.000000000 +0900
! 393: +++ gc-7.4.2/cord/cord.am 2020-01-08 13:40:40.234365000 +0900
! 394: @@ -1,7 +1,7 @@
! 395:
! 396: lib_LTLIBRARIES += libcord.la
! 397:
! 398: -libcord_la_LIBADD = $(top_builddir)/libgc.la
! 399: +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la
! 400: libcord_la_LDFLAGS = -version-info 1:3:0 -no-undefined
! 401: libcord_la_CPPFLAGS = $(AM_CPPFLAGS)
! 402:
! 403: @@ -13,7 +13,7 @@
! 404: TESTS += cordtest$(EXEEXT)
! 405: check_PROGRAMS += cordtest
! 406: cordtest_SOURCES = cord/tests/cordtest.c
! 407: -cordtest_LDADD = $(top_builddir)/libgc.la $(top_builddir)/libcord.la
! 408: +cordtest_LDADD = $(top_builddir)/libasir-gc.la $(top_builddir)/libcord.la
! 409:
! 410: EXTRA_DIST += \
! 411: cord/tests/de.c \
! 412: diff -ubBr gc-7.4.2.orig/include/private/gcconfig.h gc-7.4.2/include/private/gcconfig.h
! 413: --- gc-7.4.2.orig/include/private/gcconfig.h 2014-06-03 15:08:02.000000000 +0900
! 414: +++ gc-7.4.2/include/private/gcconfig.h 2020-01-08 12:56:11.436750000 +0900
! 415: @@ -2622,6 +2622,7 @@
! 416: #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \
! 417: || defined(OPENBSD) || defined(ARM32) \
! 418: || defined(MIPS) || defined(AVR32))) \
! 419: + || (defined(FREEBSD) && defined(__FreeBSD__) && __FreeBSD__ < 5) \
! 420: || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \
! 421: || ((defined(RTEMS) || defined(PLATFORM_ANDROID)) && defined(I386))) \
! 422: && !defined(NO_GETCONTEXT)
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
![[BACK]](/icons/cvsweb/back.gif){kind=icon}
Return to gc-7.4.2-risa.diff CVS log ![[TXT]](/icons/cvsweb/text.gif){kind=icon}
![[DIR]](/icons/cvsweb/dir.gif){kind=icon}
Up to [local] / OpenXM_contrib2 / asir-gc