Get debugger working with --disable-boehm-gc flag

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@492 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/debugger/mcs51/.cvsignore b/debugger/mcs51/.cvsignore
new file mode 100644 (file)
index 0000000..79d1b96
--- /dev/null
+++ b/debugger/mcs51/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.dep

diff --git a/debugger/mcs51/Makefile.in b/debugger/mcs51/Makefile.in
index 086ce97d5a72f2adf06fdd5142b10beb5238d138..f48de5054764a5334b162836b38ebc09ca95182b 100644 (file)
--- a/debugger/mcs51/Makefile.in
+++ b/debugger/mcs51/Makefile.in
@@ -13,13 +13,14 @@ CPP         = @CPP@
 INSTALL                = @INSTALL@
 
 PRJDIR         = ../..
+DISABLE_GC     = @DISABLE_GC@
 
 srcdir         = @srcdir@
 prefix         = @prefix@
 exec_prefix     = ${prefix}
 bindir          = ${exec_prefix}/bin
 libdir          = ${exec_prefix}/lib
-datadir         = ${prefix}/share
+datadir         = @datadir@
 includedir      = ${prefix}/include
 mandir          = ${prefix}/man
 man1dir         = $(mandir)/man1
@@ -31,8 +32,14 @@ CPPFLAGS     = @CPPFLAGS@ -I. -I$(PRJDIR) -I$(PRJDIR)/support
 CFLAGS         = @CFLAGS@
 M_OR_MM                = @M_OR_MM@
 LDFLAGS                = @LDFLAGS@
+
+ifeq ($(DISABLE_GC),1)
+LIBS            = @LIBS@
+LIBDIRS         =
+else
 LIBS            = -lgc @LIBS@
 LIBDIRS         = -L$(PRJDIR)/support/gc
+endif
 
 
 OBJECTS                = sdcdb.o symtab.o simi.o $(PRJDIR)/src/SDCCset.o \

diff --git a/debugger/mcs51/sdcdb.h b/debugger/mcs51/sdcdb.h
index 9d15567828852a4999ec8c495403c31df588e925..84fe88c764463fdc78b1e56685ca6ff71ebb03fb 100644 (file)
--- a/debugger/mcs51/sdcdb.h
+++ b/debugger/mcs51/sdcdb.h
@@ -32,18 +32,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include "sdccconf.h"
-#ifdef _NO_GC
-
-#define GC_malloc malloc
-#define GC_free free
-#define GC_realloc realloc
-
-#else
-
-#include "gc/gc.h"
-
-#endif
-
+#include "src/SDCCalloc.h"
 #include "src/SDCCset.h"
 #include "src/SDCChasht.h"