xnu-7195.101.1.tar.gz

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

diff --git a/iokit/conf/Makefile.x86_64 b/iokit/conf/Makefile.x86_64
index 09b0c0b713c42a1ab71d3f802c727b2b55b719b6..25cc81936b0fbf30110e0675115031b26393b5e2 100644 (file)
--- a/iokit/conf/Makefile.x86_64
+++ b/iokit/conf/Makefile.x86_64
@@ -1,26 +1,21 @@
 ######################################################################
 #BEGIN  Machine dependent Makefile fragment for x86_64
 ######################################################################
- 
-# Enable -Werror for x86_64 builds
-CFLAGS+= $(WERROR)
-CWARNFLAGS= $(filter-out -Wbad-function-cast, $(CWARNFLAGS_STD))
-
-# Objects that don't compile cleanly:
-#OBJS_NO_WERROR=                       \
- 
-OBJS_WERROR=$(filter-out $(OBJS_NO_WERROR),$(OBJS))
-
-$(OBJS_WERROR):                WERROR=-Werror
+#
+# XXX: CFLAGS
+#
+CWARNFLAGS   = $(CWARNFLAGS_STD) -Wno-unused-parameter  -Wshorten-64-to-32 -Wimplicit-int-conversion
+CXXWARNFLAGS = $(CXXWARNFLAGS_STD) -Wno-unused-parameter -Wno-cast-qual -Wno-shadow  -Wshorten-64-to-32 -Wimplicit-int-conversion
 
 # Files that must go in the __HIB segment:
 UNCONFIGURED_HIB_FILES=        \
-                       IOHibernateRestoreKernel.o \
-                       WKdmDecompress.o
+                       IOHibernateRestoreKernel.o
 
 HIB_FILES=$(filter $(UNCONFIGURED_HIB_FILES),$(OBJS))
 
+# Unconfigured __HIB files must be Mach-O for "setsegname"
+IOHibernateRestoreKernel.o_CFLAGS_ADD += -fno-stack-protector -fno-stack-check $(CFLAGS_NOLTO_FLAG)
+
 ######################################################################
 #END    Machine dependent Makefile fragment for x86_64
 ######################################################################
-