diff options
| -rw-r--r-- | share/mk/bsd.cpu.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.lib.mk | 5 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 10 | ||||
| -rw-r--r-- | sys/conf/kmod.mk | 3 |
4 files changed, 8 insertions, 12 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 1c24577..a02797b 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -44,7 +44,7 @@ CPUTYPE = athlon . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ - ${CPUTYPE} == "athlon-4" || ${CPUTYPE} == "athlon-tbird" + ${CPUTYPE} == "athlon-4" _ICC_CPUCFLAGS = -tpp6 -xiMK _CPUCFLAGS = -march=${CPUTYPE} . elif ${CPUTYPE} == "athlon-tbird" || ${CPUTYPE} == "athlon" diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index efa898d..8fe27ee 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -54,9 +54,6 @@ PO_FLAG=-p PO_FLAG=-pg .endif -.c.o: - ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} - .c.po: ${CC} ${PO_FLAG} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} @@ -166,7 +163,7 @@ ${LINTLIB}: ${LINTOBJS} ${LINT} ${LINTLIBFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif -.endif #!defined(INTERNALLIB) +.endif !defined(INTERNALLIB) all: ${_LIBS} 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 |
