Added support for Pin-2.14 and PinPlay-1.4.

jieyu · Sep 22, 2014 · be11a0d · be11a0d
1 parent 1a210b2
commit be11a0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -121,8 +121,8 @@ $(pincxxobjs): $(builddir)%.o : $(srcdir)%.cpp
 	@$(pincxxgendepend);
 	$(CXX) $(CXXFLAGS) $(TOOL_INCLUDES) $(TOOL_CXXFLAGS) $(INCS) $(COMP_OBJ)$@ $<
 
-$(pintools): $(builddir)%.so : $$(%_objs)
-	$(LINKER) $(TOOL_LDFLAGS) $(LINK_DEBUG) ${LINK_EXE}$@ $^ ${TOOL_LPATHS} $(TOOL_LIBS) $(DBG)
+$(pintools): $(builddir)%.so : $$(%_objs) $(CONTROLLER_LIB)
+	$(LINKER) $(TOOL_LDFLAGS) $(LINK_DEBUG) ${LINK_EXE}$@ $^ ${TOOL_LPATHS} $(TOOL_LIBS) $(CONTROLLER_LIB) $(DBG)
 
 $(cmdtools): $(builddir)% : $$(%_objs)
 	$(CXX) $(LDFLAGS) -o $@ $^ $(LPATHS) $(LIBS)

diff --git a/pin.mk b/pin.mk
@@ -24,4 +24,10 @@ ifneq ($(wildcard $(PIN_HOME)/extras/pinplay),)
 
   # PinPlay library must be loaded fist.
   TOOL_LIBS := -lpinplay -lbz2 -lz $(TOOL_LIBS)
+
+  # Controller library (Pin-2.14).
+  CONTROLLER_LIB := $(CONTROLLERLIB)
 endif
+
+$(CONTROLLERLIB):
+	$(MAKE) -C $(TOOLS_ROOT)/InstLib dir $(OBJDIR)controller$(LIB_SUFFIX)