diff options
| author | imp <imp@FreeBSD.org> | 2015-01-05 12:28:22 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2015-01-05 12:28:22 +0000 |
| commit | 2c0af1c89755a8fe945b4e1746f37c1fa2a87439 (patch) | |
| tree | 7d5f53ed6c06720d9d9f32e3b8dd14d5c4d77b6c /sys/conf/kern.pre.mk | |
| parent | 47d4a0fc0c187c95706f48032f8a97325b9c056a (diff) | |
| download | FreeBSD-src-2c0af1c89755a8fe945b4e1746f37c1fa2a87439.zip FreeBSD-src-2c0af1c89755a8fe945b4e1746f37c1fa2a87439.tar.gz | |
Clang's 3.5 integrated assembler now handles these files correctly (it
has support for the .codeXX directives). However, it is desirable, for
a time, to allow kernels to be built with clang 3.4. Historically, it
has been advantageous to allow stable X-1 to build kernels the old
way (so long as the impact of doing so is small), and this restores
that ability.
Also, centralize the addition of ${ASM_CFLAGS.${.IMPSRC}}, place it in
kern.mk rather than kern.pre.mk so that all modules can benefit, and
give the same treatment to CFLAGS in kern.mk as well.
Diffstat (limited to 'sys/conf/kern.pre.mk')
| -rw-r--r-- | sys/conf/kern.pre.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 21a4290..48982c5 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -103,13 +103,7 @@ CFLAGS.gcc+=${CFLAGS_ARCH_PARAMS} WERROR?= -Werror # XXX LOCORE means "don't declare C stuff" not "for locore.s". -ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} - -.if ${COMPILER_TYPE} == "clang" -CLANG_NO_IAS= -no-integrated-as -.else -GCC_MS_EXTENSIONS= -fms-extensions -.endif +ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} ${ASM_CFLAGS.${.IMPSRC}} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 CFLAGS+= -DGPROF |
