Merge pull request #2839 from luser/jit-crash-categorize

bug 1171937 - import jit-crash-categorize code
mozilla-services · Jun 8, 2015 · f6600e4 · f6600e4
2 parents 8ff508c + 5e3baf7
commit f6600e4
Show file tree

Hide file tree

Showing 3 changed files with 380 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ minidump-stackwalk/*.o
 minidump-stackwalk/stackwalker
 minidump-stackwalk/dumplookup
 minidump-stackwalk/get-minidump-instructions
+minidump-stackwalk/jit-crash-categorize
 socorro.egg-info/
 dist/
 socorro-*.rpm

diff --git a/minidump-stackwalk/Makefile b/minidump-stackwalk/Makefile
@@ -9,7 +9,12 @@ JSON_DIR := jsoncpp-src-0.5.0
 JSON_SRCDIR := $(JSON_DIR)/src/lib_json
 JSON_INCLUDEDIR := $(JSON_DIR)/include
 
-BINS := stackwalker dumplookup get-minidump-instructions
+BINS := \
+  stackwalker \
+  dumplookup \
+  get-minidump-instructions \
+  jit-crash-categorize \
+  $(NULL)
 
 all: $(BINS)
 
@@ -40,7 +45,7 @@ LIBS := $(CURL_LIBS)
 
 .SECONDEXPANSION:
 $(BINS): %: %.cc $(BREAKPAD_LIBS) $(EXTRA_OBJS) $$($$*_OBJS)
-	$(CXX) $(CXXFLAGS) -o $@ $< $(BREAKPAD_LIBS) $(EXTRA_OBJS) $($*_OBJS) $(LIBS)
+	$(CXX) $(CXXFLAGS) -o $@ $< $(EXTRA_OBJS) $(BREAKPAD_LIBS) $($*_OBJS) $(LIBS)
 
 clean:
 	$(RM) $(BINS) *.o