7438 intermittent build failures from the new boot loader

Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@omniti.com>

9 files changed, 41 insertions, 12 deletions

diff --git a/usr/src/boot/sys/boot/efi/boot1/Makefile b/usr/src/boot/sys/boot/efi/boot1/Makefile
index 01d8d95fdc..634fd5c630 100644
--- a/usr/src/boot/sys/boot/efi/boot1/Makefile
+++ b/usr/src/boot/sys/boot/efi/boot1/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
@@ -66,7 +67,8 @@ LDFLAGS=	-nostdlib --eh-frame-hdr -znocombreloc
 LDFLAGS +=	-shared --hash-style=both --enable-new-dtags
 LDFLAGS +=	-T${LDSCRIPT} -Bsymbolic
 
-all: machine x86 boot1.efi
+all: boot1.efi
+
 install: all $(ROOTBOOTFILES)
 
 #
@@ -110,6 +112,8 @@ x86:
 	$(RM) x86
 	$(SYMLINK) ./../../../x86/include x86
 
+$(OBJS): machine x86
+
 clean clobber:
 	$(RM) $(CLEANFILES) $(OBJS)
 
diff --git a/usr/src/boot/sys/boot/efi/libefi/Makefile b/usr/src/boot/sys/boot/efi/libefi/Makefile
index 38a544f743..802f6ff91b 100644
--- a/usr/src/boot/sys/boot/efi/libefi/Makefile
+++ b/usr/src/boot/sys/boot/efi/libefi/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2015 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
@@ -19,7 +20,8 @@ CC=     $(GCC_ROOT)/bin/gcc
 
 LIB=	efi
 
-all:	machine x86 lib$(LIB).a
+all:	lib$(LIB).a
+
 install:
 
 SRCS=	delay.c efi_console.c efinet.c efipart.c errno.c handles.c \
@@ -66,3 +68,5 @@ machine:
 x86:
 	$(RM) x86
 	$(SYMLINK) ../../../x86/include x86
+
+$(OBJS): machine x86
diff --git a/usr/src/boot/sys/boot/efi/loader/Makefile b/usr/src/boot/sys/boot/efi/loader/Makefile
index 5824a84ada..6692f1a938 100644
--- a/usr/src/boot/sys/boot/efi/loader/Makefile
+++ b/usr/src/boot/sys/boot/efi/loader/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
@@ -88,7 +89,8 @@ CLEANFILES=	vers.c loader.efi
 
 NEWVERSWHAT=	"EFI loader" ${MACHINE}
 
-all: machine x86 loader.efi
+all: loader.efi
+
 install: all $(ROOTBOOTFILES)
 
 vers.c:	../../common/newvers.sh ../../efi/loader/version
@@ -117,8 +119,6 @@ LDADD=		${LIBFICL} ${LIBZFSBOOT} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} \
 loader.sym:	$(OBJS) $(DPADD)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LDADD)
 
-beforedepend ${OBJS}: machine
-
 CLEANFILES +=   machine x86
 
 machine:
@@ -129,6 +129,8 @@ x86:
 	$(RM) x86
 	$(SYMLINK) ../../../x86/include x86
 
+$(OBJS): machine x86
+
 clean clobber:
 	$(RM) $(CLEANFILES) $(OBJS) loader.sym loader.efi
 
diff --git a/usr/src/boot/sys/boot/ficl/Makefile.inc b/usr/src/boot/sys/boot/ficl/Makefile.inc
index 37a3cc45af..dbf6508754 100644
--- a/usr/src/boot/sys/boot/ficl/Makefile.inc
+++ b/usr/src/boot/sys/boot/ficl/Makefile.inc
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 
@@ -36,7 +37,7 @@ HEADERS= $(FICLDIR)/ficl.h $(FICLDIR)/ficlplatform/unix.h ../ficllocal.h
 MAJOR = 4
 MINOR = 1.0
 
-lib: machine x86 libficl.a
+lib: libficl.a
 
 # static library build
 libficl.a: $(OBJECTS)
@@ -50,6 +51,8 @@ x86:
 	$(RM) x86
 	$(SYMLINK) ../../../x86/include x86
 
+$(OBJECTS): machine x86
+
 %.o:	../softcore/%.c $(HEADERS)
 	$(COMPILE.c) $<
 
diff --git a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile b/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
index 6147c3a947..5d4f0311bd 100644
--- a/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
+++ b/usr/src/boot/sys/boot/i386/gptzfsboot/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2015 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 #
@@ -73,7 +74,7 @@ include ../Makefile.inc
 
 .PARALLEL:
 
-all: machine x86 $(PROG)
+all: $(PROG)
 
 install: all $(ROOTBOOTPROG)
 
@@ -112,6 +113,8 @@ x86:
 	$(RM) x86
 	$(SYMLINK) ../../../x86/include x86
 
+$(OBJS): machine x86
+
 %.o:	../common/%.c
 	$(COMPILE.c) -o $@ $<
 
diff --git a/usr/src/boot/sys/boot/i386/libi386/Makefile b/usr/src/boot/sys/boot/i386/libi386/Makefile
index f3780e856e..b16250658d 100644
--- a/usr/src/boot/sys/boot/i386/libi386/Makefile
+++ b/usr/src/boot/sys/boot/i386/libi386/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2015 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
@@ -19,7 +20,7 @@ CFLAGS= -O2 -I../../../../include -I../../..
 CFLAGS += -DLOADER_ZFS_SUPPORT
 CPPFLAGS=
 
-all: machine x86 libi386.a
+all: libi386.a
 
 clean: clobber
 clobber:
@@ -105,7 +106,9 @@ x86:
 	$(RM) x86
 	$(SYMLINK) ../../../x86/include x86
 
-libi386.a: machine $(OBJS)
+$(OBJS): machine x86
+
+libi386.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
 
 %.o:	$(LIBZFS)/%.c
diff --git a/usr/src/boot/sys/boot/i386/loader/Makefile b/usr/src/boot/sys/boot/i386/loader/Makefile
index bf8ed9f9b4..1b7ba9db50 100644
--- a/usr/src/boot/sys/boot/i386/loader/Makefile
+++ b/usr/src/boot/sys/boot/i386/loader/Makefile
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2015 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
@@ -42,7 +43,7 @@ ROOTBOOTFORTH=$(FORTH:%=$(ROOT_BOOT_FORTH)/%)
 ROOTBOOTDEFAULTS=$(DEFFILES:%=$(ROOT_BOOT_DEFAULTS)/%)
 FILEMODE=0444
 
-all: machine x86 ${LOADER} loader.help
+all: ${LOADER} loader.help
 
 install: all $(ROOTBOOTLOADER)
 
@@ -145,6 +146,8 @@ x86:
 
 OBJS=		$(SRCS:%.c=%.o)
 
+${OBJS}: machine x86
+
 ${PROG}: ${OBJS} $(LDADD)
 	$(LD) $(LDFLAGS) -o $@ $(BTXCRT) $(OBJS) $(LDADD)
 
diff --git a/usr/src/boot/sys/boot/libstand/Makefile.com b/usr/src/boot/sys/boot/libstand/Makefile.com
index 73c0538dbd..53a8c91b7c 100644
--- a/usr/src/boot/sys/boot/libstand/Makefile.com
+++ b/usr/src/boot/sys/boot/libstand/Makefile.com
@@ -11,6 +11,7 @@
 
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
@@ -21,7 +22,7 @@ CC=	$(GCC_ROOT)/bin/gcc
 
 LIBRARY=	libstand.a
 
-all install: machine x86 $(LIBRARY)
+all install: $(LIBRARY)
 
 LIB_BASE=	$(SRC)/boot/lib
 LIBSTAND_SRC=	$(LIB_BASE)/libstand
@@ -54,6 +55,8 @@ x86:
 	$(RM) x86
 	$(SYMLINK) ../../../x86/include x86
 
+$(OBJS): machine x86
+
 %.o:	$(LIBSTAND_SRC)/%.c
 	$(COMPILE.c) $<
 
diff --git a/usr/src/boot/sys/boot/zfs/Makefile.com b/usr/src/boot/sys/boot/zfs/Makefile.com
index bb11ab91d6..9873feb785 100644
--- a/usr/src/boot/sys/boot/zfs/Makefile.com
+++ b/usr/src/boot/sys/boot/zfs/Makefile.com
@@ -11,13 +11,15 @@
 
 #
 # Copyright 2016 Toomas Soome <tsoome@me.com>
+# Copyright 2016 RackTop Systems.
 #
 
 include $(SRC)/Makefile.master
 
 LIB=		zfsboot
 
-all: machine x86 libzfsboot.a
+all: libzfsboot.a
+
 clean: clobber
 
 clobber:
@@ -49,6 +51,8 @@ x86:
 	$(RM) x86
 	$(SYMLINK) ../../../x86/include x86
 
+$(OBJS): machine x86
+
 libzfsboot.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)