xnu-4570.51.1.tar.gz

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

diff --git a/libkern/conf/Makefile.template b/libkern/conf/Makefile.template
index 23bbd4f6a2b359afb306332c83e59a0a8ed37c37..c448bb853a3de4fd11c161b513dba72c413c3b46 100644 (file)
--- a/libkern/conf/Makefile.template
+++ b/libkern/conf/Makefile.template
@@ -17,27 +17,28 @@ include $(MakeInc_def)
 # CFLAGS
 #
 CFLAGS+= -include meta_features.h -DLIBKERN_KERNEL_PRIVATE -DOSALLOCDEBUG=1
+SFLAGS+= -include meta_features.h
 
 # Objects that don't want -Wcast-align warning (8474835)
 OSKextLib.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
-OSKext.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSKext.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align -Wno-cast-qual
 OSMetaClass.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
-OSUnserialize.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSRuntime.cpo_CXXWARNFLAGS_ADD += -Wno-missing-prototypes
+OSUnserialize.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align -Wno-unreachable-code-break
 corecrypto_md5.o_CWARNFLAGS_ADD = -Wno-cast-align
 corecrypto_sha1.o_CWARNFLAGS_ADD = -Wno-cast-align
 
 # zlib is 3rd party source
-compress.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-deflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-infback.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-inffast.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-inflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-trees.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-uncompr.o_CWARNFLAGS_ADD = -Wno-cast-qual 
+compress.o_CWARNFLAGS_ADD = -Wno-cast-qual
+deflate.o_CWARNFLAGS_ADD = -Wno-cast-qual
+infback.o_CWARNFLAGS_ADD = -Wno-cast-qual
+inffast.o_CWARNFLAGS_ADD = -Wno-cast-qual
+inflate.o_CWARNFLAGS_ADD = -Wno-cast-qual
+trees.o_CWARNFLAGS_ADD = -Wno-cast-qual
+uncompr.o_CWARNFLAGS_ADD = -Wno-cast-qual
 
 # warnings in bison-generated code
-OSUnserializeXML.cpo_CXXWARNFLAGS_ADD = -Wno-uninitialized
-OSUnserializeXML.cpo_CXXWARNFLAGS_ADD += -Wno-unreachable-code
+OSUnserializeXML.cpo_CXXWARNFLAGS_ADD += -Wno-uninitialized -Wno-unreachable-code -Wno-unreachable-code-break
 OSUnserialize.cpo_CXXWARNFLAGS_ADD += -Wno-unreachable-code
 
 # Runtime support functions don't interact well with LTO (9294679)
@@ -46,7 +47,7 @@ stack_protector.o_CFLAGS_ADD += $(CFLAGS_NOLTO_FLAG)
 #
 # Directories for mig generated files
 #
-COMP_SUBDIRS = 
+COMP_SUBDIRS =
 
 #
 #  Make sure we don't remove this by accident if interrupted at the wrong
@@ -72,24 +73,6 @@ COMP_SUBDIRS =
 
 %MACHDEP
 
-#
-# Machine-independent per-file flags
-#
-
-# zlib is 3rd party source
-compress.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-deflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-infback.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-inffast.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-inflate.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-trees.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-uncompr.o_CWARNFLAGS_ADD = -Wno-cast-qual 
-
-# warnings in bison-generated code
-OSUnserializeXML.cpo_CXXWARNFLAGS_ADD = -Wno-uninitialized
-OSUnserializeXML.cpo_CXXWARNFLAGS_ADD += -Wno-unreachable-code
-OSUnserialize.cpo_CXXWARNFLAGS_ADD += -Wno-unreachable-code
-
 # Rebuild if per-file overrides change
 ${OBJS}: $(firstword $(MAKEFILE_LIST))
 
@@ -110,7 +93,7 @@ $(COMPONENT).filelist: $(OBJS)
                $(SEG_HACK) -n __HIB -o $${hib_file}__ $${hib_file} || exit 1; \
                mv $${hib_file}__ $${hib_file} || exit 1; \
        done
-       @echo LDFILELIST $(COMPONENT)
+       @echo "$(ColorL)LDFILELIST$(Color0) $(ColorLF)$(COMPONENT)$(Color0)"
        $(_v)for obj in ${OBJS}; do     \
                 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
        done > $(COMPONENT).filelist