Merge fixes from trunk.

--HG--
branch : dtrg-videocore

first/core.mk

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

lang/m2/comp/defmodule.c

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

mach/proto/as/build.mk

@@ -25,7 +25,9 @@ define build-as-impl
 	$(call yacc, $(OBJDIR)/$D, $(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 $$@
 	@mkdir -p $$(dir $$@)
 	$(hide) $(CPPANSI) -P \