Print this page
7438 intermittent build failures from the new boot loader
Reviewed by: Juraj Lutter <juraj.lutter@erigones.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Split |
Close |
Expand all |
Collapse all |
--- 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.
↓ open down ↓ |
3 lines elided |
↑ open up ↑ |
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
24 +
25 +libi386.a: machine x86
26 +
27 +install: all
23 28
24 29 clean: clobber
25 30 clobber:
26 31 $(RM) machine x86 $(OBJS) libi386.a
27 32
28 33 AS= $(GNU_ROOT)/bin/gas
29 34 CC= $(GCC_ROOT)/bin/gcc
30 35 OBJCOPY= $(GNU_ROOT)/bin/gobjcopy
31 36 AS_FLAGS=--32
32 37 ASFLAGS=-m32
33 38 AS_CPPFLAGS=
34 39 COMPILE.s = $(AS) $(AS_FLAGS)
35 40
36 41 SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
37 42 biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \
38 43 comconsole.c devicename.c elf32_freebsd.c \
39 44 elf64_freebsd.c multiboot.c multiboot_tramp.S \
40 45 i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
41 46 smbios.c time.c vidconsole.c amd64_tramp.S spinconsole.c linux.c \
42 47 relocater_tramp.S
43 48 OBJS= biosacpi.o bioscd.o biosdisk.o biosmem.o biospnp.o \
44 49 biospci.o biossmap.o bootinfo.o bootinfo32.o bootinfo64.o \
45 50 comconsole.o devicename.o elf32_freebsd.o \
46 51 elf64_freebsd.o multiboot.o multiboot_tramp.o \
47 52 i386_copy.o i386_module.o nullconsole.o pxe.o pxetramp.o \
48 53 smbios.o time.o vidconsole.o amd64_tramp.o spinconsole.o linux.o \
49 54 relocater_tramp.o
50 55
51 56 LIBZFS= ../../zfs
52 57 SRCS += $(LIBZFS)/devicename_stubs.c
53 58 OBJS += devicename_stubs.o
54 59
55 60 # Enable PXE TFTP or NFS support, not both.
56 61 CFLAGS += -DLOADER_TFTP_SUPPORT
57 62
58 63 BOOT_COMCONSOLE_PORT= 0x3f8
59 64 CFLAGS += -DCOMPORT=${BOOT_COMCONSOLE_PORT}
60 65
61 66 BOOT_COMCONSOLE_SPEED= 9600
62 67 CFLAGS += -DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
63 68
64 69 # Make the disk code more talkative
65 70 # CFLAGS+= -DDISK_DEBUG
66 71
67 72 # Export serial numbers, UUID, and asset tag from loader.
68 73 CFLAGS += -DSMBIOS_SERIAL_NUMBERS
69 74 # Use little-endian UUID format as defined in SMBIOS 2.6.
70 75 CFLAGS += -DSMBIOS_LITTLE_ENDIAN_UUID
71 76 # Use network-endian UUID format for backward compatibility.
72 77 #CFLAGS += -DSMBIOS_NETWORK_ENDIAN_UUID
73 78
74 79 # Include simple terminal emulation (cons25-compatible)
75 80 CFLAGS += -DTERM_EMU
76 81
77 82 # XXX: make alloca() useable
78 83 CFLAGS += -Dalloca=__builtin_alloca
79 84
80 85 CFLAGS += -I../../common -I../common \
81 86 -I../btx/lib \
82 87 -I../../../contrib/dev/acpica/include \
83 88 -I../../.. -I.
84 89 # the location of libstand
85 90 CFLAGS += -I../../../../lib/libstand/
86 91
87 92 # Handle FreeBSD specific %b and %D printf format specifiers
88 93 #FORMAT_EXTENSIONS=-D__printf__=__freebsd_kprintf__
89 94 #CFLAGS += ${FORMAT_EXTENSIONS}
90 95
91 96 CLEANFILES += machine x86
92 97
93 98 # XXX: clang integrated-as doesn't grok .codeNN directives yet
94 99 # CFLAGS.amd64_tramp.S= ${CLANG_NO_IAS}
95 100 # CFLAGS.multiboot_tramp.S= ${CLANG_NO_IAS}
96 101 # CFLAGS += ${CFLAGS.${.IMPSRC:T}}
97 102
98 103 include ../Makefile.inc
99 104
100 105 machine:
101 106 $(RM) machine
102 107 $(SYMLINK) ../../../i386/include machine
103 108
104 109 x86:
105 110 $(RM) x86
106 111 $(SYMLINK) ../../../x86/include x86
107 112
108 113 libi386.a: machine $(OBJS)
109 114 $(AR) $(ARFLAGS) $@ $(OBJS)
110 115
111 116 %.o: $(LIBZFS)/%.c
112 117 $(COMPILE.c) -o $@ $<
↓ open down ↓ |
80 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX