X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/fe8ab488e9161c46dd9885d58fc52996dc0249ff..5ba3f43ea354af8ad55bea84372a2bc834d8757c:/osfmk/conf/Makefile.template

diff --git a/osfmk/conf/Makefile.template b/osfmk/conf/Makefile.template
index a1354f469..b1f41bbc2 100644
--- a/osfmk/conf/Makefile.template
+++ b/osfmk/conf/Makefile.template
@@ -17,15 +17,15 @@ 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 =			\
 		atm_notification_user.o \
 		model_dep.o		\
 		chud_thread.o		\
-		chud_thread_arm.o   \
+		chud_thread_arm.o	\
 		video_console.o		\
-		kern_stackshot.o			\
 		kdp_udp.o		\
 		kdp_machdep.o		\
 		host.o			\
@@ -59,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		\
@@ -73,10 +72,21 @@ OBJS_NO_CAST_ALIGN =			\
 		cchmac_final.o		\
 		cchmac_init.o		\
 		ccsha1.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_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)))
@@ -146,13 +156,13 @@ $(SOBJS): .SFLAGS
 $(COMPONENT).filelist: $(OBJS)
 	$(_v)for hib_file in ${HIB_FILES};		\
 	do	\
-                $(SEG_HACK) -n __HIB -o $${hib_file}__ $${hib_file} ; \
-                mv $${hib_file}__ $${hib_file} ; \
+                $(SEG_HACK) -n __HIB -o $${hib_file}__ $${hib_file} || exit 1; \
+                mv $${hib_file}__ $${hib_file} || exit 1; \
 	done
-	@echo LDFILELIST $(COMPONENT)
-	$(_v)( for obj in ${OBJS}; do	\
+	@echo "$(ColorL)LDFILELIST$(Color0) $(ColorLF)$(COMPONENT)$(Color0)"
+	$(_v)for obj in ${OBJS}; do	\
 		 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
-	done; ) > $(COMPONENT).filelist
+	done > $(COMPONENT).filelist
 
 do_all: $(COMPONENT).filelist
 
@@ -173,11 +183,11 @@ endif
 -include genassym.d
 genassym.o: .CFLAGS $(firstword $(MAKEFILE_LIST))
 genassym.o: $(SOURCE_DIR)/$(COMPONENT)/$(GENASSYM_LOCATION)/genassym.c
-	@echo GENASSYM $<
-	$(_v)${KCC} ${CFLAGS} ${CFLAGS_NOLTO_FLAG} -MD -S -o ${@} ${INCFLAGS} $<
+	@echo "[$(CMD_MC)] $(ColorH)GENASSYM$(Color0)      $(ColorLF)$<$(Color0)"
+	$(_v)${GENASSYM_KCC} ${CFLAGS} ${CFLAGS_NOLTO_FLAG} -MD -S -o ${@} ${INCFLAGS} $<
 
 assym.s: genassym.o
-	$(_v)sed -e '/#DEFINITION#/!d' -e 's/^.*#DEFINITION#//' -e 's/\$$//' -e 'p' -e 's/#//2' -e 's/[^A-Za-z0-9_]*\([A-Za-z0-9_]*\)/ \1_NUM/2' genassym.o > $@
+	$(_v)sed -e '/^[[:space:]]*DEFINITION__define__/!d;{N;s/\n//;}' -e 's/^[[:space:]]*DEFINITION__define__\([^:]*\):.*ascii.*\"[\$$]*\([-0-9\#]*\)\".*$$/#define \1 \2/' -e 'p'  -e 's/#//2' -e 's/^[[:space:]]*#define \([A-Za-z0-9_]*\)[[:space:]]*[\$$#]*\([-0-9]*\).*$$/#define \1_NUM \2/' genassym.o > $@
 
 ${SOBJS}: assym.s