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>

          --- old/usr/src/boot/sys/boot/i386/libi386/Makefile
          +++ new/usr/src/boot/sys/boot/i386/libi386/Makefile

   1    1  #
   2    2  # This file and its contents are supplied under the terms of the
   3    3  # Common Development and Distribution License ("CDDL"), version 1.0.

   4    4  # You may only use this file in accordance with the terms of version
   5    5  # 1.0 of the CDDL.
   6    6  #
   7    7  # A full copy of the text of the CDDL should have accompanied this
   8    8  # source.  A copy of the CDDL is also available via the Internet at
   9    9  # http://www.illumos.org/license/CDDL.
  10   10  #
  11   11  
  12   12  #
  13   13  # Copyright 2015 Toomas Soome <tsoome@me.com>
       14 +# Copyright 2016 RackTop Systems.
  14   15  #
  15   16  
  16   17  include $(SRC)/Makefile.master
  17   18  
  18   19  CFLAGS= -O2 -I../../../../include -I../../..
  19   20  CFLAGS += -DLOADER_ZFS_SUPPORT
  20   21  CPPFLAGS=
  21   22  
  22      -all: machine x86 libi386.a
       23 +all: libi386.a
  23   24  
  24   25  clean: clobber
  25   26  clobber:
  26   27          $(RM) machine x86 $(OBJS) libi386.a
  27   28  
  28   29  AS=     $(GNU_ROOT)/bin/gas
  29   30  CC=     $(GCC_ROOT)/bin/gcc
  30   31  OBJCOPY= $(GNU_ROOT)/bin/gobjcopy
  31   32  AS_FLAGS=--32
  32   33  ASFLAGS=-m32

  33   34  AS_CPPFLAGS=
  34   35  COMPILE.s  = $(AS) $(AS_FLAGS)
  35   36  
  36   37  SRCS=   biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
  37   38          biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \
  38   39          comconsole.c devicename.c elf32_freebsd.c \
  39   40          elf64_freebsd.c multiboot.c multiboot_tramp.S \
  40   41          i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
  41   42          smbios.c time.c vidconsole.c amd64_tramp.S spinconsole.c linux.c \
  42   43          relocater_tramp.S
  43   44  OBJS=   biosacpi.o bioscd.o biosdisk.o biosmem.o biospnp.o \
  44   45          biospci.o biossmap.o bootinfo.o bootinfo32.o bootinfo64.o \
  45   46          comconsole.o devicename.o elf32_freebsd.o \
  46   47          elf64_freebsd.o multiboot.o multiboot_tramp.o \
  47   48          i386_copy.o i386_module.o nullconsole.o pxe.o pxetramp.o \
  48   49          smbios.o time.o vidconsole.o amd64_tramp.o spinconsole.o linux.o \
  49   50          relocater_tramp.o
  50   51  
  51   52  LIBZFS=  ../../zfs
  52   53  SRCS += $(LIBZFS)/devicename_stubs.c
  53   54  OBJS += devicename_stubs.o
  54   55  
  55   56  # Enable PXE TFTP or NFS support, not both.
  56   57  CFLAGS +=       -DLOADER_TFTP_SUPPORT
  57   58  
  58   59  BOOT_COMCONSOLE_PORT= 0x3f8
  59   60  CFLAGS +=       -DCOMPORT=${BOOT_COMCONSOLE_PORT}
  60   61  
  61   62  BOOT_COMCONSOLE_SPEED= 9600
  62   63  CFLAGS +=       -DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
  63   64  
  64   65  # Make the disk code more talkative
  65   66  # CFLAGS+= -DDISK_DEBUG
  66   67  
  67   68  # Export serial numbers, UUID, and asset tag from loader.
  68   69  CFLAGS += -DSMBIOS_SERIAL_NUMBERS
  69   70  # Use little-endian UUID format as defined in SMBIOS 2.6.
  70   71  CFLAGS += -DSMBIOS_LITTLE_ENDIAN_UUID
  71   72  # Use network-endian UUID format for backward compatibility.
  72   73  #CFLAGS += -DSMBIOS_NETWORK_ENDIAN_UUID
  73   74  
  74   75  # Include simple terminal emulation (cons25-compatible)
  75   76  CFLAGS += -DTERM_EMU
  76   77  
  77   78  # XXX: make alloca() useable
  78   79  CFLAGS += -Dalloca=__builtin_alloca
  79   80  
  80   81  CFLAGS +=       -I../../common -I../common \
  81   82                  -I../btx/lib \
  82   83                  -I../../../contrib/dev/acpica/include \
  83   84                  -I../../.. -I.
  84   85  # the location of libstand
  85   86  CFLAGS +=       -I../../../../lib/libstand/
  86   87  
  87   88  # Handle FreeBSD specific %b and %D printf format specifiers
  88   89  #FORMAT_EXTENSIONS=-D__printf__=__freebsd_kprintf__
  89   90  #CFLAGS += ${FORMAT_EXTENSIONS}
  90   91  
  91   92  CLEANFILES +=   machine x86
  92   93  
  93   94  # XXX: clang integrated-as doesn't grok .codeNN directives yet
  94   95  # CFLAGS.amd64_tramp.S= ${CLANG_NO_IAS}
  95   96  # CFLAGS.multiboot_tramp.S=     ${CLANG_NO_IAS}
  96   97  # CFLAGS +=             ${CFLAGS.${.IMPSRC:T}}
  97   98  

  98   99  include ../Makefile.inc
  99  100  
 100  101  machine:
 101  102          $(RM) machine
 102  103          $(SYMLINK) ../../../i386/include machine
 103  104  
 104  105  x86:
 105  106          $(RM) x86
 106  107          $(SYMLINK) ../../../x86/include x86
 107  108  
 108      -libi386.a: machine $(OBJS)
      109 +$(OBJS): machine x86
      110 +
      111 +libi386.a: $(OBJS)
 109  112          $(AR) $(ARFLAGS) $@ $(OBJS)
 110  113  
 111  114  %.o:    $(LIBZFS)/%.c
 112  115          $(COMPILE.c) -o $@ $<
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX