aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-07-18 23:14:29 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-07-18 23:14:29 +0000
commit9e45ca5f83954a340cc78c2f86b7b3294188047f (patch)
tree127c7047f2588027e80a69215a4ce7e2adb7b509 /gcc
parentab86687fee4024af20d852e26fbb743de05d0efe (diff)
downloadgcc-9e45ca5f83954a340cc78c2f86b7b3294188047f.zip
gcc-9e45ca5f83954a340cc78c2f86b7b3294188047f.tar.gz
gcc-9e45ca5f83954a340cc78c2f86b7b3294188047f.tar.bz2
re PR go/81451 (missing futex check - libgo/runtime/thread-linux.c:12:0 futex.h:13:12: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘long’)
PR go/81451 runtime: inline runtime_osinit We had two identical copies of runtime_osinit. They set runtime_ncpu, a variable that is no longer used. Removing that leaves us with two lines. Inline those two lines in the two places the function was called. This fixes GCC PR 81451. Reviewed-on: https://go-review.googlesource.com/48862 From-SVN: r250326
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index cc71379..0b110e0 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-0036bd04d077f8bbe5aa9a62fb8830c53068209e
+c49ddc84f3ce89310585aad23ab6e51ef5523748
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.