--- a/hotspot/make/gensrc/Gensrc-jdk.vm.ci.gmk	Fri Oct 16 16:53:02 2015 +0200
+++ b/hotspot/make/gensrc/Gensrc-jdk.vm.ci.gmk	Tue Oct 20 13:36:20 2015 +0000
@@ -108,7 +108,11 @@
 	($(CD) $(GENSRC_DIR)/META-INF/jvmci.providers && \
 	    for i in $$($(LS)); do \
 	      c=$$($(CAT) $$i | $(TR) -d '\n\r'); \
-	      $(ECHO) $$i >> $(GENSRC_DIR)/META-INF/services/$$c; \
+	      $(ECHO) $$i >> $(GENSRC_DIR)/META-INF/services/$$c.tmp; \
+	    done)
+	($(CD) $(GENSRC_DIR)/META-INF/services && \
+	    for i in $$($(LS) *.tmp); do \
+	      $(MV) $$i $${i%.tmp}; \
 	    done)
 	$(TOUCH) $@