aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorClément Chigot <clement.chigot@atos.net>2020-08-07 14:45:34 +0200
committerIan Lance Taylor <iant@golang.org>2020-08-12 11:33:54 -0700
commitd040555a0611bd47cb5878443bbb5097e4259d82 (patch)
tree7cbe287c97f3a5240c787d4fa311f0843e93ac56 /gcc/go
parentd58f078ce2d53e5dab6b3d0d5f960504268e1894 (diff)
downloadgcc-d040555a0611bd47cb5878443bbb5097e4259d82.zip
gcc-d040555a0611bd47cb5878443bbb5097e4259d82.tar.gz
gcc-d040555a0611bd47cb5878443bbb5097e4259d82.tar.bz2
libgo: correctly handle AIX FAT library creation
The previous patch wasn't working everytime. Especially when AR had "-X32_64", the new .so would replace the default one and not just being added. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/247377
Diffstat (limited to 'gcc/go')
-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 08daa1a..e443282 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-e08f1d7d1bc14c0a29eb9ee17980f14fa2397239
+fe5d94c5792f7f990004c3dee0ea501835512200
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.