From 38a8aecfb882072900434499696b5c32a2274515 Mon Sep 17 00:00:00 2001 From: Rong Xu Date: Mon, 21 Jul 2014 16:47:22 -0700 Subject: [4.9] Switch gcc-4.9 to use google/gcc-4_9 branch. This source drop uses svn version r212828 of google/gcc-4.9 branch. We also cherry-picked r213062, r213063 and r213064 to fix windows build issues. All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9. The following prior commits has not been merged to google branch yet. (They are included in this commit). e7af147f979e657fe2df00808e5b4319b0e088c6, baf87df3cb2683649ba7e9872362a7e721117c23, and c231900e5dcc14d8296bd9f62b45997a49d4d5e7. Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b --- gcc-4.9/gcc/go/gofrontend/lex.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc-4.9/gcc/go/gofrontend') diff --git a/gcc-4.9/gcc/go/gofrontend/lex.cc b/gcc-4.9/gcc/go/gofrontend/lex.cc index 161696347..3404cedb5 100644 --- a/gcc-4.9/gcc/go/gofrontend/lex.cc +++ b/gcc-4.9/gcc/go/gofrontend/lex.cc @@ -598,7 +598,7 @@ Lex::next_token() } else if (p[1] == '*') { - this->lineoff_ = p - this->linebuf_; + this->lineoff_ = p + 2 - this->linebuf_; Location location = this->location(); if (!this->skip_c_comment()) return Token::make_invalid_token(location); -- cgit v1.2.3