X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/060df5ea7c632b1ac8cc8aac1fb59758165c2084..6d2010ae8f7a6078e10b361c6962983bab233e0f:/bsd/conf/Makefile.template?ds=sidebyside

diff --git a/bsd/conf/Makefile.template b/bsd/conf/Makefile.template
index fdee45a3e..8691ce705 100644
--- a/bsd/conf/Makefile.template
+++ b/bsd/conf/Makefile.template
@@ -43,10 +43,81 @@ include $(MakeInc_def)
 #
 # XXX: CFLAGS
 #
-CFLAGS+= -imacros meta_features.h -DARCH_PRIVATE -DKERNEL -DDRIVER_PRIVATE \
+CFLAGS+= -include meta_features.h -DARCH_PRIVATE -DDRIVER_PRIVATE \
 	-D_KERNEL_BUILD -DKERNEL_BUILD -DMACH_KERNEL -DBSD_BUILD \
 	-DBSD_KERNEL_PRIVATE -DLP64KERN=1 -DLP64_DEBUG=0  -I. $(CFLAGS_INLINE_CONFIG)
 
+dp_backing_file.o_CFLAGS_ADD	+= -Wshorten-64-to-32
+ubc_subr.o_CFLAGS_ADD			+= -Wshorten-64-to-32
+vnode_pager.o_CFLAGS_ADD		+= -Wshorten-64-to-32
+vm_unix.o_CFLAGS_ADD			+= -Wshorten-64-to-32
+
+# Objects that don't want -Wsign-compare
+OBJS_NO_SIGN_COMPARE =		\
+		radix.o	\
+		route.o	\
+		rtsock.o	\
+		dhcp_options.o	\
+		igmp.o	\
+		in_cksum.o	\
+		ip_divert.o	\
+		ip_dummynet.o	\
+		ip_flow.o	\
+		ip_fw2.o	\
+		ip_fw2_compat.o	\
+		ip_icmp.o	\
+		ip_input.o	\
+		ip_mroute.o	\
+		ip_output.o	\
+		raw_ip.o	\
+		tcp_input.o	\
+		tcp_output.o	\
+		tcp_subr.o	\
+		tcp_usrreq.o	\
+		tcp_timer.o	\
+		udp_usrreq.o	\
+		ah_input.o	\
+		ah_core.o	\
+		ah_output.o	\
+		esp_core.o	\
+		esp_input.o	\
+		esp_output.o	\
+		esp_rijndael.o	\
+		ipsec.o	\
+		dest6.o	\
+		frag6.o	\
+		icmp6.o	\
+		in6.o	\
+		in6_src.o	\
+		in6_cksum.o	\
+		ip6_fw.o	\
+		ip6_forward.o	\
+		in6_ifattach.o	\
+		ip6_input.o	\
+		ip6_mroute.o	\
+		ip6_output.o	\
+		ipcomp_input.o	\
+		ipcomp_output.o	\
+		in6_proto.o	\
+		mld6.o	\
+		nd6.o	\
+		nd6_nbr.o	\
+		nd6_rtr.o	\
+		raw_ip6.o	\
+		route6.o	\
+		scope6.o	\
+		udp6_usrreq.o	\
+		key.o	\
+		keysock.o	\
+		keydb.o	\
+		des_setkey.o	\
+		uipc_mbuf.o	\
+		uipc_mbuf2.o	\
+		uipc_socket.o	\
+		uipc_socket2.o
+
+$(foreach file,$(OBJS_NO_SIGN_COMPARE),$(eval $(call add_perfile_cflags,$(file),-Wno-sign-compare)))
+
 #
 # Directories for mig generated files
 #
@@ -98,11 +169,11 @@ ${OBJS}: ${OBJSDEPS}
 
 LDOBJS = $(OBJS)
 
-$(COMPONENT).o: $(LDOBJS)
+$(COMPONENT).filelist: $(LDOBJS)
 	@echo LDFILELIST $(COMPONENT)
 	$(_v)( for obj in ${LDOBJS}; do	\
 		 echo $(TARGET)$(COMP_OBJ_DIR)/$(KERNEL_CONFIG)/$${obj}; \
-	done; ) > $(COMPONENT).o
+	done; ) > $(COMPONENT).filelist
 
 MAKESYSCALLS = $(SRCROOT)/bsd/kern/makesyscalls.sh
 
@@ -121,7 +192,7 @@ audit_kevents.c: $(SRCROOT)/bsd/kern/syscalls.master $(MAKESYSCALLS)
 do_depend: do_all
 	$(_v)${MD} -u Makedep -f -d `ls *.d`;
 
-do_all: $(COMPONENT).o
+do_all: $(COMPONENT).filelist
 
 do_build_all: do_depend