diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-03-19 14:00:59 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-03-19 14:00:59 +0000 |
| commit | 9195aa172bbc20627f23bfb1612180c83a0a7bab (patch) | |
| tree | e42ecb2ffbddc6bf438c711494028bc3b86f527c /gcc | |
| parent | 3b595ecaeda647070c6c4ede0c09be78dfc4f763 (diff) | |
| download | gcc-9195aa172bbc20627f23bfb1612180c83a0a7bab.zip gcc-9195aa172bbc20627f23bfb1612180c83a0a7bab.tar.gz gcc-9195aa172bbc20627f23bfb1612180c83a0a7bab.tar.bz2 | |
libgo: fix build on AIX
Since aix/ppc64 has been added to GC toolchain, a mix between new and
old files were created in gcc toolchain.
This commit corrects this merge for aix/ppc64 and aix/ppc.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/167658
From-SVN: r269797
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index a09733f..006da8c 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -87945b620b2100d33e27f33e6276a4e4e5890659 +069afe85f38c099660c5d81950d65248ed4fc516 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. |