xnu-1699.24.23.tar.gz

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

diff --git a/osfmk/conf/Makefile.i386 b/osfmk/conf/Makefile.i386
index e7e996b6207f72e8855f00605af0e243f0f0986a..e232c0e32668653988b929df8f831ad1392d90fd 100644 (file)
--- a/osfmk/conf/Makefile.i386
+++ b/osfmk/conf/Makefile.i386
@@ -2,43 +2,25 @@
 #BEGIN Machine dependent Makefile fragment for i386
 ######################################################################
 
-CFLAGS+= -DAT386=1
-SFLAGS+= -DAT386=1
-
-# Enable -Werror for i386 builds
-CFLAGS+= $(WERROR)
-CWARNFLAGS= $(filter-out -Wbad-function-cast, $(CWARNFLAGS_STD))
+CWARNFLAGS = $(CWARNFLAGS_STD) -Wshorten-64-to-32
 
 # Objects that don't compile cleanly:
 OBJS_NO_WERROR=                                \
-       ioconf.o                        \
-       UNDRequest.o                    \
-       KUNCUserNotifications.o         \
-       panic_dialog.o                  \
-       panic_image.o                   \
-       rendered_numbers.o              \
-       video_console.o                 \
-       iokit_rpc.o                     \
-       subrs.o                         \
-       kdp.o                           \
-       kdp_udp.o                       \
-       bsd_kern.o                      \
-       debug.o                         \
-       kmod.o                          \
-       mk_sp.o                         \
-       printf.o                        \
-       syscall_emulation.o             \
-       mach_header.o
-
-OBJS_WERROR=$(filter-out $(OBJS_NO_WERROR),$(OBJS))
+       db_macro.o                      \
+       db_print.o                      \
+       db_sym.o                        \
+       db_variables.o                  \
+       db_disasm.o                     \
+       db_interface.o                  \
+       db_trace.o
 
-$(OBJS_WERROR):                WERROR=-Werror
+$(foreach file,$(OBJS_NO_WERROR),$(eval $(call add_perfile_cflags,$(file),-Wno-error)))
 
 # Files that must go in the __HIB segment:
-HIB_FILES=                              \
-           hibernate_restore.o          \
-           gdt.o                        \
-           idt.o
+UNCONFIGURED_HIB_FILES=                                        \
+           hibernate_restore.o
+
+HIB_FILES=$(filter $(UNCONFIGURED_HIB_FILES),$(OBJS))
 
 ######################################################################
 #END   Machine dependent Makefile fragment for i386