xnu-7195.81.3.tar.gz

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

diff --git a/security/conf/Makefile.template b/security/conf/Makefile.template
index 8330c0a5f0d43f18d20b6925e4f3d8011e3e78b3..24a7728b66e3f3cfc3a5c0d8765f6aa4b7d8321f 100644 (file)
--- a/security/conf/Makefile.template
+++ b/security/conf/Makefile.template
@@ -19,13 +19,6 @@ include $(MakeInc_def)
 CFLAGS+= -include meta_features.h -DBSD_KERNEL_PRIVATE
 SFLAGS+= -include meta_features.h
 
-# 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)))
-
 #
 # INCFLAGS to include security prototypes
 #
@@ -52,6 +45,8 @@ COMP_SUBDIRS =
 
 %OBJS
 
+%LIBOBJS
+
 %CFILES
 
 %CXXFILES
@@ -60,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))
 
@@ -75,12 +87,22 @@ $(SOBJS): .SFLAGS
        $(_v)$(REPLACECONTENTS) $@ $(S_KCC) $(SFLAGS) $(INCFLAGS)
 
 $(COMPONENT).filelist: $(OBJS)
-       @echo "$(ColorL)LDFILELIST$(Color0) $(ColorLF)$(COMPONENT)$(Color0)"
+       @$(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