Update from trunk.

--HG--
branch : dtrg-videocore
This commit is contained in:
David Given
2013-05-29 15:03:48 +01:00
11 changed files with 47 additions and 24 deletions

View File

@@ -45,9 +45,9 @@ $(eval CLEANABLES += $o $1/Lpars.h)
$o: $1/Lpars.h
$1/Lpars.h: $2 $(LLGEN)
@echo LLGEN $1/Lpars.c
@mkdir -p $(dir $o)
@mkdir -p $1
$(hide) $(RM) $o $1/Lpars.h
$(hide) cd $(dir $o) && $(LLGEN) $(abspath $2)
$(hide) cd $1 && $(LLGEN) $(abspath $2)
$(foreach f,$o,$(call cfile,$f))

View File

@@ -5,8 +5,8 @@ $(eval g := $(OBJDIR)/$D/dmach.c $(OBJDIR)/$D/intable.c)
$(wordlist 2, $(words $g), $g): $(firstword $g)
$(firstword $g): $(util-ack-mktables)
@echo MKTABLES
@mkdir -p $(dir $g)
$(hide) cd $(dir $g) && $(util-ack-mktables) $(INSDIR)/share
@mkdir -p $(OBJDIR)/$D
$(hide) cd $(OBJDIR)/$D && $(util-ack-mktables) $(INSDIR)/share
$(eval CLEANABLES += $g)
endef

View File

@@ -70,7 +70,7 @@ show(headp)
/*
* We get all struct outname's and the strings in core first.
*/
name = (struct outname *) myalloc(headp->oh_nname * SZ_NAME);
name = (struct outname *) myalloc(headp->oh_nname * sizeof(struct outname));
string = myalloc((unsigned) headp->oh_nchar);
rd_name(name, headp->oh_nname);
for (np = &name[0]; np < &name[headp->oh_nname]; np++) {