Annotation of OpenXM_contrib2/asir-gc/gc-7.4.2-risa.diff, Revision 1.2
1.2 ! ohara 1: diff -ubBr gc-7.6.12.orig/Makefile.am gc-7.6.12/Makefile.am
! 2: --- gc-7.6.12.orig/Makefile.am 2019-03-02 05:53:14.000000000 +0900
! 3: +++ gc-7.6.12/Makefile.am 2020-01-09 21:27:12.462046000 +0900
! 4: @@ -54,21 +54,21 @@
1.1 ohara 5: # C Library
6: # ---------
7:
8: -lib_LTLIBRARIES += libgc.la
9: +lib_LTLIBRARIES += libasir-gc.la
1.2 ! ohara 10:
1.1 ohara 11: if SINGLE_GC_OBJ
1.2 ! ohara 12:
1.1 ohara 13: -libgc_la_SOURCES = extra/gc.c
14: +libasir-gc_la_SOURCES = extra/gc.c
1.2 ! ohara 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:
1.1 ohara 22: else
1.2 ! ohara 23:
1.1 ohara 24: EXTRA_DIST += extra/gc.c
25: -libgc_la_SOURCES = \
26: +libasir-gc_la_SOURCES = \
27: allchblk.c alloc.c blacklst.c checksums.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 \
1.2 ! ohara 30: @@ -79,46 +79,46 @@
1.1 ohara 31: # ---------------------------------
32:
33: if WIN32_THREADS
1.2 ! ohara 34: -libgc_la_SOURCES += thread_local_alloc.c win32_threads.c
! 35: +libasir-gc_la_SOURCES += thread_local_alloc.c win32_threads.c
1.1 ohara 36: else
37: if PTHREADS
1.2 ! ohara 38: # Not Cygwin or MinGW.
! 39: -libgc_la_SOURCES += pthread_start.c pthread_support.c thread_local_alloc.c
! 40: +libasir-gc_la_SOURCES += pthread_start.c pthread_support.c thread_local_alloc.c
1.1 ohara 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 MAKE_BACK_GRAPH
52: -libgc_la_SOURCES += backgraph.c
53: +libasir-gc_la_SOURCES += backgraph.c
54: endif
55:
56: if ENABLE_DISCLAIM
57: -libgc_la_SOURCES += fnlz_mlc.c
58: +libasir-gc_la_SOURCES += fnlz_mlc.c
59: endif
60:
1.2 ! ohara 61: ## End of !SINGLE_GC_OBJ
1.1 ohara 62: endif
63:
64: if USE_INTERNAL_LIBATOMIC_OPS
65: -nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
66: +nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops.c
67: endif
68:
69: if NEED_ATOMIC_OPS_ASM
70: -nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
71: +nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
72: endif
73:
74: # Include THREADDLLIBS here to ensure that the correct versions of
75: # linuxthread semaphore functions get linked:
76: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
77: -libgc_la_DEPENDENCIES = @addobjs@
1.2 ! ohara 78: -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
1.1 ohara 79: +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
80: +libasir-gc_la_DEPENDENCIES = @addobjs@
1.2 ! ohara 81: +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
! 82: -no-undefined
1.1 ohara 83:
1.2 ! ohara 84: -EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
! 85: +EXTRA_libasir-gc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
! 86: sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s
1.1 ohara 87:
1.2 ! ohara 88: if CPLUSPLUS
! 89: @@ -128,7 +128,7 @@
1.1 ohara 90: pkginclude_HEADERS += include/gc_cpp.h
91: include_HEADERS += include/extra/gc_cpp.h
92: libgccpp_la_SOURCES = gc_cpp.cc
93: -libgccpp_la_LIBADD = ./libgc.la
94: +libgccpp_la_LIBADD = ./libasir-gc.la
1.2 ! ohara 95: libgccpp_la_LDFLAGS = -version-info $(LIBGCCPP_VER_INFO) -no-undefined
1.1 ohara 96: endif
97:
1.2 ! ohara 98: @@ -149,7 +149,7 @@
1.1 ohara 99:
100: ## FIXME: relies on internal code generated by automake.
101: ## FIXME: ./configure --enable-dependency-tracking should be used
102: -#all_objs = @addobjs@ $(libgc_la_OBJECTS)
103: +#all_objs = @addobjs@ $(libasir-gc_la_OBJECTS)
104: #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
105: #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
106: #include/gc_pthread_redirects.h include/gc_config_macros.h \
1.2 ! ohara 107: diff -ubBr gc-7.6.12.orig/Makefile.in gc-7.6.12/Makefile.in
! 108: --- gc-7.6.12.orig/Makefile.in 2019-03-02 05:55:05.000000000 +0900
! 109: +++ gc-7.6.12/Makefile.in 2020-01-09 21:27:06.542517000 +0900
! 110: @@ -219,7 +219,7 @@
! 111: "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" \
! 112: "$(DESTDIR)$(includedir)" "$(DESTDIR)$(pkgincludedir)"
1.1 ohara 113: LTLIBRARIES = $(lib_LTLIBRARIES)
114: -libcord_la_DEPENDENCIES = $(top_builddir)/libgc.la
115: +libcord_la_DEPENDENCIES = $(top_builddir)/libasir-gc.la
116: am__dirstamp = $(am__leading_dot)dirstamp
117: am_libcord_la_OBJECTS = cord/libcord_la-cordbscs.lo \
118: cord/libcord_la-cordprnt.lo cord/libcord_la-cordxtra.lo
1.2 ! ohara 119: @@ -232,7 +232,7 @@
1.1 ohara 120: $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
121: $(libcord_la_LDFLAGS) $(LDFLAGS) -o $@
122: am__DEPENDENCIES_1 =
123: -am__libgc_la_SOURCES_DIST = allchblk.c alloc.c blacklst.c checksums.c \
124: +am__libasir-gc_la_SOURCES_DIST = allchblk.c alloc.c blacklst.c checksums.c \
125: dbg_mlc.c dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c \
126: headers.c mach_dep.c malloc.c mallocx.c mark.c mark_rts.c \
127: misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c \
1.2 ! ohara 128: @@ -252,7 +252,7 @@
1.1 ohara 129: @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@am__objects_6 = \
130: @ENABLE_DISCLAIM_TRUE@@SINGLE_GC_OBJ_FALSE@ fnlz_mlc.lo
1.2 ! ohara 131: @PTHREAD_START_STANDALONE_TRUE@@SINGLE_GC_OBJ_TRUE@am__objects_7 = pthread_start.lo
1.1 ohara 132: -@SINGLE_GC_OBJ_FALSE@am_libgc_la_OBJECTS = allchblk.lo alloc.lo \
133: +@SINGLE_GC_OBJ_FALSE@am_libasir-gc_la_OBJECTS = allchblk.lo alloc.lo \
134: @SINGLE_GC_OBJ_FALSE@ blacklst.lo checksums.lo dbg_mlc.lo \
135: @SINGLE_GC_OBJ_FALSE@ dyn_load.lo finalize.lo gc_dlopen.lo \
136: @SINGLE_GC_OBJ_FALSE@ gcj_mlc.lo headers.lo mach_dep.lo \
1.2 ! ohara 137: @@ -264,17 +264,17 @@
1.1 ohara 138: @SINGLE_GC_OBJ_FALSE@ $(am__objects_2) $(am__objects_3) \
139: @SINGLE_GC_OBJ_FALSE@ $(am__objects_4) $(am__objects_5) \
140: @SINGLE_GC_OBJ_FALSE@ $(am__objects_6)
1.2 ! ohara 141: -@SINGLE_GC_OBJ_TRUE@am_libgc_la_OBJECTS = extra/gc.lo $(am__objects_7) \
! 142: +@SINGLE_GC_OBJ_TRUE@am_libasir-gc_la_OBJECTS = extra/gc.lo $(am__objects_7) \
! 143: @SINGLE_GC_OBJ_TRUE@ $(am__objects_1) $(am__objects_2) \
! 144: @SINGLE_GC_OBJ_TRUE@ $(am__objects_3) $(am__objects_4) \
! 145: @SINGLE_GC_OBJ_TRUE@ $(am__objects_5) $(am__objects_6)
1.1 ohara 146: -@NEED_ATOMIC_OPS_ASM_FALSE@@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops.lo
147: -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_OBJECTS = libatomic_ops/src/atomic_ops_sysdeps.lo
148: -libgc_la_OBJECTS = $(am_libgc_la_OBJECTS) $(nodist_libgc_la_OBJECTS)
149: -libgc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
150: +@NEED_ATOMIC_OPS_ASM_FALSE@@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libasir-gc_la_OBJECTS = libatomic_ops/src/atomic_ops.lo
151: +@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libasir-gc_la_OBJECTS = libatomic_ops/src/atomic_ops_sysdeps.lo
152: +libasir-gc_la_OBJECTS = $(am_libasir-gc_la_OBJECTS) $(nodist_libasir-gc_la_OBJECTS)
153: +libasir-gc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
154: $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
155: - $(libgc_la_LDFLAGS) $(LDFLAGS) -o $@
156: -@CPLUSPLUS_TRUE@libgccpp_la_DEPENDENCIES = ./libgc.la
157: + $(libasir-gc_la_LDFLAGS) $(LDFLAGS) -o $@
158: +@CPLUSPLUS_TRUE@libgccpp_la_DEPENDENCIES = ./libasir-gc.la
159: am__libgccpp_la_SOURCES_DIST = gc_cpp.cc
160: @CPLUSPLUS_TRUE@am_libgccpp_la_OBJECTS = gc_cpp.lo
161: libgccpp_la_OBJECTS = $(am_libgccpp_la_OBJECTS)
1.2 ! ohara 162: @@ -282,8 +282,8 @@
1.1 ohara 163: $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
164: $(CXXFLAGS) $(libgccpp_la_LDFLAGS) $(LDFLAGS) -o $@
165: @CPLUSPLUS_TRUE@am_libgccpp_la_rpath = -rpath $(libdir)
1.2 ! ohara 166: -am__DEPENDENCIES_2 = $(nodist_libgc_la_OBJECTS) \
! 167: - $(top_builddir)/libgc.la $(am__DEPENDENCIES_1)
! 168: +am__DEPENDENCIES_2 = $(nodist_libasir-gc_la_OBJECTS) \
! 169: + $(top_builddir)/libasir-gc.la $(am__DEPENDENCIES_1)
1.1 ohara 170: libstaticrootslib2_test_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
171: am_libstaticrootslib2_test_la_OBJECTS = \
172: tests/libstaticrootslib2_test_la-staticrootslib.lo
1.2 ! ohara 173: @@ -310,7 +310,7 @@
1.1 ohara 174: @ENABLE_DISCLAIM_TRUE@ disclaim_bench$(EXEEXT)
175: am_cordtest_OBJECTS = cord/tests/cordtest.$(OBJEXT)
176: cordtest_OBJECTS = $(am_cordtest_OBJECTS)
177: -cordtest_DEPENDENCIES = $(top_builddir)/libgc.la \
178: +cordtest_DEPENDENCIES = $(top_builddir)/libasir-gc.la \
179: $(top_builddir)/libcord.la
180: am__disclaim_bench_SOURCES_DIST = tests/disclaim_bench.c
181: @ENABLE_DISCLAIM_TRUE@am_disclaim_bench_OBJECTS = \
1.2 ! ohara 182: @@ -465,8 +465,8 @@
1.1 ohara 183: am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@)
184: am__v_CCAS_0 = @echo " CCAS " $@;
185: am__v_CCAS_1 =
186: -SOURCES = $(libcord_la_SOURCES) $(libgc_la_SOURCES) \
187: - $(EXTRA_libgc_la_SOURCES) $(nodist_libgc_la_SOURCES) \
188: +SOURCES = $(libcord_la_SOURCES) $(libasir-gc_la_SOURCES) \
189: + $(EXTRA_libasir-gc_la_SOURCES) $(nodist_libasir-gc_la_SOURCES) \
190: $(libgccpp_la_SOURCES) $(libstaticrootslib2_test_la_SOURCES) \
191: $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \
192: $(disclaim_bench_SOURCES) $(disclaim_test_SOURCES) \
1.2 ! ohara 193: @@ -477,8 +477,8 @@
1.1 ohara 194: $(subthreadcreate_test_SOURCES) $(test_cpp_SOURCES) \
195: $(threadkey_test_SOURCES) $(threadleaktest_SOURCES) \
196: $(tracetest_SOURCES)
197: -DIST_SOURCES = $(libcord_la_SOURCES) $(am__libgc_la_SOURCES_DIST) \
198: - $(EXTRA_libgc_la_SOURCES) $(am__libgccpp_la_SOURCES_DIST) \
199: +DIST_SOURCES = $(libcord_la_SOURCES) $(am__libasir-gc_la_SOURCES_DIST) \
200: + $(EXTRA_libasir-gc_la_SOURCES) $(am__libgccpp_la_SOURCES_DIST) \
201: $(libstaticrootslib2_test_la_SOURCES) \
202: $(libstaticrootslib_test_la_SOURCES) $(cordtest_SOURCES) \
203: $(am__disclaim_bench_SOURCES_DIST) \
1.2 ! ohara 204: @@ -985,7 +985,7 @@
1.1 ohara 205:
206: # C Library
207: # ---------
1.2 ! ohara 208: -lib_LTLIBRARIES = libgc.la $(am__append_10) libcord.la
! 209: +lib_LTLIBRARIES = libasir-gc.la $(am__append_10) libcord.la
1.1 ohara 210:
211: # unprefixed header
1.2 ! ohara 212: include_HEADERS = $(am__append_12) include/extra/gc.h
! 213: @@ -1021,7 +1021,7 @@
! 214: $(am__append_20)
1.1 ohara 215: pkgconfigdir = $(libdir)/pkgconfig
216: pkgconfig_DATA = bdw-gc.pc
217: -@SINGLE_GC_OBJ_FALSE@libgc_la_SOURCES = allchblk.c alloc.c blacklst.c \
218: +@SINGLE_GC_OBJ_FALSE@libasir-gc_la_SOURCES = allchblk.c alloc.c blacklst.c \
219: @SINGLE_GC_OBJ_FALSE@ checksums.c dbg_mlc.c dyn_load.c \
220: @SINGLE_GC_OBJ_FALSE@ finalize.c gc_dlopen.c gcj_mlc.c \
221: @SINGLE_GC_OBJ_FALSE@ headers.c mach_dep.c malloc.c mallocx.c \
1.2 ! ohara 222: @@ -1032,25 +1032,25 @@
1.1 ohara 223: @SINGLE_GC_OBJ_FALSE@ $(am__append_4) $(am__append_5) \
1.2 ! ohara 224: @SINGLE_GC_OBJ_FALSE@ $(am__append_6) $(am__append_7) \
! 225: @SINGLE_GC_OBJ_FALSE@ $(am__append_8) $(am__append_9)
1.1 ohara 226: -@SINGLE_GC_OBJ_TRUE@libgc_la_SOURCES = extra/gc.c $(am__append_2) \
227: +@SINGLE_GC_OBJ_TRUE@libasir-gc_la_SOURCES = extra/gc.c $(am__append_2) \
1.2 ! ohara 228: @SINGLE_GC_OBJ_TRUE@ $(am__append_4) $(am__append_5) \
! 229: @SINGLE_GC_OBJ_TRUE@ $(am__append_6) $(am__append_7) \
! 230: @SINGLE_GC_OBJ_TRUE@ $(am__append_8) $(am__append_9)
1.1 ohara 231: -@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
232: -@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libgc_la_SOURCES = libatomic_ops/src/atomic_ops.c
233: +@NEED_ATOMIC_OPS_ASM_TRUE@nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops_sysdeps.S
234: +@USE_INTERNAL_LIBATOMIC_OPS_TRUE@nodist_libasir-gc_la_SOURCES = libatomic_ops/src/atomic_ops.c
235:
236: # Include THREADDLLIBS here to ensure that the correct versions of
237: # linuxthread semaphore functions get linked:
238: -libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
239: -libgc_la_DEPENDENCIES = @addobjs@
1.2 ! ohara 240: -libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
1.1 ohara 241: +libasir-gc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
242: +libasir-gc_la_DEPENDENCIES = @addobjs@
1.2 ! ohara 243: +libasir-gc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info $(LIBGC_VER_INFO) \
! 244: -no-undefined
! 245:
! 246: -EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
! 247: +EXTRA_libasir-gc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
! 248: sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s
1.1 ohara 249:
250: @CPLUSPLUS_TRUE@libgccpp_la_SOURCES = gc_cpp.cc
251: -@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libgc.la
252: +@CPLUSPLUS_TRUE@libgccpp_la_LIBADD = ./libasir-gc.la
1.2 ! ohara 253: @CPLUSPLUS_TRUE@libgccpp_la_LDFLAGS = -version-info $(LIBGCCPP_VER_INFO) -no-undefined
1.1 ohara 254:
255: # Misc
1.2 ! ohara 256: @@ -1058,7 +1058,7 @@
1.1 ohara 257: AM_CXXFLAGS = @GC_CFLAGS@
1.2 ! ohara 258: @ASM_WITH_CPP_UNSUPPORTED_FALSE@ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
1.1 ohara 259:
260: -#all_objs = @addobjs@ $(libgc_la_OBJECTS)
261: +#all_objs = @addobjs@ $(libasir-gc_la_OBJECTS)
262: #$(all_objs) : include/private/gcconfig.h include/private/gc_priv.h \
263: #include/private/gc_hdrs.h include/gc.h include/gc_gcj.h \
264: #include/gc_pthread_redirects.h include/gc_config_macros.h \
1.2 ! ohara 265: @@ -1071,7 +1071,7 @@
! 266: # These numbers should be updated at most once just before the release,
! 267: # and, optionally, at most once during the development (after the release).
! 268: LIBCORD_VER_INFO = 4:2:3
1.1 ohara 269: -libcord_la_LIBADD = $(top_builddir)/libgc.la
270: +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la
1.2 ! ohara 271: libcord_la_LDFLAGS = -version-info $(LIBCORD_VER_INFO) -no-undefined
1.1 ohara 272: libcord_la_CPPFLAGS = $(AM_CPPFLAGS)
273: libcord_la_SOURCES = \
1.2 ! ohara 274: @@ -1080,15 +1080,15 @@
1.1 ohara 275: cord/cordxtra.c
276:
277: cordtest_SOURCES = cord/tests/cordtest.c
278: -cordtest_LDADD = $(top_builddir)/libgc.la $(top_builddir)/libcord.la
279: +cordtest_LDADD = $(top_builddir)/libasir-gc.la $(top_builddir)/libcord.la
280:
281: # Common libs to _LDADD for all tests.
1.2 ! ohara 282: -test_ldadd = $(nodist_libgc_la_OBJECTS) $(top_builddir)/libgc.la \
! 283: +test_ldadd = $(nodist_libasir-gc_la_OBJECTS) $(top_builddir)/libasir-gc.la \
! 284: $(EXTRA_TEST_LIBS)
! 285:
1.1 ohara 286: gctest_SOURCES = tests/test.c
1.2 ! ohara 287: gctest_LDADD = $(test_ldadd) $(am__append_13)
1.1 ohara 288: -gctest_DEPENDENCIES = $(top_builddir)/libgc.la
289: +gctest_DEPENDENCIES = $(top_builddir)/libasir-gc.la
290: leaktest_SOURCES = tests/leak_test.c
291: leaktest_LDADD = $(test_ldadd)
292: middletest_SOURCES = tests/middle.c
1.2 ! ohara 293: @@ -1109,7 +1109,7 @@
1.1 ohara 294: libstaticrootslib_test_la_LDFLAGS = -version-info 1:3:0 -no-undefined \
295: -rpath /nowhere
296:
297: -libstaticrootslib_test_la_DEPENDENCIES = $(top_builddir)/libgc.la
298: +libstaticrootslib_test_la_DEPENDENCIES = $(top_builddir)/libasir-gc.la
299: libstaticrootslib2_test_la_SOURCES = tests/staticrootslib.c
300: libstaticrootslib2_test_la_LIBADD = $(test_ldadd)
301: libstaticrootslib2_test_la_CFLAGS = -DSTATICROOTSLIB2
1.2 ! ohara 302: @@ -1307,8 +1307,8 @@
1.1 ohara 303: libatomic_ops/src/atomic_ops.lo: libatomic_ops/src/$(am__dirstamp) \
304: libatomic_ops/src/$(DEPDIR)/$(am__dirstamp)
305:
306: -libgc.la: $(libgc_la_OBJECTS) $(libgc_la_DEPENDENCIES) $(EXTRA_libgc_la_DEPENDENCIES)
307: - $(AM_V_CCLD)$(libgc_la_LINK) -rpath $(libdir) $(libgc_la_OBJECTS) $(libgc_la_LIBADD) $(LIBS)
308: +libasir-gc.la: $(libasir-gc_la_OBJECTS) $(libasir-gc_la_DEPENDENCIES) $(EXTRA_libasir-gc_la_DEPENDENCIES)
309: + $(AM_V_CCLD)$(libasir-gc_la_LINK) -rpath $(libdir) $(libasir-gc_la_OBJECTS) $(libasir-gc_la_LIBADD) $(LIBS)
310:
311: libgccpp.la: $(libgccpp_la_OBJECTS) $(libgccpp_la_DEPENDENCIES) $(EXTRA_libgccpp_la_DEPENDENCIES)
312: $(AM_V_CXXLD)$(libgccpp_la_LINK) $(am_libgccpp_la_rpath) $(libgccpp_la_OBJECTS) $(libgccpp_la_LIBADD) $(LIBS)
1.2 ! ohara 313: diff -ubBr gc-7.6.12.orig/NT_MAKEFILE gc-7.6.12/NT_MAKEFILE
! 314: --- gc-7.6.12.orig/NT_MAKEFILE 2019-03-02 05:53:14.000000000 +0900
! 315: +++ gc-7.6.12/NT_MAKEFILE 2020-01-09 21:34:36.957823000 +0900
! 316: @@ -23,6 +23,7 @@
! 317: !ENDIF
! 318:
! 319: cflags = $(cflags) -c -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -GS -D_WINNT -W4
! 320: +cflags = $(cflags) -nologo -DLARGE_CONFIG
! 321: !IF "$(CPU)" == "i386"
! 322: cflags = $(cflags) -D_X86_=1 -DWIN32 -D_WIN32
! 323: !ELSEIF "$(CPU)" == "AMD64"
! 324: diff -ubBr gc-7.6.12.orig/alloc.c gc-7.6.12/alloc.c
! 325: --- gc-7.6.12.orig/alloc.c 2019-03-02 05:53:14.000000000 +0900
! 326: +++ gc-7.6.12/alloc.c 2020-01-09 21:24:08.355199000 +0900
! 327: @@ -126,6 +126,7 @@
! 328: #else
! 329: word GC_free_space_divisor = 3;
1.1 ohara 330: #endif
331: +word GC_free_space_numerator = 1;
332:
333: GC_INNER int GC_CALLBACK GC_never_stop_func(void)
334: {
1.2 ! ohara 335: @@ -236,8 +237,8 @@
1.1 ohara 336: total_root_size = 2 * stack_size + GC_root_size;
337: scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4
338: + total_root_size;
339: - result = scan_size / GC_free_space_divisor;
340: - if (GC_incremental) {
341: + result = scan_size * GC_free_space_numerator / GC_free_space_divisor;
342: + if (1 || GC_incremental) {
343: result /= 2;
344: }
345: return result > 0 ? result : 1;
1.2 ! ohara 346: @@ -1300,6 +1301,9 @@
1.1 ohara 347: if (GC_on_heap_resize)
348: (*GC_on_heap_resize)(GC_heapsize);
349:
350: +#if defined(VISUAL)
351: + SendHeapSize();
352: +#endif
353: return(TRUE);
354: }
355:
1.2 ! ohara 356: @@ -1364,6 +1368,7 @@
1.1 ohara 357: }
358:
1.2 ! ohara 359: blocks_to_get = (GC_heapsize - GC_heapsize_at_forced_unmap)
! 360: + * GC_free_space_numerator
! 361: / (HBLKSIZE * GC_free_space_divisor)
! 362: + needed_blocks;
1.1 ohara 363: if (blocks_to_get > MAXHINCR) {
1.2 ! ohara 364: diff -ubBr gc-7.6.12.orig/configure gc-7.6.12/configure
! 365: --- gc-7.6.12.orig/configure 2019-03-02 05:55:04.000000000 +0900
! 366: +++ gc-7.6.12/configure 2020-01-09 21:18:23.826366000 +0900
! 367: @@ -16995,7 +16995,7 @@
1.1 ohara 368:
369:
370:
371: -target_all=libgc.la
372: +target_all=libasir-gc.la
373:
374:
375: TARGET_ECOS="no"
1.2 ! ohara 376: diff -ubBr gc-7.6.12.orig/configure.ac gc-7.6.12/configure.ac
! 377: --- gc-7.6.12.orig/configure.ac 2019-03-02 05:53:14.000000000 +0900
! 378: +++ gc-7.6.12/configure.ac 2020-01-09 21:18:23.826825000 +0900
! 379: @@ -537,7 +537,7 @@
1.1 ohara 380:
381: AC_SUBST(EXTRA_TEST_LIBS)
382:
383: -target_all=libgc.la
384: +target_all=libasir-gc.la
385: AC_SUBST(target_all)
386:
387: dnl If the target is an eCos system, use the appropriate eCos
1.2 ! ohara 388: diff -ubBr gc-7.6.12.orig/cord/cord.am gc-7.6.12/cord/cord.am
! 389: --- gc-7.6.12.orig/cord/cord.am 2019-03-02 05:53:14.000000000 +0900
! 390: +++ gc-7.6.12/cord/cord.am 2020-01-09 21:40:55.885610000 +0900
! 391: @@ -7,7 +7,7 @@
1.1 ohara 392:
393: lib_LTLIBRARIES += libcord.la
394:
395: -libcord_la_LIBADD = $(top_builddir)/libgc.la
396: +libcord_la_LIBADD = $(top_builddir)/libasir-gc.la
1.2 ! ohara 397: libcord_la_LDFLAGS = -version-info $(LIBCORD_VER_INFO) -no-undefined
1.1 ohara 398: libcord_la_CPPFLAGS = $(AM_CPPFLAGS)
399:
1.2 ! ohara 400: @@ -19,7 +19,7 @@
1.1 ohara 401: TESTS += cordtest$(EXEEXT)
402: check_PROGRAMS += cordtest
403: cordtest_SOURCES = cord/tests/cordtest.c
404: -cordtest_LDADD = $(top_builddir)/libgc.la $(top_builddir)/libcord.la
405: +cordtest_LDADD = $(top_builddir)/libasir-gc.la $(top_builddir)/libcord.la
406:
407: EXTRA_DIST += \
408: cord/tests/de.c \
1.2 ! ohara 409: diff -ubBr gc-7.6.12.orig/include/private/gcconfig.h gc-7.6.12/include/private/gcconfig.h
! 410: --- gc-7.6.12.orig/include/private/gcconfig.h 2019-03-02 05:53:14.000000000 +0900
! 411: +++ gc-7.6.12/include/private/gcconfig.h 2020-01-09 21:43:57.934071000 +0900
! 412: @@ -2974,6 +2974,7 @@
! 413: || defined(ARM32) \
! 414: || defined(AVR32) || defined(MIPS) \
! 415: || defined(NIOS2) || defined(OR1K))) \
1.1 ohara 416: + || (defined(FREEBSD) && defined(__FreeBSD__) && __FreeBSD__ < 5) \
1.2 ! ohara 417: || (defined(LINUX) && !defined(__gnu_linux__)) \
! 418: || (defined(RTEMS) && defined(I386)) || defined(PLATFORM_ANDROID)) \
1.1 ohara 419: && !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