Subzero: Include commit count in revision string.

CMakeLists.txt

 unset(PNACL_LLVM)
 # Define PNACL_LLVM for LLVM_VERSION <= 3.7
 if((NOT LLVM_VERSION_MAJOR GREATER 3) AND (NOT LLVM_VERSION_MINOR GREATER 7))
   set(PNACL_LLVM 1)
 endif()
 
 if(PNACL_LLVM)
   add_definitions(
     -DPNACL_LLVM
     )
@@ skipping 34 matching lines @@
   -DALLOW_TIMERS=1
   -DALLOW_MINIMAL_BUILD=0
   -DALLOW_WASM=0
   -DPNACL_BROWSER_TRANSLATOR=0
   )
   add_compile_options(-Wno-undefined-var-template)
 endif()
 
 execute_process(COMMAND git rev-parse HEAD
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  OUTPUT_VARIABLE SUBZERO_REVISION
+  OUTPUT_VARIABLE SZ_GIT_HASH
   OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-add_definitions(-DSUBZERO_REVISION=${SUBZERO_REVISION})
+execute_process(COMMAND git rev-list --count HEAD
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  OUTPUT_VARIABLE SZ_COMMIT_COUNT
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+add_definitions(-DSUBZERO_REVISION=${SZ_COMMIT_COUNT}_${SZ_GIT_HASH})
 
 target_link_libraries(pnacl-sz pthread)