diff options
Diffstat (limited to 'mdk-stage1/slang')
-rw-r--r-- | mdk-stage1/slang/Makefile | 30 | ||||
-rw-r--r-- | mdk-stage1/slang/slmalloc.c | 6 |
2 files changed, 22 insertions, 14 deletions
diff --git a/mdk-stage1/slang/Makefile b/mdk-stage1/slang/Makefile index c78ee4668..4cd1dc6bb 100644 --- a/mdk-stage1/slang/Makefile +++ b/mdk-stage1/slang/Makefile @@ -18,31 +18,39 @@ top_dir = .. include $(top_dir)/Makefile.common -all: libslang.a libslang-DIET.a +LIBNAME = libslang -clean: - rm -f *.o *.a +OBJS = sltermin.o sldisply.o slutty.o slang.o slarray.o slclass.o slcmd.o slerr.o slgetkey.o slkeymap.o slmalloc.o slmath.o slmemchr.o slmemcmp.o slmemcpy.o slmemset.o slmisc.o slparse.o slprepr.o slregexp.o slrline.o slsearch.o slsmg.o slstd.o sltoken.o sltypes.o slxstrng.o slcurses.o slscroll.o slsignal.o slkeypad.o slerrno.o slstring.o slstruct.o slcmplex.o slarrfun.o slimport.o slpath.o slarith.o slassoc.o slcompat.o slposdir.o slstdio.o slproc.o sltime.o slstrops.o slbstr.o slpack.o slintall.o slistruc.o slposio.o slnspace.o slarrmis.o slospath.o slscanf.o -FLAGS = -Wall -Werror -Os -fomit-frame-pointer -Dunix -DSLANG -c +DEFS = -Dunix -DSLANG +INCS = -OBJS = sltermin.o sldisply.o slutty.o slang.o slarray.o slclass.o slcmd.o slerr.o slgetkey.o slkeymap.o slmalloc.o slmath.o slmemchr.o slmemcmp.o slmemcpy.o slmemset.o slmisc.o slparse.o slprepr.o slregexp.o slrline.o slsearch.o slsmg.o slstd.o sltoken.o sltypes.o slxstrng.o slcurses.o slscroll.o slsignal.o slkeypad.o slerrno.o slstring.o slstruct.o slcmplex.o slarrfun.o slimport.o slpath.o slarith.o slassoc.o slcompat.o slposdir.o slstdio.o slproc.o sltime.o slstrops.o slbstr.o slpack.o slintall.o slistruc.o slposio.o slnspace.o slarrmis.o slospath.o slscanf.o -OBJS-DIET = $(subst .o,-DIET.o,$(OBJS)) +TARGETS = $(LIBNAME).a + +ifeq (DIETLIBC, $(L)) +TARGETS += $(LIBNAME)-DIET.a +endif +all: $(TARGETS) -libslang.a: $(OBJS) +clean: + rm -f *.o *.a + +OBJS-DIET = $(subst .o,-DIET.o,$(OBJS)) + +$(LIBNAME).a: $(OBJS) ar -cru $@ $^ ranlib $@ -libslang-DIET.a: $(OBJS-DIET) +$(LIBNAME)-DIET.a: $(OBJS-DIET) ar -cru $@ $^ ranlib $@ - $(OBJS): %.o: %.c - gcc $(FLAGS) $(GLIBC_INCLUDES) -c $< -o $@ + gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c $< -o $@ $(OBJS-DIET): %-DIET.o: %.c - gcc $(FLAGS) $(DIETLIBC_INCLUDES) -c $< -o $@ + gcc $(CFLAGS) $(DEFS) $(INCS) $(DIETLIBC_INCLUDES) -c $< -o $@ diff --git a/mdk-stage1/slang/slmalloc.c b/mdk-stage1/slang/slmalloc.c index 914e1e0ef..be4ed6cae 100644 --- a/mdk-stage1/slang/slmalloc.c +++ b/mdk-stage1/slang/slmalloc.c @@ -94,7 +94,7 @@ static int check_memory (unsigned char *p, char *what) if (n == 0xFFFFFFFFUL) { - sprintf (buf, "%s: %p: Already FREE! Abort NOW.", what, p - Chunk); + sprintf (buf, "%s: %p: Already FREE! Abort NOW.", what, (void*)p - Chunk); SLmalloc_doerror (buf); return -1; } @@ -104,7 +104,7 @@ static int check_memory (unsigned char *p, char *what) || (*(p + (int) (n + 2)) != 81) || (*(p + (int) (n + 3)) != 86)) { - sprintf (buf, "\007%s: %p: Memory corrupt! Abort NOW.", what, p); + sprintf (buf, "\007%s: %p: Memory corrupt! Abort NOW.", what, (void*)p); SLmalloc_doerror (buf); return -1; } @@ -115,7 +115,7 @@ static int check_memory (unsigned char *p, char *what) if (Total_Allocated < 0) { sprintf (buf, "\007%s: %p\nFreed %ld, Allocated is: %ld!\n", - what, p, (long) n, Total_Allocated); + what, (void*)p, (long) n, Total_Allocated); SLang_doerror (buf); } #ifdef SLDEBUG_DOUT |