Date: Sun, 23 Oct 2011 16:27:04 +0000 (UTC) From: Robert Millan <rmh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r226665 - head/sys/conf Message-ID: <201110231627.p9NGR47P046269@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmh Date: Sun Oct 23 16:27:03 2011 New Revision: 226665 URL: http://svn.freebsd.org/changeset/base/226665 Log: Conditionalize a pair of FreeBSD GCC extensions so that its CFLAGS are only used with FreeBSD GCC. Approved by: kib (mentor) Modified: head/sys/conf/kern.mk Modified: head/sys/conf/kern.mk ============================================================================== --- head/sys/conf/kern.mk Sun Oct 23 16:04:07 2011 (r226664) +++ head/sys/conf/kern.mk Sun Oct 23 16:27:03 2011 (r226665) @@ -1,11 +1,21 @@ # $FreeBSD$ +.if ${CC:T:Mclang} != "clang" +FREEBSD_GCC!= ${CC} --version | grep FreeBSD || true +.endif + # # Warning flags for compiling the kernel and components of the kernel: # +.if ${FREEBSD_GCC} +# FreeBSD extensions, not available in upstream GCC +format_extensions= -fformat-extensions +no_align_long_strings= -mno-align-long-strings +.endif + CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - -Wundef -Wno-pointer-sign -fformat-extensions \ + -Wundef -Wno-pointer-sign ${format_extensions} \ -Wmissing-include-dirs -fdiagnostics-show-option # # The following flags are next up for working on: @@ -32,7 +42,7 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wn # .if ${MACHINE_CPUARCH} == "i386" .if ${CC:T:Mclang} != "clang" -CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse +CFLAGS+= ${no_align_long_strings} -mpreferred-stack-boundary=2 -mno-sse .else CFLAGS+= -mno-aes -mno-avx .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110231627.p9NGR47P046269>