diff options
| author | Warner Losh <imp@FreeBSD.org> | 2015-01-05 12:28:22 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2015-01-05 12:28:22 +0000 |
| commit | 9aca3e0f2bbcceebd1e7dc87f3f16f562a463b9e (patch) | |
| tree | 7d5f53ed6c06720d9d9f32e3b8dd14d5c4d77b6c /sys/conf/Makefile.i386 | |
| parent | fe94dc19e84e9c1604d4ac511197d2fa0d8438cf (diff) | |
| download | src-9aca3e0f2bbcceebd1e7dc87f3f16f562a463b9e.tar.gz src-9aca3e0f2bbcceebd1e7dc87f3f16f562a463b9e.zip | |
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.
Notes
Notes:
svn path=/head/; revision=276696
Diffstat (limited to 'sys/conf/Makefile.i386')
| -rw-r--r-- | sys/conf/Makefile.i386 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 621ebff79e19..6b1eca42f1bb 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -32,6 +32,9 @@ S= ../../.. INCLUDES+= -I$S/contrib/libfdt +ASM_CFLAGS.acpi_wakecode.S= ${CLANG_NO_IAS34} +ASM_CFLAGS.mpboot.s= ${CLANG_NO_IAS34} + %BEFORE_DEPEND %OBJS |