diff options
| author | trhodes <trhodes@FreeBSD.org> | 2004-03-14 01:29:05 +0000 |
|---|---|---|
| committer | trhodes <trhodes@FreeBSD.org> | 2004-03-14 01:29:05 +0000 |
| commit | 1ff837cfce7fe0bff2e61961547cb15b17a41b69 (patch) | |
| tree | d2692851deefbf921d7362b66f4a9ed1daab2c0a /sys | |
| parent | deef4b06daa12b66b70e4705d33e8d8f6a587f8c (diff) | |
| download | FreeBSD-src-1ff837cfce7fe0bff2e61961547cb15b17a41b69.zip FreeBSD-src-1ff837cfce7fe0bff2e61961547cb15b17a41b69.tar.gz | |
Fix some style bugs in previous commit.
Fix 'broken' ifdefs.
icc does not support profiling yet so remove unfinished code which was
supposed to help.
Submitted by: netchild (original version)
Reviewed by: ru
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/kern.pre.mk | 10 | ||||
| -rw-r--r-- | sys/conf/kmod.mk | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 4a786a5..89dc5f6 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -39,7 +39,7 @@ NOSTDINC= -nostdinc INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S -# This hack lets us use the Intel ACPICA code without spamming a new +# This hack lets us use the Intel ACPICA code without spamming a new # include path into 100+ source files. INCLUDES+= -I$S/contrib/dev/acpica @@ -66,11 +66,11 @@ WERROR?= -Werror ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -. if ${CC} == "icc" -CFLAGS+= -DGPROF -. else +.if ${CC} == "icc" +.error Profiling doesn't work with ICC yet. +.else CFLAGS+= -DGPROF -falign-functions=16 -. endif +.endif .if ${PROFLEVEL} >= 2 CFLAGS+= -DGPROF4 -DGUPROF . if ${CC} == "icc" diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index c303061..c3b642a 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -71,8 +71,7 @@ OBJCOPY?= objcopy .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S .if ${CC} == "icc" -_ICC_CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} -CFLAGS= ${_ICC_CFLAGS} +CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} .endif CFLAGS+= ${COPTS} -D_KERNEL CFLAGS+= -DKLD_MODULE |
