Annotation of OpenXM_contrib2/asir-gc/gc-8.0.6-risa.diff, Revision 1.1
1.1 ! ohara 1: diff -ubBr gc-8.0.6.orig/Makefile.am gc-8.0.6/Makefile.am
! 2: --- gc-8.0.6.orig/Makefile.am 2021-09-29 05:47:22.000000000 +0900
! 3: +++ gc-8.0.6/Makefile.am 2021-10-02 14:42:45.103885000 +0900
! 4: @@ -54,21 +54,21 @@
! 5: # C Library
! 6: # ---------
! 7:
! 8: -lib_LTLIBRARIES += libgc.la
! 9: +lib_LTLIBRARIES += libasir-gc.la
! 10:
! 11: if SINGLE_GC_OBJ
! 12:
! 13: -libgc_la_SOURCES = extra/gc.c
! 14: +libasir-gc_la_SOURCES = extra/gc.c
! 15:
! 16: if PTHREAD_START_STANDALONE
! 17: AM_CPPFLAGS += -DGC_PTHREAD_START_STANDALONE
! 18: -libgc_la_SOURCES += pthread_start.c
! 19: +libasir-gc_la_SOURCES += pthread_start.c
! 20: endif
! 21:
! 22: else
! 23:
! 24: EXTRA_DIST += extra/gc.c
! 25: -libgc_la_SOURCES = \
! 26: +libasir-gc_la_SOURCES = \
! 27: allchblk.c alloc.c blacklst.c dbg_mlc.c \
! 28: dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
! 29: mach_dep.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
! 30: @@ -78,33 +78,33 @@
! 31: # ---------------------------------
! 32:
! 33: if WIN32_THREADS
! 34: -libgc_la_SOURCES += win32_threads.c
! 35: +libasir-gc_la_SOURCES += win32_threads.c
! 36: else
! 37: if PTHREADS
! 38: # Not Cygwin or MinGW.
! 39: -libgc_la_SOURCES += pthread_start.c pthread_support.c
! 40: +libasir-gc_la_SOURCES += pthread_start.c pthread_support.c
! 41: if DARWIN_THREADS
! 42: -libgc_la_SOURCES += darwin_stop_world.c
! 43: +libasir-gc_la_SOURCES += darwin_stop_world.c
! 44: else
! 45: -libgc_la_SOURCES += pthread_stop_world.c
! 46: +libasir-gc_la_SOURCES += pthread_stop_world.c
! 47: endif
! 48: endif
! 49: endif
! 50:
! 51: if THREAD_LOCAL_ALLOC
! 52: -libgc_la_SOURCES += thread_local_alloc.c
! 53: +libasir-gc_la_SOURCES += thread_local_alloc.c
! 54: endif
! 55:
! 56: if MAKE_BACK_GRAPH
! 57: -libgc_la_SOURCES += backgraph.c
! 58: +libasir-gc_la_SOURCES += backgraph.c
! 59: endif
! 60:
! 61: if CHECKSUMS
! 62: -libgc_la_SOURCES += checksums.c
! 63: +libasir-gc_la_SOURCES += checksums.c
! 64: endif
! 65:
! 66: if ENABLE_DISCLAIM
! 67: -libgc_la_SOURCES += fnlz_mlc.c
! 68: +libasir-gc_la_SOURCES += fnlz_mlc.c
! 69: pkginclude_HEADERS += include/gc_disclaim.h
! 70: endif
! 71:
! 72: @@ -112,21 +112,21 @@
! 73: endif
! 74:
! 75: if USE_INTERNAL_LIBATOMIC_OPS
! 76: -nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
! 77: +nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops.c
! 78: endif
! 79:
! 80: if NEED_ATOMIC_OPS_ASM
! 81: -nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
! 82: +nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
! 83: endif
! 84:
! 85: # Include THREADDLLIBS here to ensure that the correct versions of
! 86: # linuxthread semaphore functions get linked:
! 87: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
! 88: -libgc_la_DEPENDENCIES = @addobjs@
! 89: -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
! 90: +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
! 91: +libasir-gc_la_DEPENDENCIES = @addobjs@
! 92: +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
! 93: -no-undefined
! 94:
! 95: -EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
! 96: +EXTRA_libasir-gc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
! 97: sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s
! 98:
! 99: if CPLUSPLUS
! 100: @@ -136,7 +136,7 @@
! 101: pkginclude_HEADERS += include/gc_allocator.h include/gc_cpp.h
! 102: include_HEADERS += include/extra/gc_cpp.h
! 103: libgccpp_la_SOURCES = gc_cpp.cc
! 104: -libgccpp_la_LIBADD = ./libgc.la
! 105: +libgccpp_la_LIBADD = ./libasir-gc.la
! 106: libgccpp_la_LDFLAGS = -version-info $(LIBGCCPP_VER_INFO) -no-undefined
! 107: endif
! 108:
! 109: @@ -157,7 +157,7 @@
! 110:
! 111: ## FIXME: relies on internal code generated by automake.
! 112: ## FIXME: ./configure --enable-dependency-tracking should be used
! 113: -#all_objs = @addobjs@ $(libgc_la_OBJECTS)
! 114: +#all_objs = @addobjs@ $(libasir-gc_la_OBJECTS)
! 115: #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
! 116: #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
! 117: #include/gc_pthread_redirects.h include/gc_config_macros.h \
! 118: Only in gc-8.0.6: Makefile.am~
! 119: diff -ubBr gc-8.0.6.orig/Makefile.in gc-8.0.6/Makefile.in
! 120: --- gc-8.0.6.orig/Makefile.in 2021-09-29 05:48:20.000000000 +0900
! 121: +++ gc-8.0.6/Makefile.in 2021-10-02 14:41:01.025378000 +0900
! 122: @@ -158,9 +158,9 @@
! 123: @CPLUSPLUS_TRUE@am__append_13 = libgccpp.la
! 124: @CPLUSPLUS_TRUE@am__append_14 = include/gc_allocator.h include/gc_cpp.h
! 125: @CPLUSPLUS_TRUE@am__append_15 = include/extra/gc_cpp.h
! 126: -@ENABLE_SHARED_TRUE@am__append_16 = $(top_builddir)/libgc.la
! 127: +@ENABLE_SHARED_TRUE@am__append_16 = $(top_builddir)/libasir-gc.la
! 128: @THREADS_TRUE@am__append_17 = $(THREADDLLIBS)
! 129: -@ENABLE_SHARED_TRUE@am__append_18 = $(top_builddir)/libgc.la
! 130: +@ENABLE_SHARED_TRUE@am__append_18 = $(top_builddir)/libasir-gc.la
! 131: @KEEP_BACK_PTRS_TRUE@am__append_19 = tracetest$(EXEEXT)
! 132: @KEEP_BACK_PTRS_TRUE@am__append_20 = tracetest
! 133: @THREADS_TRUE@am__append_21 = test_atomic_ops$(EXEEXT) \
! 134: @@ -172,7 +172,7 @@
! 135: @THREADS_TRUE@ initsecondarythread_test
! 136: @CPLUSPLUS_TRUE@am__append_23 = test_cpp$(EXEEXT)
! 137: @CPLUSPLUS_TRUE@am__append_24 = test_cpp
! 138: -@AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@@ENABLE_SHARED_TRUE@am__append_25 = $(top_builddir)/libgc.la
! 139: +@AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@@ENABLE_SHARED_TRUE@am__append_25 = $(top_builddir)/libasir-gc.la
! 140: @ENABLE_DISCLAIM_TRUE@am__append_26 = disclaim_test$(EXEEXT) \
! 141: @ENABLE_DISCLAIM_TRUE@ disclaim_bench$(EXEEXT) \
! 142: @ENABLE_DISCLAIM_TRUE@ disclaim_weakmap_test$(EXEEXT)
! 143: @@ -229,7 +229,7 @@
! 144: "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" \
! 145: "$(DESTDIR)$(includedir)" "$(DESTDIR)$(pkgincludedir)"
! 146: LTLIBRARIES = $(lib_LTLIBRARIES)
! 147: -libcord_la_DEPENDENCIES = $(top_builddir)/libgc.la
! 148: +libcord_la_DEPENDENCIES = $(top_builddir)/libasir-gc.la
! 149: am__dirstamp = $(am__leading_dot)dirstamp
! 150: am_libcord_la_OBJECTS = cord/libcord_la-cordbscs.lo \
! 151: cord/libcord_la-cordprnt.lo cord/libcord_la-cordxtra.lo
! 152: @@ -242,7 +242,7 @@
! 153: $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! 154: $(libcord_la_LDFLAGS) $(LDFLAGS) -o $@
! 155: am__DEPENDENCIES_1 =
! 156: -am__libgc_la_SOURCES_DIST = allchblk.c alloc.c blacklst.c dbg_mlc.c \
! 157: +am__libasir-gc_la_SOURCES_DIST = allchblk.c alloc.c blacklst.c dbg_mlc.c \
! 158: dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
! 159: mach_dep.c malloc.c mallocx.c mark.c mark_rts.c misc.c \
! 160: new_hblk.c obj_map.c os_dep.c ptr_chck.c reclaim.c specific.c \
! 161: @@ -262,7 +262,7 @@
! 162: @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@am__objects_8 = \
! 163: @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@ fnlz_mlc.lo
! 164: @PTHREAD_START_STANDALONE_TRUE@@SINGLE_GC_OBJ_TRUE@am__objects_9 = pthread_start.lo
! 165: -@SINGLE_GC_OBJ_FALSE@am_libgc_la_OBJECTS = allchblk.lo alloc.lo \
! 166: +@SINGLE_GC_OBJ_FALSE@am_libasir-gc_la_OBJECTS = allchblk.lo alloc.lo \
! 167: @SINGLE_GC_OBJ_FALSE@ blacklst.lo dbg_mlc.lo dyn_load.lo \
! 168: @SINGLE_GC_OBJ_FALSE@ finalize.lo gc_dlopen.lo gcj_mlc.lo \
! 169: @SINGLE_GC_OBJ_FALSE@ headers.lo mach_dep.lo malloc.lo \
! 170: @@ -274,18 +274,18 @@
! 171: @SINGLE_GC_OBJ_FALSE@ $(am__objects_4) $(am__objects_5) \
! 172: @SINGLE_GC_OBJ_FALSE@ $(am__objects_6) $(am__objects_7) \
! 173: @SINGLE_GC_OBJ_FALSE@ $(am__objects_8)
! 174: -@SINGLE_GC_OBJ_TRUE@am_libgc_la_OBJECTS = extra/gc.lo $(am__objects_9) \
! 175: +@SINGLE_GC_OBJ_TRUE@am_libasir-gc_la_OBJECTS = extra/gc.lo $(am__objects_9) \
! 176: @SINGLE_GC_OBJ_TRUE@ $(am__objects_1) $(am__objects_2) \
! 177: @SINGLE_GC_OBJ_TRUE@ $(am__objects_3) $(am__objects_4) \
! 178: @SINGLE_GC_OBJ_TRUE@ $(am__objects_5) $(am__objects_6) \
! 179: @SINGLE_GC_OBJ_TRUE@ $(am__objects_7) $(am__objects_8)
! 180: -@NEED_ATOMIC_OPS_ASM_FALSE@@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops.lo
! 181: -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops_sysdeps.lo
! 182: -libgc_la_OBJECTS = $(am_libgc_la_OBJECTS) $(nodist_libgc_la_OBJECTS)
! 183: -libgc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
! 184: +@NEED_ATOMIC_OPS_ASM_FALSE@@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libasir-gc_la_OBJECTS = libatomic_ops/src/atomic_ops.lo
! 185: +@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libasir-gc_la_OBJECTS = libatomic_ops/src/atomic_ops_sysdeps.lo
! 186: +libasir-gc_la_OBJECTS = $(am_libasir-gc_la_OBJECTS) $(nodist_libasir-gc_la_OBJECTS)
! 187: +libasir-gc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
! 188: $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! 189: - $(libgc_la_LDFLAGS) $(LDFLAGS) -o $@
! 190: -@CPLUSPLUS_TRUE@libgccpp_la_DEPENDENCIES = ./libgc.la
! 191: + $(libasir-gc_la_LDFLAGS) $(LDFLAGS) -o $@
! 192: +@CPLUSPLUS_TRUE@libgccpp_la_DEPENDENCIES = ./libasir-gc.la
! 193: am__libgccpp_la_SOURCES_DIST = gc_cpp.cc
! 194: @CPLUSPLUS_TRUE@am_libgccpp_la_OBJECTS = gc_cpp.lo
! 195: libgccpp_la_OBJECTS = $(am_libgccpp_la_OBJECTS)
! 196: @@ -293,8 +293,8 @@
! 197: $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
! 198: $(CXXFLAGS) $(libgccpp_la_LDFLAGS) $(LDFLAGS) -o $@
! 199: @CPLUSPLUS_TRUE@am_libgccpp_la_rpath = -rpath $(libdir)
! 200: -am__DEPENDENCIES_2 = $(nodist_libgc_la_OBJECTS) \
! 201: - $(top_builddir)/libgc.la $(am__DEPENDENCIES_1)
! 202: +am__DEPENDENCIES_2 = $(nodist_libasir-gc_la_OBJECTS) \
! 203: + $(top_builddir)/libasir-gc.la $(am__DEPENDENCIES_1)
! 204: libstaticrootslib2_test_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
! 205: am_libstaticrootslib2_test_la_OBJECTS = \
! 206: tests/libstaticrootslib2_test_la-staticrootslib.lo
! 207: @@ -375,7 +375,7 @@
! 208: am_staticrootstest_OBJECTS = \
! 209: tests/staticrootstest-staticrootstest.$(OBJEXT)
! 210: staticrootstest_OBJECTS = $(am_staticrootstest_OBJECTS)
! 211: -staticrootstest_DEPENDENCIES = $(nodist_libgc_la_OBJECTS) \
! 212: +staticrootstest_DEPENDENCIES = $(nodist_libasir-gc_la_OBJECTS) \
! 213: $(am__DEPENDENCIES_1) libstaticrootslib_test.la \
! 214: libstaticrootslib2_test.la $(am__append_18)
! 215: staticrootstest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
! 216: @@ -399,7 +399,7 @@
! 217: test_cpp_OBJECTS = $(am_test_cpp_OBJECTS)
! 218: @AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@test_cpp_DEPENDENCIES = \
! 219: @AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ libgccpp.la \
! 220: -@AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(nodist_libgc_la_OBJECTS) \
! 221: +@AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(nodist_libasir-gc_la_OBJECTS) \
! 222: @AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(am__DEPENDENCIES_1) \
! 223: @AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(am__DEPENDENCIES_1) \
! 224: @AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(am__append_25)
! 225: @@ -494,8 +494,8 @@
! 226: am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@)
! 227: am__v_CCAS_0 = @echo " CCAS " $@;
! 228: am__v_CCAS_1 =
! 229: -SOURCES = $(libcord_la_SOURCES) $(libgc_la_SOURCES) \
! 230: - $(EXTRA_libgc_la_SOURCES) $(nodist_libgc_la_SOURCES) \
! 231: +SOURCES = $(libcord_la_SOURCES) $(libasir-gc_la_SOURCES) \
! 232: + $(EXTRA_libasir-gc_la_SOURCES) $(nodist_libasir-gc_la_SOURCES) \
! 233: $(libgccpp_la_SOURCES) $(libstaticrootslib2_test_la_SOURCES) \
! 234: $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \
! 235: $(disclaim_bench_SOURCES) $(disclaim_test_SOURCES) \
! 236: @@ -507,8 +507,8 @@
! 237: $(test_atomic_ops_SOURCES) $(test_cpp_SOURCES) \
! 238: $(threadkey_test_SOURCES) $(threadleaktest_SOURCES) \
! 239: $(tracetest_SOURCES)
! 240: -DIST_SOURCES = $(libcord_la_SOURCES) $(am__libgc_la_SOURCES_DIST) \
! 241: - $(EXTRA_libgc_la_SOURCES) $(am__libgccpp_la_SOURCES_DIST) \
! 242: +DIST_SOURCES = $(libcord_la_SOURCES) $(am__libasir-gc_la_SOURCES_DIST) \
! 243: + $(EXTRA_libasir-gc_la_SOURCES) $(am__libgccpp_la_SOURCES_DIST) \
! 244: $(libstaticrootslib2_test_la_SOURCES) \
! 245: $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \
! 246: $(am__disclaim_bench_SOURCES_DIST) \
! 247: @@ -1014,7 +1014,7 @@
! 248:
! 249: # C Library
! 250: # ---------
! 251: -lib_LTLIBRARIES = libgc.la $(am__append_13) libcord.la
! 252: +lib_LTLIBRARIES = libasir-gc.la $(am__append_13) libcord.la
! 253:
! 254: # unprefixed header
! 255: include_HEADERS = $(am__append_15) include/extra/gc.h
! 256: @@ -1050,7 +1050,7 @@
! 257: $(am__append_26)
! 258: pkgconfigdir = $(libdir)/pkgconfig
! 259: pkgconfig_DATA = bdw-gc.pc
! 260: -@SINGLE_GC_OBJ_FALSE@libgc_la_SOURCES = allchblk.c alloc.c blacklst.c \
! 261: +@SINGLE_GC_OBJ_FALSE@libasir-gc_la_SOURCES = allchblk.c alloc.c blacklst.c \
! 262: @SINGLE_GC_OBJ_FALSE@ dbg_mlc.c dyn_load.c finalize.c \
! 263: @SINGLE_GC_OBJ_FALSE@ gc_dlopen.c gcj_mlc.c headers.c \
! 264: @SINGLE_GC_OBJ_FALSE@ mach_dep.c malloc.c mallocx.c mark.c \
! 265: @@ -1061,26 +1061,26 @@
! 266: @SINGLE_GC_OBJ_FALSE@ $(am__append_7) $(am__append_8) \
! 267: @SINGLE_GC_OBJ_FALSE@ $(am__append_9) $(am__append_10) \
! 268: @SINGLE_GC_OBJ_FALSE@ $(am__append_11)
! 269: -@SINGLE_GC_OBJ_TRUE@libgc_la_SOURCES = extra/gc.c $(am__append_2) \
! 270: +@SINGLE_GC_OBJ_TRUE@libasir-gc_la_SOURCES = extra/gc.c $(am__append_2) \
! 271: @SINGLE_GC_OBJ_TRUE@ $(am__append_4) $(am__append_5) \
! 272: @SINGLE_GC_OBJ_TRUE@ $(am__append_6) $(am__append_7) \
! 273: @SINGLE_GC_OBJ_TRUE@ $(am__append_8) $(am__append_9) \
! 274: @SINGLE_GC_OBJ_TRUE@ $(am__append_10) $(am__append_11)
! 275: -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
! 276: -@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
! 277: +@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
! 278: +@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops.c
! 279:
! 280: # Include THREADDLLIBS here to ensure that the correct versions of
! 281: # linuxthread semaphore functions get linked:
! 282: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
! 283: -libgc_la_DEPENDENCIES = @addobjs@
! 284: -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
! 285: +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
! 286: +libasir-gc_la_DEPENDENCIES = @addobjs@
! 287: +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
! 288: -no-undefined
! 289:
! 290: -EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
! 291: +EXTRA_libasir-gc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
! 292: sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s
! 293:
! 294: @CPLUSPLUS_TRUE@libgccpp_la_SOURCES = gc_cpp.cc
! 295: -@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libgc.la
! 296: +@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libasir-gc.la
! 297: @CPLUSPLUS_TRUE@libgccpp_la_LDFLAGS = -version-info $(LIBGCCPP_VER_INFO) -no-undefined
! 298:
! 299: # Misc
! 300: @@ -1088,7 +1088,7 @@
! 301: AM_CXXFLAGS = @GC_CFLAGS@
! 302: @ASM_WITH_CPP_UNSUPPORTED_FALSE@ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
! 303:
! 304: -#all_objs = @addobjs@ $(libgc_la_OBJECTS)
! 305: +#all_objs = @addobjs@ $(libasir-gc_la_OBJECTS)
! 306: #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
! 307: #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
! 308: #include/gc_pthread_redirects.h include/gc_config_macros.h \
! 309: @@ -1101,7 +1101,7 @@
! 310: # These numbers should be updated at most once just before the release,
! 311: # and, optionally, at most once during the development (after the release).
! 312: LIBCORD_VER_INFO = 5:0:4
! 313: -libcord_la_LIBADD = $(top_builddir)/libgc.la
! 314: +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la
! 315: libcord_la_LDFLAGS = -version-info $(LIBCORD_VER_INFO) -no-undefined
! 316: libcord_la_CPPFLAGS = $(AM_CPPFLAGS)
! 317: libcord_la_SOURCES = \
! 318: @@ -1113,12 +1113,12 @@
! 319: cordtest_LDADD = $(top_builddir)/libcord.la $(am__append_16)
! 320:
! 321: # Common libs to _LDADD for all tests.
! 322: -test_ldadd = $(nodist_libgc_la_OBJECTS) $(top_builddir)/libgc.la \
! 323: +test_ldadd = $(nodist_libasir-gc_la_OBJECTS) $(top_builddir)/libasir-gc.la \
! 324: $(EXTRA_TEST_LIBS)
! 325:
! 326: gctest_SOURCES = tests/test.c
! 327: gctest_LDADD = $(test_ldadd) $(am__append_17)
! 328: -gctest_DEPENDENCIES = $(top_builddir)/libgc.la
! 329: +gctest_DEPENDENCIES = $(top_builddir)/libasir-gc.la
! 330: leaktest_SOURCES = tests/leak_test.c
! 331: leaktest_LDADD = $(test_ldadd)
! 332: middletest_SOURCES = tests/middle.c
! 333: @@ -1131,13 +1131,13 @@
! 334: realloc_test_LDADD = $(test_ldadd)
! 335: staticrootstest_SOURCES = tests/staticrootstest.c
! 336: staticrootstest_CFLAGS = -DSTATICROOTSLIB2
! 337: -staticrootstest_LDADD = $(nodist_libgc_la_OBJECTS) $(EXTRA_TEST_LIBS) \
! 338: +staticrootstest_LDADD = $(nodist_libasir-gc_la_OBJECTS) $(EXTRA_TEST_LIBS) \
! 339: libstaticrootslib_test.la libstaticrootslib2_test.la \
! 340: $(am__append_18)
! 341: libstaticrootslib_test_la_SOURCES = tests/staticrootslib.c
! 342: libstaticrootslib_test_la_LIBADD = $(test_ldadd)
! 343: libstaticrootslib_test_la_LDFLAGS = -no-undefined -rpath /nowhere
! 344: -libstaticrootslib_test_la_DEPENDENCIES = $(top_builddir)/libgc.la
! 345: +libstaticrootslib_test_la_DEPENDENCIES = $(top_builddir)/libasir-gc.la
! 346: libstaticrootslib2_test_la_SOURCES = tests/staticrootslib.c
! 347: libstaticrootslib2_test_la_LIBADD = $(test_ldadd)
! 348: libstaticrootslib2_test_la_CFLAGS = -DSTATICROOTSLIB2
! 349: @@ -1157,7 +1157,7 @@
! 350: @THREADS_TRUE@initsecondarythread_test_LDADD = $(test_ldadd) $(THREADDLLIBS)
! 351: @CPLUSPLUS_TRUE@test_cpp_SOURCES = tests/test_cpp.cc
! 352: @AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@test_cpp_LDADD = libgccpp.la \
! 353: -@AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(nodist_libgc_la_OBJECTS) \
! 354: +@AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(nodist_libasir-gc_la_OBJECTS) \
! 355: @AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(EXTRA_TEST_LIBS) \
! 356: @AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(CXXLIBS) \
! 357: @AVOID_CPP_LIB_FALSE@@CPLUSPLUS_TRUE@ $(am__append_25)
! 358: @@ -1345,8 +1345,8 @@
! 359: libatomic_ops/src/atomic_ops.lo: libatomic_ops/src/$(am__dirstamp) \
! 360: libatomic_ops/src/$(DEPDIR)/$(am__dirstamp)
! 361:
! 362: -libgc.la: $(libgc_la_OBJECTS) $(libgc_la_DEPENDENCIES) $(EXTRA_libgc_la_DEPENDENCIES)
! 363: - $(AM_V_CCLD)$(libgc_la_LINK) -rpath $(libdir) $(libgc_la_OBJECTS) $(libgc_la_LIBADD) $(LIBS)
! 364: +libasir-gc.la: $(libasir-gc_la_OBJECTS) $(libasir-gc_la_DEPENDENCIES) $(EXTRA_libasir-gc_la_DEPENDENCIES)
! 365: + $(AM_V_CCLD)$(libasir-gc_la_LINK) -rpath $(libdir) $(libasir-gc_la_OBJECTS) $(libasir-gc_la_LIBADD) $(LIBS)
! 366:
! 367: libgccpp.la: $(libgccpp_la_OBJECTS) $(libgccpp_la_DEPENDENCIES) $(EXTRA_libgccpp_la_DEPENDENCIES)
! 368: $(AM_V_CXXLD)$(libgccpp_la_LINK) $(am_libgccpp_la_rpath) $(libgccpp_la_OBJECTS) $(libgccpp_la_LIBADD) $(LIBS)
! 369: Only in gc-8.0.6: Makefile.in~
! 370: diff -ubBr gc-8.0.6.orig/NT_MAKEFILE gc-8.0.6/NT_MAKEFILE
! 371: --- gc-8.0.6.orig/NT_MAKEFILE 2021-09-29 05:47:22.000000000 +0900
! 372: +++ gc-8.0.6/NT_MAKEFILE 2021-10-02 14:36:15.420485000 +0900
! 373: @@ -23,6 +23,7 @@
! 374: !ENDIF
! 375:
! 376: cflags = $(cflags) -c -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -GS -D_WINNT -W4
! 377: +cflags = $(cflags) -nologo -DLARGE_CONFIG
! 378: !IF "$(CPU)" == "i386"
! 379: cflags = $(cflags) -D_X86_=1 -DWIN32 -D_WIN32
! 380: !ELSEIF "$(CPU)" == "AMD64"
! 381: diff -ubBr gc-8.0.6.orig/alloc.c gc-8.0.6/alloc.c
! 382: --- gc-8.0.6.orig/alloc.c 2021-09-29 05:47:22.000000000 +0900
! 383: +++ gc-8.0.6/alloc.c 2021-10-02 14:36:15.420827000 +0900
! 384: @@ -158,6 +158,7 @@
! 385: #else
! 386: word GC_free_space_divisor = 3;
! 387: #endif
! 388: +word GC_free_space_numerator = 1;
! 389:
! 390: GC_INNER int GC_CALLBACK GC_never_stop_func(void)
! 391: {
! 392: @@ -282,8 +283,8 @@
! 393: total_root_size = 2 * stack_size + GC_root_size;
! 394: scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4
! 395: + total_root_size;
! 396: - result = scan_size / GC_free_space_divisor;
! 397: - if (GC_incremental) {
! 398: + result = scan_size * GC_free_space_numerator / GC_free_space_divisor;
! 399: + if (1 || GC_incremental) {
! 400: result /= 2;
! 401: }
! 402: return result > min_bytes_allocd_minimum
! 403: @@ -1392,6 +1393,9 @@
! 404: if (GC_on_heap_resize)
! 405: (*GC_on_heap_resize)(GC_heapsize);
! 406:
! 407: +#if defined(VISUAL)
! 408: + SendHeapSize();
! 409: +#endif
! 410: return(TRUE);
! 411: }
! 412:
! 413: @@ -1454,6 +1458,7 @@
! 414: }
! 415:
! 416: blocks_to_get = (GC_heapsize - GC_heapsize_at_forced_unmap)
! 417: + * GC_free_space_numerator
! 418: / (HBLKSIZE * GC_free_space_divisor)
! 419: + needed_blocks;
! 420: if (blocks_to_get > MAXHINCR) {
! 421: diff -ubBr gc-8.0.6.orig/configure gc-8.0.6/configure
! 422: --- gc-8.0.6.orig/configure 2021-09-29 05:48:19.000000000 +0900
! 423: +++ gc-8.0.6/configure 2021-10-02 14:36:15.427205000 +0900
! 424: @@ -16887,7 +16887,7 @@
! 425:
! 426:
! 427:
! 428: -target_all=libgc.la
! 429: +target_all=libasir-gc.la
! 430:
! 431:
! 432: TARGET_ECOS="no"
! 433: diff -ubBr gc-8.0.6.orig/configure.ac gc-8.0.6/configure.ac
! 434: --- gc-8.0.6.orig/configure.ac 2021-09-29 05:47:22.000000000 +0900
! 435: +++ gc-8.0.6/configure.ac 2021-10-02 14:36:15.430272000 +0900
! 436: @@ -465,7 +465,7 @@
! 437:
! 438: AC_SUBST(EXTRA_TEST_LIBS)
! 439:
! 440: -target_all=libgc.la
! 441: +target_all=libasir-gc.la
! 442: AC_SUBST(target_all)
! 443:
! 444: dnl If the target is an eCos system, use the appropriate eCos
! 445: diff -ubBr gc-8.0.6.orig/cord/cord.am gc-8.0.6/cord/cord.am
! 446: --- gc-8.0.6.orig/cord/cord.am 2021-09-29 05:47:22.000000000 +0900
! 447: +++ gc-8.0.6/cord/cord.am 2021-10-02 14:43:40.112061000 +0900
! 448: @@ -7,7 +7,7 @@
! 449:
! 450: lib_LTLIBRARIES += libcord.la
! 451:
! 452: -libcord_la_LIBADD = $(top_builddir)/libgc.la
! 453: +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la
! 454: libcord_la_LDFLAGS = -version-info $(LIBCORD_VER_INFO) -no-undefined
! 455: libcord_la_CPPFLAGS = $(AM_CPPFLAGS)
! 456:
! 457: @@ -24,7 +24,7 @@
! 458: ## In case of static libraries build, libgc.a is already referenced in
! 459: ## dependency_libs attribute of libcord.la file.
! 460: if ENABLE_SHARED
! 461: -cordtest_LDADD += $(top_builddir)/libgc.la
! 462: +cordtest_LDADD += $(top_builddir)/libasir-gc.la
! 463: endif
! 464:
! 465: EXTRA_DIST += \
! 466: Only in gc-8.0.6/cord: cord.am~
! 467: diff -ubBr gc-8.0.6.orig/include/private/gcconfig.h gc-8.0.6/include/private/gcconfig.h
! 468: --- gc-8.0.6.orig/include/private/gcconfig.h 2021-09-29 05:47:22.000000000 +0900
! 469: +++ gc-8.0.6/include/private/gcconfig.h 2021-10-02 14:36:15.431830000 +0900
! 470: @@ -3226,6 +3226,7 @@
! 471: || defined(ARM32) \
! 472: || defined(AVR32) || defined(MIPS) \
! 473: || defined(NIOS2) || defined(OR1K))) \
! 474: + || (defined(FREEBSD) && defined(__FreeBSD__) && __FreeBSD__ < 5) \
! 475: || (defined(LINUX) && !defined(__gnu_linux__)) \
! 476: || (defined(RTEMS) && defined(I386)) || defined(HOST_ANDROID)) \
! 477: && !defined(NO_GETCONTEXT)
! 478: Only in gc-8.0.6: libatomic_ops
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
![[BACK]](/icons/cvsweb/back.gif){kind=icon}
Return to gc-8.0.6-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