xnu-4570.1.46.tar.gz

[apple/xnu.git] / bsd / conf / Makefile.template

diff --git a/bsd/conf/Makefile.template b/bsd/conf/Makefile.template
index edfd0c7679baf1b60b0efc5ff3f5ce6d4f74192b..afe23cf346d0e4a60088637c59d20f87c2bf71a9 100644 (file)
--- a/bsd/conf/Makefile.template
+++ b/bsd/conf/Makefile.template
@@ -41,6 +41,7 @@ include $(MakeInc_def)
 CFLAGS+= -include meta_features.h -DDRIVER_PRIVATE \
        -D_KERNEL_BUILD -DKERNEL_BUILD -DMACH_KERNEL -DBSD_BUILD \
        -DBSD_KERNEL_PRIVATE -DLP64_DEBUG=0
+SFLAGS+= -include meta_features.h
 
 #
 # Directories for mig generated files
@@ -82,8 +83,6 @@ vm_unix.o_CFLAGS_ADD                  += -Wshorten-64-to-32
 pthread_synch.o_CFLAGS_ADD             += -Wno-unused-parameter -Wno-missing-prototypes
 pthread_support.o_CFLAGS_ADD           += -Wno-unused-parameter -Wno-missing-prototypes
 
-ip_icmp.o_CFLFAGS_ADD          += -O0
-
 # Objects that don't want -Wsign-compare
 OBJS_NO_SIGN_COMPARE =         \
                radix.o \
@@ -115,6 +114,7 @@ OBJS_NO_SIGN_COMPARE =              \
                esp_input.o     \
                esp_output.o    \
                esp_rijndael.o  \
+               esp_chachapoly.o        \
                ipsec.o \
                dest6.o \
                frag6.o \
@@ -238,6 +238,7 @@ OBJS_NO_PACKED_ADDRESS =    \
                ip6_forward.o       \
                ip6_input.o         \
                ip6_output.o        \
+               iptap.o             \
                ipsec.o             \
                mld6.o              \
                mptcp_opt.o         \
@@ -256,7 +257,6 @@ OBJS_NO_PACKED_ADDRESS =    \
                udp6_usrreq.o       \
                udp_usrreq.o
 
-$(foreach file,$(OBJS_NO_PACKED_ADDRESS),$(eval $(call add_perfile_cflags,$(file),-Wno-unknown-warning-option)))
 $(foreach file,$(OBJS_NO_PACKED_ADDRESS),$(eval $(call add_perfile_cflags,$(file),-Wno-address-of-packed-member)))
 
 #
@@ -300,6 +300,10 @@ audit_kevents.c: $(SRCROOT)/bsd/kern/syscalls.master $(MAKESYSCALLS)
        @echo "[$(CMD_MC)] $(ColorH)GENERATING$(Color0) $(ColorLF)$@$(Color0) from $(ColorF)$<$(Color0)";
        $(_v)$(MAKESYSCALLS) $< audit > /dev/null
 
+systrace_args.c:  $(SRCROOT)/bsd/kern/syscalls.master $(MAKESYSCALLS)
+       @echo "[$(CMD_MC)] $(ColorH)GENERATING$(Color0) $(ColorLF)$@$(Color0) from $(ColorF)$<$(Color0)";
+       $(_v)$(MAKESYSCALLS) $< systrace > /dev/null
+
 do_all: $(COMPONENT).filelist
 
 do_build_all:: do_all