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 e8a23fd21584d6e070b346d25a8db81dc98011a4..b1f41bbc2efef83b6c53dec08f2031558068e5c9 100644 (file)
--- a/osfmk/conf/Makefile.template
+++ b/osfmk/conf/Makefile.template
@@ -16,15 +16,16 @@ include $(MakeInc_def)
 #
 # XXX: CFLAGS
 #
-CFLAGS+= -include meta_features.h -DMACH_KERNEL_PRIVATE
+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         \
-               kdp.o                   \
                kdp_udp.o               \
                kdp_machdep.o           \
                host.o                  \
@@ -52,20 +53,44 @@ OBJS_NO_CAST_ALIGN =                        \
                startup64.o             \
                affinity.o              \
                sched_grrr.o            \
-               sched_fixedpriority.o   \
+               sched_proto.o           \
                stack.o                 \
                task_policy.o           \
                wait_queue.o            \
                bsd_kern.o              \
                pmc.o                   \
-               default_freezer.o       \
                status.o                \
                machine_routines.o      \
                loose_ends.o            \
-               sleh.o
-
+               fips_sha1.o             \
+               prng_yarrow.o           \
+               sha1mod.o               \
+               sleh.o                  \
+               ccdigest_final_64be.o   \
+               ccdigest_init.o         \
+               ccdigest_update.o       \
+               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 =         \
+               atm_notification_user.o
 
 $(foreach file,$(OBJS_NO_CAST_ALIGN),$(eval $(call add_perfile_cflags,$(file),-Wno-cast-align)))
+$(foreach file,$(OBJS_NO_SIGN_COMPARE),$(eval $(call add_perfile_cflags,$(file),-Wno-sign-compare)))
 
 #
 # Do not provide CTF symbolic these files
@@ -81,6 +106,7 @@ INCFLAGS_MAKEFILE= -I$(SOURCE)libsa
 # Directories for mig generated files
 #
 COMP_SUBDIRS = \
+       atm \
        default_pager \
        device \
        mach \
@@ -107,29 +133,36 @@ COMP_SUBDIRS = \
 
 %CFILES
 
+%CXXFILES
+
 %SFILES
 
 %MACHDEP
 
-#
-#  OBJSDEPS is the set of files (defined in the machine dependent
-#  template if necessary) which all objects depend on (such as an
-#  in-line assembler expansion filter)
-#
-${OBJS}: ${OBJSDEPS}
-
-LDOBJS = $(OBJS)
-
-$(COMPONENT).filelist: $(LDOBJS) assym.s
+# Rebuild if per-file overrides change
+${OBJS}: $(firstword $(MAKEFILE_LIST))
+
+# Rebuild if global compile flags change
+$(COBJS): .CFLAGS
+.CFLAGS: ALWAYS
+       $(_v)$(REPLACECONTENTS) $@ $(KCC) $(CFLAGS) $(INCFLAGS)
+$(CXXOBJS): .CXXFLAGS
+.CXXFLAGS: ALWAYS
+       $(_v)$(REPLACECONTENTS) $@ $(KC++) $(CXXFLAGS) $(INCFLAGS)
+$(SOBJS): .SFLAGS
+.SFLAGS: ALWAYS
+       $(_v)$(REPLACECONTENTS) $@ $(S_KCC) $(SFLAGS) $(INCFLAGS)
+
+$(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 ${LDOBJS}; 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
 
@@ -143,14 +176,18 @@ GENASSYM_LOCATION = $(CURRENT_ARCH_CONFIG_LC)
 
 ifeq ($(CURRENT_ARCH_CONFIG_LC),x86_64)
 GENASSYM_LOCATION = i386
+else ifeq ($(CURRENT_ARCH_CONFIG_LC),x86_64h)
+GENASSYM_LOCATION = i386
 endif
 
+-include genassym.d
+genassym.o: .CFLAGS $(firstword $(MAKEFILE_LIST))
 genassym.o: $(SOURCE_DIR)/$(COMPONENT)/$(GENASSYM_LOCATION)/genassym.c
-       @echo GENASSYM $<
-       $(_v)${KCC} $(subst -flto,,${CFLAGS}) -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