diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d5240a91941..4dd1f8c4ead 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9ee8ad540d6f2f77af1821bfd977dc1820e1be8f
+90f12ac1fa72a95e73cb88b6114fa3131c4ca8ee
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 0356de8a71f..edf193a5d40 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -924,7 +924,8 @@ BUILDPACKAGE = \
 # How to build a .gox file from a .lo file.
 BUILDGOX = \
 	f=`echo $< | sed -e 's/.lo$$/.o/'`; \
-	$(OBJCOPY) -j .go_export $$f $@.tmp && mv -f $@.tmp $@
+	$(OBJCOPY) -j .go_export $$f $@.tmp; \
+	$(SHELL) $(srcdir)/mvifdiff.sh $@.tmp `echo $@ | sed -e 's/s-gox/gox/'`
 
 GOTESTFLAGS =
 GOBENCH = 
@@ -1022,8 +1023,10 @@ $(1).lo:
 $(1)/check: $$(CHECK_DEPS)
 	@$$(CHECK)
 .PHONY: $(1)/check
-$(1).gox: $(1).lo
+$(1).gox: $(1).s-gox; @true
+$(1).s-gox: $(1).lo
 	$$(BUILDGOX)
+	$$(STAMP) $$@
 endef
 
 # This line expands PACKAGE_template once for each package name listed
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 140cfdf2aeb..908e66042a5 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1079,7 +1079,8 @@ BUILDPACKAGE = \
 # How to build a .gox file from a .lo file.
 BUILDGOX = \
 	f=`echo $< | sed -e 's/.lo$$/.o/'`; \
-	$(OBJCOPY) -j .go_export $$f $@.tmp && mv -f $@.tmp $@
+	$(OBJCOPY) -j .go_export $$f $@.tmp; \
+	$(SHELL) $(srcdir)/mvifdiff.sh $@.tmp `echo $@ | sed -e 's/s-gox/gox/'`
 
 GOTESTFLAGS = 
 GOBENCH = 
@@ -3366,8 +3367,10 @@ $(1).lo:
 $(1)/check: $$(CHECK_DEPS)
 	@$$(CHECK)
 .PHONY: $(1)/check
-$(1).gox: $(1).lo
+$(1).gox: $(1).s-gox; @true
+$(1).s-gox: $(1).lo
 	$$(BUILDGOX)
+	$$(STAMP) $$@
 endef
 
 # This line expands PACKAGE_template once for each package name listed