X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/b0d623f7f2ae71ed96e60569f61f9a9a27016e80..a1c7dba18ef36983396c282fe85292db066e39db:/libkern/conf/Makefile.template?ds=inline

diff --git a/libkern/conf/Makefile.template b/libkern/conf/Makefile.template
index 005aa9ca3..5885a434c 100644
--- a/libkern/conf/Makefile.template
+++ b/libkern/conf/Makefile.template
@@ -5,16 +5,6 @@
 # the terms and conditions for use and redistribution.
 #
 
-#
-# Export IDENT for sub-makefiles
-#
-export IDENT
-
-#
-# INCFLAGS 
-#
-INCFLAGS_MAKEFILE=  
-
 export MakeInc_cmd=${SRCROOT}/makedefs/MakeInc.cmd
 export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
@@ -26,8 +16,15 @@ include $(MakeInc_def)
 #
 # CFLAGS
 #
-CFLAGS+= -imacros meta_features.h -DLIBKERN_KERNEL_PRIVATE -DOSALLOCDEBUG=1 \
-         -Werror $(CFLAGS_INLINE_CONFIG)
+CFLAGS+= -include meta_features.h -DLIBKERN_KERNEL_PRIVATE -DOSALLOCDEBUG=1
+
+# Objects that don't want -Wcast-align warning (8474835)
+OSKextLib.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSKext.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSMetaClass.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+OSUnserialize.cpo_CXXWARNFLAGS_ADD = -Wno-cast-align
+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 
@@ -40,6 +37,11 @@ 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
+
+# Runtime support functions don't interact well with LTO (9294679)
+stack_protector.o_CFLAGS_ADD += $(CFLAGS_NOLTO_FLAG)
 
 #
 # Directories for mig generated files
@@ -64,39 +66,58 @@ COMP_SUBDIRS =
 
 %CFILES
 
-%MFILES
+%CXXFILES
 
 %SFILES
 
-%BFILES
-
-%ORDERED
 %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)
+# Machine-independent per-file flags
 #
-${OBJS}: ${OBJSDEPS}
-
-
-%LOAD
 
-LDOBJS = $(OBJS)
+# 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 
 
-$(COMPONENT).o: $(LDOBJS)
+# 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))
+
+# 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} ; \
+	done
 	@echo LDFILELIST $(COMPONENT)
-	$(_v)( for obj in ${LDOBJS}; do	\
-		 echo $(TARGET)$(COMP_OBJ_DIR)/$(KERNEL_CONFIG)/$${obj}; \
-	done; ) > $(COMPONENT).o
+	$(_v)( for obj in ${OBJS}; do	\
+		 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
+	done; ) > $(COMPONENT).filelist
 
-do_all: $(COMPONENT).o
+do_all: $(COMPONENT).filelist
 
-do_depend: do_all
-	$(_v)${MD} -u Makedep -f -d `ls *.d`
-	
-do_build_all: do_depend 
+do_build_all:: do_all
 
 %RULES