X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/3e170ce000f1506b7b5d2c5c7faec85ceabb573d..c3c9b80d004dbbfdf763edeb97968c6997e3b45b:/security/conf/Makefile.template

diff --git a/security/conf/Makefile.template b/security/conf/Makefile.template
index 9e94a12ca..24a7728b6 100644
--- a/security/conf/Makefile.template
+++ b/security/conf/Makefile.template
@@ -17,13 +17,7 @@ include $(MakeInc_def)
 # XXX: CFLAGS
 #
 CFLAGS+= -include meta_features.h -DBSD_KERNEL_PRIVATE
-
-# Objects that don't want -Wcast-align warning (8474835)
-OBJS_NO_CAST_ALIGN =		\
-		mac_alloc.o	\
-		mac_base.o
-
-$(foreach file,$(OBJS_NO_CAST_ALIGN),$(eval $(call add_perfile_cflags,$(file),-Wno-cast-align)))
+SFLAGS+= -include meta_features.h
 
 #
 # INCFLAGS to include security prototypes
@@ -33,7 +27,7 @@ INCFLAGS_MAKEFILE= -I$(SOURCE)/..
 #
 # Directories for mig generated files
 #
-COMP_SUBDIRS = 
+COMP_SUBDIRS =
 
 #
 #  Make sure we don't remove this by accident if interrupted at the wrong
@@ -51,6 +45,8 @@ COMP_SUBDIRS =
 
 %OBJS
 
+%LIBOBJS
+
 %CFILES
 
 %CXXFILES
@@ -59,6 +55,23 @@ COMP_SUBDIRS =
 
 %MACHDEP
 
+#
+# Diagnostic opt-outs.  We need to make this list empty.
+#
+# DO NOT ADD MORE HERE.
+#
+# -Wno-cast-align
+mac_base.o_CFLAGS_ADD += -Wno-cast-align
+# -Wno-shorten-64-to-32
+mac_audit.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+mac_base.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+mac_process.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+# -Wno-sign-conversion
+mac_base.o_CFLAGS_ADD += -Wno-sign-conversion
+mac_mach.o_CFLAGS_ADD += -Wno-sign-conversion
+mac_vfs.o_CFLAGS_ADD += -Wno-sign-conversion
+mac_vfs_subr.o_CFLAGS_ADD += -Wno-sign-conversion
+
 # Rebuild if per-file overrides change
 ${OBJS}: $(firstword $(MAKEFILE_LIST))
 
@@ -74,12 +87,22 @@ $(SOBJS): .SFLAGS
 	$(_v)$(REPLACECONTENTS) $@ $(S_KCC) $(SFLAGS) $(INCFLAGS)
 
 $(COMPONENT).filelist: $(OBJS)
-	@echo LDFILELIST $(COMPONENT)
+	@$(LOG_LDFILELIST) "$(COMPONENT)"
 	$(_v)for obj in ${OBJS}; do	\
-		 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
+		 $(ECHO) $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
 	done > $(COMPONENT).filelist
 
+$(COMPONENT).libfilelist: $(LIBOBJS)
+	@$(LOG_LDFILELIST) "lib$(COMPONENT)"
+	$(_v)for obj in ${LIBOBJS}; do	\
+		 $(ECHO) $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
+	done > $(COMPONENT).libfilelist
+
+ifeq ($(RC_ProjectName),xnu_libraries)
+do_all: $(COMPONENT).libfilelist
+else
 do_all: $(COMPONENT).filelist
+endif
 
 do_build_all:: do_all