From d2c4425e86310d44aa8e9f9d91b49e2e61237ef2 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 14 Oct 2016 17:16:55 +0000 Subject: debug/elf: add sparc64 relocations This is a backport of https://go-review.googlesource.com/30870. Reviewed-on: https://go-review.googlesource.com/30916 From-SVN: r241171 --- gcc/go/gofrontend/MERGE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 769defc..cadd8ec 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -5f043fc2bf0f92a84a1f7da57acd79a61c9d2592 +911fceabd4c955b2f29f6b532f241a002ca7ad4f The first line of this file holds the git revision number of the last merge done from the gofrontend repository. -- cgit v1.1