aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-11-01 21:45:32 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-11-01 21:45:32 +0000
commit307dde6fcc0fdf813087212705f84370b1a2305b (patch)
tree46b49077867f7a5a409b0ff49e1b767e1ff34a82 /gcc
parent5b7c051940e69046151e3094b56f1b13e873840e (diff)
downloadgcc-307dde6fcc0fdf813087212705f84370b1a2305b.zip
gcc-307dde6fcc0fdf813087212705f84370b1a2305b.tar.gz
gcc-307dde6fcc0fdf813087212705f84370b1a2305b.tar.bz2
libgo: fix GOARCH_PHYSPAGESIZE for ia64
From Andreas Schwab. Reviewed-on: https://go-review.googlesource.com/32537 From-SVN: r241757
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 db435a2..7868369 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-069ed35ecbefd2f138ea3132a557ad23a6936a45
+150bca67d8bb4b23009f53ba06e85e306e3960d8
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.