Print this page
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>
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/boot/sys/boot/ficl/Makefile.inc
+++ new/usr/src/boot/sys/boot/ficl/Makefile.inc
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 2016 Toomas Soome <tsoome@me.com>
14 +# Copyright 2016 RackTop Systems.
14 15 #
15 16
16 17
17 18 CC= $(GCC_ROOT)/bin/gcc
18 19 FICLDIR= $(SRC)/common/ficl
19 20
20 21 all: lib
21 22
22 23 CPPFLAGS= -DSTAND -I. -I.. -I../../../../include -I../../../../lib/libstand
23 24 CPPFLAGS += -I../../.. -I$(FICLDIR) -I../../common
24 25 CFLAGS= -O2 -Wall -nostdinc
25 26
26 27 CFLAGS += -ffreestanding
27 28 CFLAGS += -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -msoft-float
28 29 CFLAGS += -std=gnu99
↓ open down ↓ |
5 lines elided |
↑ open up ↑ |
29 30
30 31 OBJECTS= dictionary.o system.o fileaccess.o float.o double.o prefix.o search.o
31 32 OBJECTS += softcore.o stack.o tools.o vm.o primitives.o unix.o utility.o
32 33 OBJECTS += hash.o callback.o word.o loader.o
33 34 HEADERS= $(FICLDIR)/ficl.h $(FICLDIR)/ficlplatform/unix.h ../ficllocal.h
34 35 #
35 36
36 37 MAJOR = 4
37 38 MINOR = 1.0
38 39
39 -lib: machine x86 libficl.a
40 +lib: libficl.a
40 41
41 42 # static library build
42 43 libficl.a: $(OBJECTS)
43 44 $(AR) $(ARFLAGS) libficl.a $(OBJECTS)
44 45
45 46 machine:
46 47 $(RM) machine
47 48 $(SYMLINK) ../../../$(MACHINE)/include machine
48 49
49 50 x86:
50 51 $(RM) x86
51 52 $(SYMLINK) ../../../x86/include x86
53 +
54 +$(OBJECTS): machine x86
52 55
53 56 %.o: ../softcore/%.c $(HEADERS)
54 57 $(COMPILE.c) $<
55 58
56 59 %.o: $(FICLDIR)/%.c $(HEADERS)
57 60 $(COMPILE.c) $<
58 61
59 62 %.o: $(FICLDIR)/ficlplatform/%.c $(HEADERS)
60 63 $(COMPILE.c) $<
61 64
62 65 #
63 66 # generic cleanup code
64 67 #
65 68 clobber clean: FRC
66 69 $(RM) *.o *.a libficl.* ficl machine x86
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX