xnu-3247.1.106.tar.gz

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

diff --git a/libsa/conf/Makefile.template b/libsa/conf/Makefile.template
index 88f2eb5a3514cb4d754084842f008b96ee560215..657ce25e76f047c70b03893c97254c64d5d1f59d 100644 (file)
--- a/libsa/conf/Makefile.template
+++ b/libsa/conf/Makefile.template
@@ -41,28 +41,37 @@ 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)
-       $(_v)for kld_file in ${LDOBJS}; do      \
-               $(SEG_HACK) -n __KLD -o $${kld_file}__ $${kld_file} ; \
-               mv $${kld_file}__ $${kld_file} ; \
+# 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)
+
+KLD_FILES = $(OBJS)
+
+$(COMPONENT).filelist: $(OBJS)
+       $(_v)for kld_file in ${KLD_FILES}; do      \
+               $(SEG_HACK) -n __KLD -o $${kld_file}__ $${kld_file} || exit 1; \
+               mv $${kld_file}__ $${kld_file} || exit 1; \
        done
        @echo LDFILELIST $(COMPONENT)
-       $(_v)( for obj in ${LDOBJS}; do \
+       $(_v)for obj in ${OBJS}; do     \
                 echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
-       done; ) > $(COMPONENT).filelist
+       done > $(COMPONENT).filelist
 
 
 do_all: $(COMPONENT).filelist
@@ -73,3 +82,10 @@ do_build_all:: do_all
 
 include $(MakeInc_rule)
 include $(MakeInc_dir)
+
+# the KLD segment is mapped read-only on arm, so if we include llvm profiling
+# here it will segfault the kernel.  (see arm_vm_init.c) We don't currently have
+# a way of retrieving these counters from KLD anyway, so there's no harm in just
+# disabling them.
+CXXFLAGS_GEN:=$(filter-out -fprofile-instr-generate,$(CXXFLAGS_GEN))
+CFLAGS_GEN:=$(filter-out -fprofile-instr-generate,$(CFLAGS_GEN))