Merge commit 'origin/master' into pr6429-comp-unwindsyms

* commit 'origin/master':
  PR 5955 - Accept ; terminated globals
  Factored returnval() out of returnstr(), for use in dwarfless probing.
  Converted more aliases to use arg numbers instead of names.  In particular,
  Revert "PR6487: extend blacklist with relay/timer subsystem"
  Add syscalls_by_pid.meta, syscalls_by_proc.meta,
  PR6487: extend blacklist with relay/timer subsystem
  Adjust iotime.meta description.
  	* iotime.meta: New.
  Fix for PR 6500.
  Update ChangeLog
  	* sleeptime.meta, wait4time.meta: New.
  systemtap.examples futexes.meta change futex.stp to futexes.stp.
  In ioblock.stp ioblock.end set bytes_done depending on kernel version.
  PR6492: make listing mode warning-free
  PR5648: Fix unaligned access warning in stp_print_flush on ia64
  PR5648: Fix memcpy's endianess issue.
  futexes.meta, nettop.meta, pf2.meta: New.
  Clean up output.

1 files changed, 3 insertions, 0 deletions

diff --git a/parse.cxx b/parse.cxx
index ea22f36d..82116009 100644
--- a/parse.cxx
+++ b/parse.cxx
@@ -1215,6 +1215,9 @@ parser::parse_global (vector <vardecl*>& globals, vector<probe*>&)
 	  t = peek ();
 	}
 
+      if (t && t->type == tok_operator && t->content == ";") // termination
+	  next();
+
       if (t && t->type == tok_operator && t->content == ",") // next global
 	{
 	  next ();