diff options
| author | neel <neel@FreeBSD.org> | 2012-11-13 07:39:05 +0000 |
|---|---|---|
| committer | neel <neel@FreeBSD.org> | 2012-11-13 07:39:05 +0000 |
| commit | 1a164db277254c1198a5923050a4e403737937c3 (patch) | |
| tree | 96b9ec5962272d9c843abffb6d4db9b66e04efd3 /sys/conf | |
| parent | f146c1921cfde17a6716187a95a05c21f5e46b94 (diff) | |
| parent | a841c9341b2afeabcf32a11c8bd91bbe3346177a (diff) | |
| download | FreeBSD-src-1a164db277254c1198a5923050a4e403737937c3.zip FreeBSD-src-1a164db277254c1198a5923050a4e403737937c3.tar.gz | |
IFC @ r242940
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.pc98 | 4 | ||||
| -rw-r--r-- | sys/conf/files | 5 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index 18ee498..e3a265d 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -34,6 +34,10 @@ MACHINE=pc98 MKMODULESENV+= MACHINE=${MACHINE} +# XXX: clang integrated-as doesn't grok .codeNN directives yet +ASM_CFLAGS.mpboot.s= ${CLANG_NO_IAS} +ASM_CFLAGS+= ${ASM_CFLAGS.${.IMPSRC:T}} + %BEFORE_DEPEND %OBJS diff --git a/sys/conf/files b/sys/conf/files index 5120310..134935e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1163,15 +1163,14 @@ dev/drm/mach64_state.c optional mach64drm dev/drm/mga_dma.c optional mgadrm dev/drm/mga_drv.c optional mgadrm dev/drm/mga_irq.c optional mgadrm -dev/drm/mga_state.c optional mgadrm \ - compile-with "${NORMAL_C} -finline-limit=13500" +dev/drm/mga_state.c optional mgadrm dev/drm/mga_warp.c optional mgadrm dev/drm/r128_cce.c optional r128drm \ compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} ${NO_WCONSTANT_CONVERSION}" dev/drm/r128_drv.c optional r128drm dev/drm/r128_irq.c optional r128drm dev/drm/r128_state.c optional r128drm \ - compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE} -finline-limit=13500" + compile-with "${NORMAL_C} ${NO_WUNUSED_VALUE}" dev/drm/r300_cmdbuf.c optional radeondrm dev/drm/r600_blit.c optional radeondrm dev/drm/r600_cp.c optional radeondrm \ diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 7e6e20a..442eac9 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -102,12 +102,18 @@ CLANG_NO_IAS= -no-integrated-as .endif .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -CFLAGS+= -DGPROF -falign-functions=16 +CFLAGS+= -DGPROF +.if ${COMPILER_TYPE} != "clang" +CFLAGS+= -falign-functions=16 +.endif .if ${PROFLEVEL} >= 2 CFLAGS+= -DGPROF4 -DGUPROF -PROF= -pg -mprofiler-epilogue +PROF= -pg +.if ${COMPILER_TYPE} != "clang" +PROF+= -mprofiler-epilogue +.endif .else -PROF= -pg +PROF= -pg .endif .endif DEFINED_PROF= ${PROF} |
