-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)))