From: Ivan Maidanski <ivmai@mail.ru>
Date: Wed, 7 Jun 2017 22:16:58 +0000 (+0300)
Subject: Do not compile pcr_interface.c and real_malloc.c except by PCR-Makefile
X-Git-Tag: v8.0.0~701
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5122107e0a60c7e9e3b3da141b960138f9cc94ea;p=gc

Do not compile pcr_interface.c and real_malloc.c except by PCR-Makefile

These .c files are empty compilation units for targets other than PCR.

* Makefile.am (libgc_la_SOURCES): Remove pcr_interface.c, real_malloc.c.
* Makefile.direct (CSRCS): Likewise.
* Makefile.am (EXTRA_DIST): Add pcr_interface.c, real_malloc.c.
* SMakefile.amiga (OBJS): Remove real_malloc.o.
* SMakefile.amiga (real_malloc.o): Remove.
---

diff --git a/Makefile.am b/Makefile.am
index 5b63258e..3c87ce9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,8 +63,7 @@ libgc_la_SOURCES = \
     allchblk.c alloc.c blacklst.c checksums.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 misc.c new_hblk.c \
-    obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
-    specific.c stubborn.c typd_mlc.c
+    obj_map.c os_dep.c ptr_chck.c reclaim.c specific.c stubborn.c typd_mlc.c
 
 # C Library: Architecture Dependent
 # ---------------------------------
@@ -194,6 +193,7 @@ EXTRA_DIST += tools/if_mach.c tools/if_not_there.c tools/setjmp_t.c \
     tools/threadlibs.c gc.mak extra/MacOS.c extra/AmigaOS.c \
     extra/symbian/global_end.cpp extra/symbian/global_start.cpp \
     extra/symbian/init_global_static_roots.cpp extra/symbian.cpp \
+    pcr_interface.c real_malloc.c \
     build/s60v3/bld.inf build/s60v3/libgc.mmp \
     extra/Mac_files/datastart.c extra/Mac_files/dataend.c \
     extra/Mac_files/MacOS_config.h \
diff --git a/Makefile.direct b/Makefile.direct
index 9eec9aaa..40a451eb 100644
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -85,8 +85,8 @@ OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o \
   thread_local_alloc.o fnlz_mlc.o atomic_ops.o atomic_ops_sysdeps.o
 
 CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c \
-  headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c \
-  new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c \
+  headers.c mark.c obj_map.c blacklst.c finalize.c \
+  new_hblk.c dyn_load.c dbg_mlc.c malloc.c stubborn.c \
   checksums.c pthread_support.c pthread_stop_world.c darwin_stop_world.c \
   typd_mlc.c ptr_chck.c mallocx.c gcj_mlc.c specific.c gc_dlopen.c \
   backgraph.c win32_threads.c pthread_start.c thread_local_alloc.c fnlz_mlc.c
diff --git a/SMakefile.amiga b/SMakefile.amiga
index 6400a992..86fc0c2f 100644
--- a/SMakefile.amiga
+++ b/SMakefile.amiga
@@ -72,7 +72,7 @@ cord/cordtest: cord/cordtest.o cord/cord$(CPU).lib gc$(CPU).lib
 
 #------------------LIBBING----------------------------
 
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o fnlz_mlc.o
+OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o fnlz_mlc.o
 
 gc$(CPU).lib: $(OBJS)
 	$(LIBER) gc$(CPU).lib r $(OBJS)
@@ -124,9 +124,6 @@ finalize.o : finalize.c $(INC)
 new_hblk.o : new_hblk.c $(INC)
 	$(CC) new_hblk.c $(SCOPT)
 
-real_malloc.o : real_malloc.c $(INC)
-	$(CC) real_malloc.c $(SCOPT)
-
 dyn_load.o : dyn_load.c $(INC)
 	$(CC) dyn_load.c $(SCOPT)