--- a/make/RunTestsPrebuilt.gmk	Wed Dec 06 14:13:50 2017 +0100
+++ b/make/RunTestsPrebuilt.gmk	Wed Dec 06 14:17:44 2017 +0100
@@ -69,7 +69,7 @@
       $1:=$2
     endif
   else
-      ifneq ($$(findstring $$(LOG), info debug trace), )
+    ifneq ($$(findstring $$(LOG), info debug trace), )
       $$(info Prebuilt variable $1=$$($1))
     endif
   endif
@@ -91,8 +91,8 @@
     $(error Internal makefile error: \
       Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \
   ) \
-  $(shell rm -f $1) \
-  $(foreach i, 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25, \
+  $(shell $(RM) $1) \
+  $(foreach i, $(call sequence, 2, 25), \
     $(if $(strip $($i)), \
       $(call AppendFile, $(strip $($i)), $1) \
     ) \
@@ -179,7 +179,7 @@
     OPENJDK_TARGET_CPU := $(UNAME_CPU)
   endif
 else
-  # ... all other user uname -m
+  # ... all others use uname -m
   UNAME_CPU := $(shell $(UNAME) -m)
   ifeq ($(UNAME_CPU), i686)
     OPENJDK_TARGET_CPU := x86