diff --git a/bin/cfe/gnu.mk b/bin/cfe/gnu.mk index 9397b1d..106f75a 100644 --- cfe.orig/bin/cfe/gnu.mk +++ cfe/bin/cfe/gnu.mk @@ -12,4 +12,4 @@ $(cfebits)/c99.lex.o: cflags += $(c99lexfix) .SECONDARY: $(addprefix, $(cfebits)/,c99.tab.h c99.tab.c c99.lex.c) $(call o2d,$(cfeobj)): cflags += -I $(cferootnode)/lib -include $(call o2d,$(cfeobj)) +-include $(call o2d,$(cfeobj)) diff --git a/lib/ds/gnu.mk b/lib/ds/gnu.mk index 1869b71..8ba637f 100644 --- cfe.orig/lib/ds/gnu.mk +++ cfe/lib/ds/gnu.mk @@ -11,4 +11,4 @@ $(dsbits)/trie.o: cflags += -Wno-char-subscripts $(L)/libds.a: $(dsobj) -include $(call o2d,$(dsobj)) +-include $(call o2d,$(dsobj)) diff --git a/bin/drv/gnu.mk b/bin/drv/gnu.mk index ba686e5..78aee93 100644 --- drv.orig/bin/drv/gnu.mk +++ drv/bin/drv/gnu.mk @@ -5,9 +5,9 @@ drvobj = $(call c2o,$(drvbits),$(drvsrc)) .PHONY: drv drv: $(B)/mcc -cflags += -D_XOPEN_SOURCE=700 +cflags += -D_XOPEN_SOURCE=500 $(B)/mcc: $(drvbits)/main.o $(B)/mcc: $(drvbits)/util.o -include $(call o2d,$(drvobj)) +-include $(call o2d,$(drvobj)) diff --git a/bin/drv/main.c b/bin/drv/main.c index b4b5de0..2a85797 100644 --- drv.orig/bin/drv/main.c +++ drv/bin/drv/main.c @@ -525,8 +525,8 @@ int ccf(FPList *f,void * opt) int pid[10]; int st[10]; int pipepp[2],pipefe[2],pipelk[2]; - int in,out; - char *tname; + int in = -1,out = -1; + char *tname = NULL; if (f->flag == OFILE) { @@ -550,9 +550,9 @@ int ccf(FPList *f,void * opt) tmpfiles = appendchar(tname,tmpfiles,TMPFILE); - pipe(pipepp); - pipe(pipefe); - pipe(pipelk); + if (pipe(pipepp) == -1); + if (pipe(pipefe) == -1); + if (pipe(pipelk) == -1); } diff --git a/bin/drv/util.c b/bin/drv/util.c index 893c916..c4815b5 100644 --- drv.orig/bin/drv/util.c +++ drv/bin/drv/util.c @@ -11,6 +11,7 @@ extern int endcompil; extern int infiletype; +extern FILE *open_memstream (char **__bufloc, size_t *__sizeloc) __THROW __wur; char *helptext[]= { diff --git a/bin/gen/gnu.mk b/bin/gen/gnu.mk index 7e33e9d..dead9db 100644 --- gen.orig/bin/gen/gnu.mk +++ gen/bin/gen/gnu.mk @@ -12,4 +12,4 @@ $(B)/exa-gen: $(genbits)/example.o $(PLIME)/lib/liblime.a $(PLCC)/lib/liblcc.a $(B)/mc-lime-gen: $(genbits)/main.o $(PLIME)/lib/liblime.a $(PLCC)/lib/liblcc.a $(call o2d,$(genobj)): cflags += -I $(ILIME) -I $(ILCC) -include $(call o2d,$(genobj)) +-include $(call o2d,$(genobj)) diff --git a/lib/lcc/c.h b/lib/lcc/c.h index 51a427a..73b0fa1 100644 --- lcc.orig/lib/lcc/c.h +++ lcc/lib/lcc/c.h @@ -151,12 +151,15 @@ void (*stabsym) (LSymbol); void (*stabtype) (LSymbol); Xinterface x; } Interface; + +#if 0 /* Unused */ typedef struct binding { char *name; Interface *ir; } Binding; extern Binding bindings[]; +#endif extern Interface *IR; typedef struct { LList blockentry; diff --git a/lib/lcc/gnu.mk b/lib/lcc/gnu.mk index af0efdf..a5d5886 100644 --- lcc.orig/lib/lcc/gnu.mk +++ lcc/lib/lcc/gnu.mk @@ -44,4 +44,4 @@ $(lccbits)/mcp.o: cflags += -Wno-char-subscripts $(eval $(call headroute,lcc,$(lccnode))) -include $(call o2d,$(lccobj)) +-include $(call o2d,$(lccobj)) diff --git a/lib/lime/gnu.mk b/lib/lime/gnu.mk index 42ca3f5..3395793 100644 --- lime.orig/lib/lime/gnu.mk +++ lime/lib/lime/gnu.mk @@ -1,5 +1,5 @@ lmbits := $(call bitspath) -# lmnode := $(call nodepath) +lmnode := $(call nodepath) lmsrc = \ rune.c \ @@ -22,20 +22,20 @@ lmsrc = \ lminc = \ - $(I)/lime/construct.h \ - $(I)/lime/util.h \ - $(I)/lime/heap.h + construct.h \ + util.h \ + heap.h + +$(eval $(call headroute,lime,$(lmnode))) lmobj = $(call c2o,$(lmbits),$(lmsrc)) .PHONY: lmlib -lmlib: $(L)/liblime.a $(lminc) +lmlib: $(L)/liblime.a $(addprefix $(I)/lime/,$(lminc)) $(L)/liblime.a: $(lmobj) # $(lmbits)/list.o: cflags += -D_XOPEN_SOURCE=700 $(strictfix) -$(lmbits)/util.o: cflags += -D_XOPEN_SOURCE=700 $(strictfix) - -# $(eval $(call headroute,lime,$(lmnode))) +$(lmbits)/util.o: cflags += -D_XOPEN_SOURCE=500 $(strictfix) -include $(call o2d,$(lmobj)) +-include $(call o2d,$(lmobj)) diff --git a/lib/lime/loaddag.c b/lib/lime/loaddag.c index 07508bd..9d2d061 100644 --- lime.orig/lib/lime/loaddag.c +++ lime/lib/lime/loaddag.c @@ -87,10 +87,12 @@ static LoadCurrent node(const LoadContext *const, List *const, List *const); static LoadCurrent ce( const LoadContext *const, List *const, List *const, List *const); +#ifndef isascii static unsigned isascii(const int c) { return (c & 0x7f) == c; } +#endif static unsigned isfirstid(const int c) { diff --git a/lib/lime/util.c b/lib/lime/util.c index ac5ce61..ad95cd3 100644 --- lime.orig/lib/lime/util.c +++ lime/lib/lime/util.c @@ -11,6 +11,8 @@ #define DBGFLAGS 0 +extern FILE *open_memstream (char **__bufloc, size_t *__sizeloc) __THROW __wur; + unsigned middle(const unsigned a, const unsigned b) { return a + (b - a) / 2; } diff --git a/tst/gnu.mk b/tst/gnu.mk index 95830b1..8dc0837 100644 --- lime.orig/tst/gnu.mk +++ lime/tst/gnu.mk @@ -51,4 +51,4 @@ $(T)/tst-forkdag: $(lmtstbits)/tst-forkdag.o $(lmlib) $(T)/tst-evallists: $(lmtstbits)/tst-evallists.o $(lmlib) $(call o2d,$(tstobj)): cflags += -I $(lmrootnode)/lib -include $(call o2d,$(tstobj)) +-include $(call o2d,$(tstobj)) diff --git a/gnu/tcn/arch-gcc.mk b/gnu/tcn/arch-gcc.mk index 7270664..07ec477 100644 --- mkenv.orig/gnu/tcn/arch-gcc.mk +++ mkenv/gnu/tcn/arch-gcc.mk @@ -1,4 +1,4 @@ -echo = echo -e +echo = /bin/echo -e cc = gcc -Wall -Werror -pedantic -c -pipe cflags =