blob: 9b31e7c0d1ba388fe06c894e136bf7fac620b654 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
index 472b275..0c9409d 100644
--- a/sys/boot/i386/Makefile.inc
+++ b/sys/boot/i386/Makefile.inc
@@ -13,8 +13,6 @@ LDFLAGS+= -nostdlib
.if ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -m32
ACFLAGS+= -m32
-# LD_FLAGS is passed directly to ${LD}, not via ${CC}:
-LD_FLAGS+= -m elf_i386_fbsd
AFLAGS+= --32
.endif
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index 428950e..6a15450 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -113,3 +113,10 @@ machine:
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.boot1.S= ${CLANG_NO_IAS}
CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
+
+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build.
+CFLAGS+= -fno-asynchronous-unwind-tables
+
+.if ${MACHINE_CPUARCH} == "amd64"
+LD_FLAGS+= -m elf_i386_fbsd
+.endif
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index a90e712..d60ae00 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -81,3 +81,8 @@ machine:
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.gptldr.S= ${CLANG_NO_IAS}
CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
+
+.if ${MACHINE_CPUARCH} == "amd64"
+LD_FLAGS+= -m elf_i386_fbsd
+.endif
+
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
index 5eb2383..c10a917 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/sys/boot/i386/gptzfsboot/Makefile
@@ -78,3 +78,8 @@ machine:
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.gptldr.S= ${CLANG_NO_IAS}
CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
+
+.if ${MACHINE_CPUARCH} == "amd64"
+LD_FLAGS+= -m elf_i386_fbsd
+.endif
+
diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
index 149f43a..be1e46a 100644
--- a/sys/boot/i386/zfsboot/Makefile
+++ b/sys/boot/i386/zfsboot/Makefile
@@ -91,3 +91,8 @@ machine:
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.zfsldr.S= ${CLANG_NO_IAS}
CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
+
+.if ${MACHINE_CPUARCH} == "amd64"
+LD_FLAGS+= -m elf_i386_fbsd
+.endif
+
|
