xnu-2050.7.9.tar.gz

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

diff --git a/libkern/conf/Makefile.template b/libkern/conf/Makefile.template
index 9dad4c81666a39d022bd709f5b54468e95208118..7d18485357cb908b7fb2cee076a9d641d84217c0 100644 (file)
--- a/libkern/conf/Makefile.template
+++ b/libkern/conf/Makefile.template
@@ -27,7 +27,7 @@ include $(MakeInc_def)
 # CFLAGS
 #
 CFLAGS+= -include meta_features.h -DLIBKERN_KERNEL_PRIVATE -DOSALLOCDEBUG=1 \
-       $(CFLAGS_INLINE_CONFIG)
+         $(CFLAGS_INLINE_CONFIG)
 
 # zlib is 3rd party source
 compress.o_CWARNFLAGS_ADD = -Wno-cast-qual 
@@ -41,6 +41,9 @@ uncompr.o_CWARNFLAGS_ADD = -Wno-cast-qual
 # warnings in bison-generated code
 OSUnserializeXML.cpo_CXXWARNFLAGS_ADD = -Wno-uninitialized
 
+# Runtime support functions don't interact well with LTO (9294679)
+stack_protector.o_CFLAGS_ADD += $(CFLAGS_NOLTO_FLAG)
+
 #
 # Directories for mig generated files
 #
@@ -87,10 +90,10 @@ LDOBJS = $(OBJS)
 
 $(COMPONENT).filelist: $(LDOBJS)
        $(_v)if [ $(BUILD_MACHO_OBJ) -eq 1 ]; then \
-       for hib_file in ${HIB_FILES};           \
+       for hib_file in ${HIB_FILES}; \
        do      \
-                $(SEG_HACK) __HIB $${hib_file} -o $${hib_file}__; \
-                mv $${hib_file}__ $${hib_file} ; \
+               $(SEG_HACK) __HIB $${hib_file} -o $${hib_file}__; \
+               mv $${hib_file}__ $${hib_file} ; \
        done; \
        fi
        @echo LDFILELIST $(COMPONENT)