xnu-2050.48.11.tar.gz

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

diff --git a/osfmk/conf/Makefile.x86_64 b/osfmk/conf/Makefile.x86_64
index d24ace3bf8da386fb355cd5bce7ad0a9331833b5..2a4eb03ffc0d687291567fed9a5a993c6e4f0afc 100644 (file)
--- a/osfmk/conf/Makefile.x86_64
+++ b/osfmk/conf/Makefile.x86_64
@@ -2,32 +2,7 @@
 #BEGIN Machine dependent Makefile fragment for x86_64
 ######################################################################
 
-CFLAGS+= -DAT386=1
-SFLAGS+= -DAT386=1
-
-CFLAGS+= $(WERROR) -Wshorten-64-to-32
-CWARNFLAGS= $(filter-out -Wbad-function-cast, $(CWARNFLAGS_STD))
-
-# Objects that don't compile cleanly:
-OBJS_NO_WERROR=                                \
-       UNDRequest.o                    \
-       db_examine.o                    \
-       db_macro.o                      \
-       db_print.o                      \
-       db_sym.o                        \
-       db_variables.o                  \
-       db_disasm.o                     \
-       db_interface.o                  \
-       db_trace.o                      \
-       host_priv_server.o \
-       mach_host_server.o \
-       security_server.o \
-       device_server.o \
-       gssd_mach.o \
-
-OBJS_WERROR=$(filter-out $(OBJS_NO_WERROR),$(OBJS))
-
-$(OBJS_WERROR):                WERROR=-Werror
+CWARNFLAGS = $(CWARNFLAGS_STD) -Wshorten-64-to-32
 
 # Files that must go in the __HIB segment:
 UNCONFIGURED_HIB_FILES=                                        \
@@ -36,6 +11,9 @@ UNCONFIGURED_HIB_FILES=                                       \
 
 HIB_FILES=$(filter $(UNCONFIGURED_HIB_FILES),$(OBJS))
 
+hibernate_restore.o_CFLAGS_ADD += -fno-stack-protector
+hibernate_bootstrap.o_CFLAGS_ADD += -fno-stack-protector
+
 ######################################################################
 #END   Machine dependent Makefile fragment for x86_64
 ######################################################################