sync with original

NEWS

@@ -32,6 +32,11 @@ support for X86/macOS 10.13 and AMD64/macOS 10.13.
 * Cachegrind:
 
 * Callgrind:
+ - The command option --collect-systime has been enhanced to specify
+ the unit used to record the elapsed time spent during system calls.
+ The command option now accepts the values no|yes|msec|usec|nsec,
+ where yes is a synonym of msec. When giving the value nsec, the
+ system cpu time of system calls is also recorded.
 
 * Massif:
 
@@ -77,6 +82,8 @@ where XXXXXX is the bug number as listed below.
 409367 exit_group() after signal to thread waiting in futex() causes hangs
 410599 Non-deterministic behaviour of pth_self_kill_15_other test
 411134 Allow the user to change a set of command line options during execution
+412344 Problem setting mips flags with specific paths
+413603 callgrind_annotate/cg_annotate truncate function names at '#'
 
 n-i-bz Fix minor one time leaks in dhat.
 n-i-bz Add --run-cxx-freeres=no in outer args to avoid inner crashes.

cachegrind/cg_annotate.in

@@ -398,7 +398,9 @@ sub read_input_file()
 
  # Read body of input file.
  while (<INPUTFILE>) {
- s/#.*$//; # remove comments
+ # Skip comments and empty lines.
+ next if /^\s*$/ || /^\#/;
+
  if (s/^(-?\d+)\s+//) {
  my $lineNum = $1;
  my $CC = line_to_CC($_);
@@ -436,9 +438,6 @@ sub read_input_file()
  # Assume that a "fn=" line is followed by a "fl=" line.
  $currFileFuncName = undef;
 
- } elsif (s/^\s*$//) {
- # blank, do nothing
-
  } elsif (s/^summary:\s+//) {
  $summary_CC = line_to_CC($_);
  (scalar(@$summary_CC) == @events)