d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge fixes from trunk.

Browse source 
--HG--
branch : dtrg-videocore
This commit is contained in:
David Given 2013-05-17 15:28:04 +01:00
parent 32ebc502c8 9a513e8ef3
commit 5b4aa07dee
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
first/core.mk
View file

@ -93,7 +93,7 @@ endef
# --- ACK library linking # --- ACK library linking
define acklibrary-rule define acklibrary-rule
$o: $s $(ACKAR) $o: $s $(AAL)
@echo ACKLIBRARY $o @echo ACKLIBRARY $o
@mkdir -p $(dir $o) @mkdir -p $(dir $o)
@$(RM) $o @$(RM) $o

1
lang/m2/comp/defmodule.c
View file

@ -12,6 +12,7 @@
#include "parameters.h" #include "parameters.h"
#include "debug.h" #include "debug.h"
#include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <em_arith.h> #include <em_arith.h>
#include <em_label.h> #include <em_label.h>

4
mach/proto/as/build.mk
View file

@ -25,7 +25,9 @@ define build-as-impl
$(call yacc, $(OBJDIR)/$D, $(OBJDIR)/$D/preprocessed-comm2.y) $(call yacc, $(OBJDIR)/$D, $(OBJDIR)/$D/preprocessed-comm2.y)
$(eval CLEANABLES += $(OBJDIR)/$D/preprocessed-comm2.y) $(eval CLEANABLES += $(OBJDIR)/$D/preprocessed-comm2.y)
$(OBJDIR)/$D/preprocessed-comm2.y: mach/proto/as/comm2.y $(CPPANSI) $(OBJDIR)/$D/preprocessed-comm2.y: mach/proto/as/comm2.y $(CPPANSI) \
mach/$(ARCH)/as/mach2.c \
mach/$(ARCH)/as/mach4.c
@echo PREPROCESS $$@ @echo PREPROCESS $$@
@mkdir -p $$(dir $$@) @mkdir -p $$(dir $$@)
$(hide) $(CPPANSI) -P \ $(hide) $(CPPANSI) -P \