Deleted Added
full compact
bsd.sys.mk (259158) bsd.sys.mk (260096)
1# $FreeBSD: stable/10/share/mk/bsd.sys.mk 259158 2013-12-10 07:28:26Z dim $
1# $FreeBSD: stable/10/share/mk/bsd.sys.mk 260096 2013-12-30 20:15:46Z dim $
2#
3# This file contains common settings used for building FreeBSD
4# sources.
5
6# Enable various levels of compiler warning checks. These may be
7# overridden (e.g. if using a non-gcc compiler) by defining NO_WARNS.
8
9# for GCC: http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Warning-Options.html

--- 99 unchanged lines hidden (view full) ---

109CWARNFLAGS+= -Wno-format
110.endif # NO_WFORMAT || (CLANG && NO_WFORMAT.clang)
111.endif # !NO_WARNS
112
113.if defined(IGNORE_PRAGMA)
114CWARNFLAGS+= -Wno-unknown-pragmas
115.endif # IGNORE_PRAGMA
116
2#
3# This file contains common settings used for building FreeBSD
4# sources.
5
6# Enable various levels of compiler warning checks. These may be
7# overridden (e.g. if using a non-gcc compiler) by defining NO_WARNS.
8
9# for GCC: http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Warning-Options.html

--- 99 unchanged lines hidden (view full) ---

109CWARNFLAGS+= -Wno-format
110.endif # NO_WFORMAT || (CLANG && NO_WFORMAT.clang)
111.endif # !NO_WARNS
112
113.if defined(IGNORE_PRAGMA)
114CWARNFLAGS+= -Wno-unknown-pragmas
115.endif # IGNORE_PRAGMA
116
117.if ${COMPILER_TYPE} == "clang" && !defined(EARLY_BUILD)
117.if !defined(EARLY_BUILD)
118.if ${COMPILER_TYPE} == "clang"
118CLANG_NO_IAS= -no-integrated-as
119CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
120 -mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret
121CFLAGS+= -Qunused-arguments
119CLANG_NO_IAS= -no-integrated-as
120CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
121 -mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret
122CFLAGS+= -Qunused-arguments
123CFLAGS+= ${CFLAGS.clang}
124CXXFLAGS+= ${CXXFLAGS.clang}
125.else # !CLANG
126CFLAGS+= ${CFLAGS.gcc}
127CXXFLAGS+= ${CXXFLAGS.gcc}
122.endif # CLANG
128.endif # CLANG
129.endif # !EARLY_BUILD
123
124.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
125 ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
126# Don't use -Wstack-protector as it breaks world with -Werror.
127SSP_CFLAGS?= -fstack-protector
128CFLAGS+= ${SSP_CFLAGS}
129.endif # SSP && !IA64 && !ARM && !MIPS
130

--- 17 unchanged lines hidden ---
130
131.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
132 ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
133# Don't use -Wstack-protector as it breaks world with -Werror.
134SSP_CFLAGS?= -fstack-protector
135CFLAGS+= ${SSP_CFLAGS}
136.endif # SSP && !IA64 && !ARM && !MIPS
137

--- 17 unchanged lines hidden ---