X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/fe8ab488e9161c46dd9885d58fc52996dc0249ff..5ba3f43ea354af8ad55bea84372a2bc834d8757c:/bsd/conf/Makefile.template

diff --git a/bsd/conf/Makefile.template b/bsd/conf/Makefile.template
index ece1262df..afe23cf34 100644
--- a/bsd/conf/Makefile.template
+++ b/bsd/conf/Makefile.template
@@ -1,14 +1,14 @@
 #
-# Copyright (c) 2000-2011 Apple Inc. All rights reserved.
+# Copyright (c) 2000-2016 Apple Inc. All rights reserved.
 #
 # @APPLE_LICENSE_HEADER_START@
-# 
+#
 # The contents of this file constitute Original Code as defined in and
 # are subject to the Apple Public Source License Version 1.1 (the
 # "License").  You may not use this file except in compliance with the
 # License.  Please obtain a copy of the License at
 # http://www.apple.com/publicsource and read it before using this file.
-# 
+#
 # This Original Code and all software distributed under the License are
 # distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
 # EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -16,7 +16,7 @@
 # FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
 # License for the specific language governing rights and limitations
 # under the License.
-# 
+#
 # @APPLE_LICENSE_HEADER_END@
 #
 
@@ -41,11 +41,12 @@ 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
 #
-COMP_SUBDIRS = 
+COMP_SUBDIRS =
 
 #
 #  Make sure we don't remove this by accident if interrupted at the wrong
@@ -99,6 +100,7 @@ OBJS_NO_SIGN_COMPARE =		\
 		ip_input.o	\
 		ip_output.o	\
 		raw_ip.o	\
+		tcp_cache.o	\
 		tcp_input.o	\
 		tcp_output.o	\
 		tcp_subr.o	\
@@ -112,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	\
@@ -149,13 +152,6 @@ $(foreach file,$(OBJS_NO_SIGN_COMPARE),$(eval $(call add_perfile_cflags,$(file),
 
 # Objects that don't want -Wcast-align warning (8474835)
 OBJS_NO_CAST_ALIGN =			\
-		BTree.o			\
-		BTreeAllocate.o		\
-		BTreeMiscOps.o		\
-		BTreeNodeOps.o		\
-		BTreeScanner.o		\
-		BTreeTreeOps.o		\
-		CatalogUtilities.o	\
 		audit_bsm_token.o	\
 		audit_pipe.o		\
 		audit_session.o		\
@@ -166,19 +162,6 @@ OBJS_NO_CAST_ALIGN =			\
 		fasttrap_isa.o		\
 		fbt_arm.o		\
 		fbt_x86.o		\
-		hfs_attrlist.o		\
-		hfs_btreeio.o		\
-		hfs_catalog.o		\
-		hfs_cnode.o		\
-		hfs_endian.o		\
-		hfs_hotfiles.o		\
-		hfs_link.o		\
-		hfs_quota.o		\
-		hfs_readwrite.o		\
-		hfs_search.o		\
-		hfs_vfsops.o		\
-		hfs_vnops.o		\
-		hfs_xattr.o		\
 		if_bond.o		\
 		ip6_fw.o		\
 		ip_dummynet.o		\
@@ -226,7 +209,6 @@ OBJS_NO_CAST_ALIGN =			\
 		uipc_usrreq.o		\
 		vfs_attrlist.o		\
 		vfs_fsevents.o		\
-		vfs_journal.o		\
 		vfs_lookup.o		\
 		vfs_syscalls.o		\
 		vfs_utfconv.o		\
@@ -236,10 +218,47 @@ OBJS_NO_CAST_ALIGN =			\
 		munge.o			\
 		aes.o			\
 		aeskey.o		\
-		sdt_arm.o
+		sdt_arm.o		\
+		uipc_mbuf.o		\
+		kern_guarded.o
 
 $(foreach file,$(OBJS_NO_CAST_ALIGN),$(eval $(call add_perfile_cflags,$(file),-Wno-cast-align)))
 
+# Relax -Waddress-of-packed-member on networking (28123676)
+OBJS_NO_PACKED_ADDRESS =    \
+		ah_core.o           \
+		ah_input.o          \
+		esp_input.o         \
+		esp_output.o        \
+		frag6.o             \
+		icmp6.o             \
+		if_stf.o            \
+		in6_cksum.o         \
+		in6_gif.o           \
+		ip6_forward.o       \
+		ip6_input.o         \
+		ip6_output.o        \
+		iptap.o	            \
+		ipsec.o             \
+		mld6.o              \
+		mptcp_opt.o         \
+		nd6.o               \
+		nd6_nbr.o           \
+		nd6_prproxy.o       \
+		nd6_rtr.o           \
+		necp.o              \
+		pf.o                \
+		pf_norm.o           \
+		pktap.o             \
+		raw_ip6.o           \
+		tcp_input.o         \
+		tcp_subr.o          \
+		udp6_output.o       \
+		udp6_usrreq.o       \
+		udp_usrreq.o
+
+$(foreach file,$(OBJS_NO_PACKED_ADDRESS),$(eval $(call add_perfile_cflags,$(file),-Wno-address-of-packed-member)))
+
 #
 # This rule insures that the subr_prof.c does NOT get compiled with
 # profiling. It implements mcount() and profiling it leads to recursion.
@@ -261,26 +280,30 @@ $(SOBJS): .SFLAGS
 .SFLAGS: ALWAYS
 	$(_v)$(REPLACECONTENTS) $@ $(S_KCC) $(SFLAGS) $(INCFLAGS)
 
-$(COMPONENT).filelist: $(OBJS) 
-	@echo LDFILELIST $(COMPONENT)
-	$(_v)( for obj in ${OBJS}; do	\
+$(COMPONENT).filelist: $(OBJS)
+	@echo "$(ColorL)LDFILELIST$(Color0) $(ColorLF)$(COMPONENT)$(Color0)"
+	$(_v)for obj in ${OBJS}; do	\
 		 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
-	done; ) > $(COMPONENT).filelist
+	done > $(COMPONENT).filelist
 
 MAKESYSCALLS = $(SRCROOT)/bsd/kern/makesyscalls.sh
 
 init_sysent.c: $(SRCROOT)/bsd/kern/syscalls.master $(MAKESYSCALLS)
-	@echo "Generating $@ from $<";
+	@echo "[$(CMD_MC)] $(ColorH)GENERATING$(Color0) $(ColorLF)$@$(Color0) from $(ColorF)$<$(Color0)";
 	$(_v)$(MAKESYSCALLS) $< table > /dev/null
 
 syscalls.c: $(SRCROOT)/bsd/kern/syscalls.master $(MAKESYSCALLS)
-	@echo "Generating $@ from $<";
+	@echo "[$(CMD_MC)] $(ColorH)GENERATING$(Color0) $(ColorLF)$@$(Color0) from $(ColorF)$<$(Color0)";
 	$(_v)$(MAKESYSCALLS) $< names > /dev/null
 
 audit_kevents.c: $(SRCROOT)/bsd/kern/syscalls.master $(MAKESYSCALLS)
-	@echo "Generating $@ from $<";
+	@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