X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/39236c6e673c41db228275375ab7fdb0f837b292..2a1bd2d3eef5c7a7bb14f4bb9fdbca9a96ee4752:/pexpert/conf/Makefile.template

diff --git a/pexpert/conf/Makefile.template b/pexpert/conf/Makefile.template
index 7a8e0038d..92b00f7ac 100644
--- a/pexpert/conf/Makefile.template
+++ b/pexpert/conf/Makefile.template
@@ -17,14 +17,12 @@ include $(MakeInc_def)
 # CFLAGS
 #
 CFLAGS+= -include meta_features.h -DPEXPERT_KERNEL_PRIVATE
-
-# Objects that don't want -Wcast-align warning (8474835)
-pe_identify_machine.o_CWARNFLAGS_ADD = -Wno-cast-align
+SFLAGS+= -include meta_features.h
 
 #
 # Directories for mig generated files
 #
-COMP_SUBDIRS = 
+COMP_SUBDIRS =
 
 #
 #  Make sure we don't remove this by accident if interrupted at the wrong
@@ -44,24 +42,50 @@ 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)
+# Diagnostic opt-outs.  We need to make this list empty.
 #
-${OBJS}: ${OBJSDEPS}
-
-LDOBJS = $(OBJS)
-
-$(COMPONENT).filelist: $(LDOBJS)
-	@echo LDFILELIST $(COMPONENT)
-	$(_v)( for obj in ${LDOBJS}; do	\
-		 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
-	done; ) > $(COMPONENT).filelist
+# DO NOT ADD MORE HERE.
+#
+# -Wno-cast-align
+pe_identify_machine.o_CFLAGS_ADD += -Wno-cast-align
+# -Wno-implicit-int-conversion
+pe_serial.o_CFLAGS_ADD += -Wno-implicit-int-conversion
+# -Wno-shorten-64-to-32
+pe_identify_machine.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+pe_init.o_CFLAGS_ADD += -Wno-shorten-64-to-32
+# -Wno-sign-conversion
+bootargs.o_CFLAGS_ADD += -Wno-sign-conversion
+device_tree.o_CFLAGS_ADD += -Wno-sign-conversion
+pe_identify_machine.o_CFLAGS_ADD += -Wno-sign-conversion
+pe_init.o_CFLAGS_ADD += -Wno-sign-conversion
+pe_serial.o_CFLAGS_ADD += -Wno-sign-conversion
+
+# 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)
+	@$(LOG_LDFILELIST) "$(COMPONENT)"
+	$(_v)for obj in ${OBJS}; do	\
+		 $(ECHO) $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
+	done > $(COMPONENT).filelist
 
 do_all: $(COMPONENT).filelist