xnu-2422.1.72.tar.gz

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

diff --git a/iokit/conf/Makefile.template b/iokit/conf/Makefile.template
index 80dfe43284445d07072cedd579ae772d47626ba8..4a72c656fb7117becbf76b73aa2851c8ac21b1cb 100644 (file)
--- a/iokit/conf/Makefile.template
+++ b/iokit/conf/Makefile.template
@@ -5,16 +5,6 @@
 # the terms and conditions for use and redistribution.
 #
 
-#
-# Export IDENT for sub-makefiles
-#
-export IDENT
-
-#
-# XXX: INCFLAGS 
-#
-INCFLAGS_MAKEFILE=  $(INCFLAGS_POSIX) -I$(SOURCE) -I$(SOURCE)include
-
 export MakeInc_cmd=${SRCROOT}/makedefs/MakeInc.cmd
 export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
@@ -26,21 +16,31 @@ include $(MakeInc_def)
 #
 # XXX: CFLAGS
 #
-CFLAGS+= -imacros meta_features.h -DKERNEL -DDRIVER_PRIVATE                            \
-       -Wall -fno-common                                       \
-       -DIOMATCHDEBUG=1 -DIOALLOCDEBUG=1                       \
-       -imacros meta_features.h $(CFLAGS_INLINE_CONFIG)
+CFLAGS+= -include meta_features.h -DDRIVER_PRIVATE             \
+       -DIOKIT_KERNEL_PRIVATE -DIOMATCHDEBUG=1 -DIOALLOCDEBUG=1
 #-DIOKITDEBUG=-1
 
-CWARNFLAGS   += -Wno-unused-parameter -Wno-redundant-decls -Wno-nested-externs -Wno-write-strings
-MWARNFLAGS   += -Wno-unused-parameter -Wno-redundant-decls -Wno-nested-externs -Wno-write-strings
-CXXWARNFLAGS += -Wno-unused-parameter -Wno-redundant-decls -Wno-write-strings -Wno-cast-qual -Wno-shadow
+CWARNFLAGS   = $(CWARNFLAGS_STD) -Wno-unused-parameter
+CXXWARNFLAGS = $(CXXWARNFLAGS_STD) -Wno-unused-parameter -Wno-cast-qual -Wno-shadow
+
+# Objects that don't want -Wcast-align warning (8474835)
+IOHibernateRestoreKernel.o_CWARNFLAGS_ADD = -Wno-cast-align
+CXXOBJS_NO_CAST_ALIGN =                                \
+               IODMACommand.cpo                \
+               IODataQueue.cpo                 \
+               IOHibernateIO.cpo               \
+               IOMemoryDescriptor.cpo          \
+               IONVRAM.cpo                     \
+               IOPMrootDomain.cpo              \
+               IOSharedDataQueue.cpo           \
+               IOUserClient.cpo
+
+$(foreach file,$(CXXOBJS_NO_CAST_ALIGN),$(eval $(call add_perfile_cxxflags,$(file),-Wno-cast-align)))
 
 CFLAGS_RELEASE += -DIOASSERT=0
+CFLAGS_DEVELOPMENT += -DIOASSERT=1
 CFLAGS_DEBUG += -DIOASSERT=1
 
-SFLAGS+= -DKERNEL
-
 #
 # Directories for mig generated files
 #
@@ -64,13 +64,8 @@ COMP_SUBDIRS =
 
 %CFILES
 
-%MFILES
-
 %SFILES
 
-%BFILES
-
-%ORDERED
 %MACHDEP
 
 #
@@ -80,28 +75,22 @@ COMP_SUBDIRS =
 #
 ${OBJS}: ${OBJSDEPS}
 
-
-%LOAD
-
 LDOBJS = $(OBJS)
 
-$(COMPONENT).o: $(LDOBJS)
-       $(_v)$(SEG_HACK) __HIB IOHibernateRestoreKernel.o -o _IOHibernateRestoreKernel.o
-       $(_v)mv _IOHibernateRestoreKernel.o IOHibernateRestoreKernel.o
-       $(_v)$(SEG_HACK) __HIB WKdmDecompress.o -o _WKdmDecompress.o
-       $(_v)mv _WKdmDecompress.o WKdmDecompress.o
+$(COMPONENT).filelist: $(LDOBJS)
+       $(_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
+                echo $(TARGET)/$(CURRENT_KERNEL_CONFIG)/$${obj}; \
+       done; ) > $(COMPONENT).filelist
 
-do_depend: do_all
-       $(_v)${MD} -u Makedep -f -d `ls *.d`
-       
-       
-do_all: $(COMPONENT).o
+do_all: $(COMPONENT).filelist
 
-do_build_all: do_depend
+do_build_all:: do_all
 
 %RULES