xnu-4570.1.46.tar.gz

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

diff --git a/osfmk/conf/Makefile.template b/osfmk/conf/Makefile.template
index f22798e237cf43f1aacef11c188d87b023f07423..b1f41bbc2efef83b6c53dec08f2031558068e5c9 100644 (file)
--- a/osfmk/conf/Makefile.template
+++ b/osfmk/conf/Makefile.template
@@ -17,6 +17,7 @@ include $(MakeInc_def)
 # XXX: CFLAGS
 #
 CFLAGS+= -include meta_features.h -DMACH_KERNEL_PRIVATE -DMACH_KERNEL
+SFLAGS+= -include meta_features.h
 
 # Objects that don't want -Wcast-align warning (8474835)
 OBJS_NO_CAST_ALIGN =                   \
@@ -58,7 +59,6 @@ OBJS_NO_CAST_ALIGN =                  \
                wait_queue.o            \
                bsd_kern.o              \
                pmc.o                   \
-               default_freezer.o       \
                status.o                \
                machine_routines.o      \
                loose_ends.o            \
@@ -72,17 +72,21 @@ OBJS_NO_CAST_ALIGN =                        \
                cchmac_final.o          \
                cchmac_init.o           \
                ccsha1.o                \
-               dp_memory_object.o      \
                ipc_object.o            \
+               ccmode_ctr_crypt.o      \
+               ccmode_factory_ctr_crypt.o      \
+               ccmode_ctr_init.o       \
+               ccmode_ctr_setctr.o     \
                ipc_kmsg.o              \
                ipc_right.o             \
                bsd_vm.o                \
                vm_map_store.o          \
                vm_map_store_ll.o       \
-               vm_map_store_rb.o
+               vm_map_store_rb.o       \
+               vm_debug.o
 
 # Objects that don't want -Wsign-compare warning (15294427)
-OBJS_NO_SIGN_COMPARE =                 \
+OBJS_NO_SIGN_COMPARE =         \
                atm_notification_user.o
 
 $(foreach file,$(OBJS_NO_CAST_ALIGN),$(eval $(call add_perfile_cflags,$(file),-Wno-cast-align)))
@@ -155,7 +159,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
@@ -179,7 +183,7 @@ endif
 -include genassym.d
 genassym.o: .CFLAGS $(firstword $(MAKEFILE_LIST))
 genassym.o: $(SOURCE_DIR)/$(COMPONENT)/$(GENASSYM_LOCATION)/genassym.c
-       @echo GENASSYM $<
+       @echo "[$(CMD_MC)] $(ColorH)GENASSYM$(Color0)      $(ColorLF)$<$(Color0)"
        $(_v)${GENASSYM_KCC} ${CFLAGS} ${CFLAGS_NOLTO_FLAG} -MD -S -o ${@} ${INCFLAGS} $<
 
 assym.s: genassym.o