summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-01-09 23:08:56 +0000
committerdim <dim@FreeBSD.org>2014-01-09 23:08:56 +0000
commit01c13c7d48e84e413da6bd014d32c8f5f0787d69 (patch)
tree64c554f66dfcadcb722052a83873055a9d9cabd5 /sys/boot/i386
parent999774a8ef8eaa6132d3de64eebac307c223d29c (diff)
downloadFreeBSD-src-01c13c7d48e84e413da6bd014d32c8f5f0787d69.zip
FreeBSD-src-01c13c7d48e84e413da6bd014d32c8f5f0787d69.tar.gz
MFC r260334:
Split the last gcc-specific flags off into CFLAGS.gcc. This also removes the need to use -Qunused-arguments for clang throughout the tree. MFC r260369: Apply band-aid for 32-bit compat libs failures after r260334: put back -Qunused-arguments for clang for now, until I can figure out a way to make it unneeded in all scenarios. Sorry about the breakage.
Diffstat (limited to 'sys/boot/i386')
-rw-r--r--sys/boot/i386/boot2/Makefile3
-rw-r--r--sys/boot/i386/gptboot/Makefile4
-rw-r--r--sys/boot/i386/gptzfsboot/Makefile4
-rw-r--r--sys/boot/i386/zfsboot/Makefile4
4 files changed, 11 insertions, 4 deletions
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index f9c0ed1..1391ac4 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -37,12 +37,13 @@ CFLAGS= -Os \
-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline --param max-inline-insns-single=100 \
+ -Winline \
${CLANG_OPT_SMALL}
CFLAGS.gcc+= -fno-guess-branch-probability \
-fno-unit-at-a-time \
-mno-align-long-strings \
+ --param max-inline-insns-single=100
LD_FLAGS=-static -N --gc-sections
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 6ac9583..4806f13 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -35,7 +35,9 @@ CFLAGS= -DBOOTPROG=\"gptboot\" \
-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline --param max-inline-insns-single=100
+ -Winline
+
+CFLAGS.gcc+= --param max-inline-insns-single=100
LD_FLAGS=-static -N --gc-sections
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
index c2ecd77..d7d079f2 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/sys/boot/i386/gptzfsboot/Makefile
@@ -32,7 +32,9 @@ CFLAGS= -DBOOTPROG=\"gptzfsboot\" \
-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline --param max-inline-insns-single=100
+ -Winline
+
+CFLAGS.gcc+= --param max-inline-insns-single=100
LD_FLAGS=-static -N --gc-sections
diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
index a8438a1..b70aa9e 100644
--- a/sys/boot/i386/zfsboot/Makefile
+++ b/sys/boot/i386/zfsboot/Makefile
@@ -29,7 +29,9 @@ CFLAGS= -DBOOTPROG=\"zfsboot\" \
-Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline --param max-inline-insns-single=100
+ -Winline
+
+CFLAGS.gcc+= --param max-inline-insns-single=100
LD_FLAGS=-static -N --gc-sections
OpenPOWER on IntegriCloud