aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2015-10-07 17:22:08 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2015-10-07 17:22:08 +0000
commit0786e1fe8688691332e6c4f9aab82956546073c5 (patch)
treedfed1026d5397402b85feef171a5e9c2c1ff4dae /gcc
parent919e06d3f59f9770be5e3968159a46f6c077c9f8 (diff)
downloadgcc-0786e1fe8688691332e6c4f9aab82956546073c5.zip
gcc-0786e1fe8688691332e6c4f9aab82956546073c5.tar.gz
gcc-0786e1fe8688691332e6c4f9aab82956546073c5.tar.bz2
re PR go/67874 (fd_unix.go does not build when there is fcntl64 and no fcntl syscall)
PR go/67874 net, runtime: Call C library fcntl function rather than syscall.Syscall. Not all systems define a fcntl syscall; some only have fcntl64. Fixes GCC PR go/67874. Reviewed-on: https://go-review.googlesource.com/15497 From-SVN: r228576
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 d5d1696..19dcf2a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-3039d79149901d25d89c2412bdd8684f3cbcd09e
+651e71a729e5dcbd9dc14c1b59b6eff05bfe3d26
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.