diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dcd3d26157f..e52e7cf2054 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-17  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* config/nvptx/mkoffload.c (parse_file): Fix logic error in
+	skipping of "strange" tokens.
+
 2015-02-17  Jeff Law  <law@redhat.com>
 
 	* tree-vrp.c (identify_jump_threads): Use last_stmt.  Remove
diff --git a/gcc/config/nvptx/mkoffload.c b/gcc/config/nvptx/mkoffload.c
index 739aee8af85..96341b8bc4d 100644
--- a/gcc/config/nvptx/mkoffload.c
+++ b/gcc/config/nvptx/mkoffload.c
@@ -755,8 +755,9 @@ parse_file (Token *tok)
       if (comment)
 	append_stmt (&fns, comment);
 
-      while (tok->kind && !tok->end)
+      do
 	tok++;
+      while (tok->kind && !tok->end);
     }
   return tok;
 }