aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-01-06 01:17:29 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-01-06 01:17:29 +0000
commit319e41dc77e31f3ece720ec37853ffbcc4a0df25 (patch)
tree459103a762a61bfcde0a78934c46f65cb32d4ebc /gcc
parent677202a206f3ada674f27d26fd9b8a1afe0f5ba3 (diff)
downloadgcc-319e41dc77e31f3ece720ec37853ffbcc4a0df25.zip
gcc-319e41dc77e31f3ece720ec37853ffbcc4a0df25.tar.gz
gcc-319e41dc77e31f3ece720ec37853ffbcc4a0df25.tar.bz2
libgo: fix GOARCH_CACHELINESIZE on ia64
Reviewed-on: https://go-review.googlesource.com/85256 From-SVN: r256306
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 3ba3462..b03c3fb 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9b9bece388d1bacdc9d1d0024e722ffe449d221d
+1319f36ccc65cf802b8e17ddd3d2da3ca6d82f4c
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.