X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/b0d623f7f2ae71ed96e60569f61f9a9a27016e80..b226f5e54a60dc81db17b1260381d7dbfea3cdf1:/makedefs/MakeInc.def?ds=sidebyside

diff --git a/makedefs/MakeInc.def b/makedefs/MakeInc.def
index 0366b6215..73f7cdc57 100644
--- a/makedefs/MakeInc.def
+++ b/makedefs/MakeInc.def
@@ -1,297 +1,367 @@
-export SOURCE=$(shell /bin/pwd)
-
+# -*- mode: makefile;-*-
+#
+# Copyright (C) 1999-2017 Apple Inc. All rights reserved.
 #
-# gnumake 3.77 support
+# MakeInc.def contains global definitions for building,
+# linking, and installing files.
 #
-export USE_APPLE_PB_SUPPORT = all
 
 #
-# Incremental Build option
+# Architecture Configuration options
 #
-ifndef INCR_EXPORTHDRS
-ifeq ($(shell test -d $$OBJROOT/EXPORT_HDRS;echo $$?),0)
-export INCR_EXPORTHDRS	= TRUE
-else
-export INCR_EXPORTHDRS	= FALSE
-endif
-endif
-
+SUPPORTED_ARCH_CONFIGS := X86_64 X86_64H ARM ARM64
 
 #
-# Component List
+# Kernel Configuration options
 #
-ifndef COMPONENT_LIST 
-export COMPONENT_LIST 	= osfmk bsd libkern iokit pexpert libsa security
-export COMPONENT_LIST_UC := $(shell printf "%s" "$(COMPONENT_LIST)" | $(TR) a-z A-Z)
-endif
-ifndef	COMPONENT
-export COMPONENT 	:= $(firstword $(subst /, ,$(shell $(RELPATH) $(SRCROOT) $(SOURCE))))
-export COMPONENT_IMPORT_LIST := $(filter-out $(COMPONENT),$(COMPONENT_LIST)) 
-else
-ifeq	($(COMPONENT), .)
-export COMPONENT        := $(firstword $(subst /, ,$(shell $(RELPATH) $(SRCROOT) $(SOURCE))))
-export COMPONENT_IMPORT_LIST := $(filter-out $(COMPONENT),$(COMPONENT_LIST)) 
-endif
-endif
+SUPPORTED_KERNEL_CONFIGS = RELEASE DEVELOPMENT DEBUG PROFILE KASAN
 
-# Architecture options
 #
-ifndef SUPPORTED_ARCH_CONFIGS
-export SUPPORTED_ARCH_CONFIGS = PPC I386 X86_64 ARM
-endif
+# Machine Configuration options
+#
 
-ifndef ARCH_CONFIGS
-ifdef RC_ARCHS
-export ARCH_CONFIGS 	:= $(shell printf "%s" "$(RC_ARCHS)" | $(TR) a-z A-Z)
-else
-export ARCH_CONFIGS 	:= $(shell arch | $(TR) a-z A-Z)
-endif
-endif
-ifdef	ARCH_CONFIG
-ifndef ARCH_CONFIG_LC
-export ARCH_CONFIG_LC 	:= $(shell printf "%s" "$(ARCH_CONFIG)" | $(TR) A-Z a-z)
-endif
-endif
+SUPPORTED_X86_64_MACHINE_CONFIGS = NONE
+SUPPORTED_X86_64H_MACHINE_CONFIGS = NONE
 
-#
-# Kernel Configuration options  
-#
-ifndef SUPPORTED_KERNEL_CONFIGS
-export SUPPORTED_KERNEL_CONFIGS = RELEASE DEVELOPMENT DEBUG PROFILE
-endif
+SUPPORTED_ARM_MACHINE_CONFIGS = S7002 T8002 T8004
+SUPPORTED_ARM64_MACHINE_CONFIGS = S5L8960X T7000 T7001 S8000 S8001 T8010 T8011 BCM2837
 
-ifndef DEFAULT_KERNEL_CONFIG
-ifeq ($(RC_ProjectName),xnu_debug)
-export DEFAULT_KERNEL_CONFIG = DEBUG
-else
-export DEFAULT_KERNEL_CONFIG = RELEASE
-endif
-endif
 
-# If KERNEL_CONFIGS is specified it should override KERNEL_CONFIG.
-# If KERNEL_CONFIG is specified it will override the default. Will quit with
-# error if more than one config is specified.
-# If DEFAULT_KERNEL_CONFIG is not specified then it will be built RELEASE.
-ifndef KERNEL_CONFIGS
-	ifndef KERNEL_CONFIG
-	export KERNEL_CONFIGS 	= $(DEFAULT_KERNEL_CONFIG)
-	else
-	export KERNEL_CONFIGS	= $(KERNEL_CONFIG)
-	endif
-endif
+#
+# Setup up *_LC variables during recursive invocations
+#
 
-ifndef KERNEL_CONFIG
-export KERNEL_CONFIG 	= $(firstword $(KERNEL_CONFIGS))
+ifndef CURRENT_ARCH_CONFIG_LC
+	export CURRENT_ARCH_CONFIG_LC	:= $(shell printf "%s" "$(CURRENT_ARCH_CONFIG)" | $(TR) A-Z a-z)
 endif
 
-ifneq ($(words $(KERNEL_CONFIG)), 1)
-$(error There were $(words $(KERNEL_CONFIG)) parameters passed to KERNEL_CONFIG = $(KERNEL_CONFG). \
-		Are you sure? To specify multiple configurations please use KERNEL_CONFIGS)
+ifndef CURRENT_KERNEL_CONFIG_LC
+	export CURRENT_KERNEL_CONFIG_LC := $(shell printf "%s" "$(CURRENT_KERNEL_CONFIG)" | $(TR) A-Z a-z)
 endif
 
-ifndef MACHINE_CONFIG
-export MACHINE_CONFIG 	= DEFAULT
+ifndef CURRENT_MACHINE_CONFIG_LC
+	export CURRENT_MACHINE_CONFIG_LC := $(shell printf "%s" "$(CURRENT_MACHINE_CONFIG)" | $(TR) A-Z a-z)
 endif
 
-
-#
-# Target configuration options.  NOTE - target configurations will 
-# override ARCH_CONFIGS and KERNEL_CONFIGS.
-#
-# Target configs come in groups of three parameters.  The first is the 
-# kernel configuration, the second is the architecture configuration,
-# and the third is the machine configuration.  You may pass in as
-# many groups of configurations as you wish.  Each item passed in is
-# seperated by whitespace.
-#
-# Example:
-#	TARGET_CONFIGS="release ppc default debug i386 default release arm MX31ADS"
-# Parameters may be in upper or lower case (they are converted to upper).
-#
-# "default" parameter is a special case.  It means use the default value for 
-# that parameter.  Here are the default values for each configuration:
 #
-# default kernel configuration = DEFAULT_KERNEL_CONFIG
-# default architecture configuration = system architecture where you are running make.
-# default machine configuration for ppc = none at this time.
-# default machine configuration for i386 = none at this time.
-# default machine configuration for x86_64 = none at this time.
-# default machine configuration for arm = "S5L8900X".
+# Component List
 #
-ifndef TARGET_CONFIGS_UC
-ifdef TARGET_CONFIGS
-	export TARGET_CONFIGS_UC := $(strip $(shell printf "%s" "$(TARGET_CONFIGS)" | $(TR) a-z A-Z))
-	export MACHINE_CONFIG	= $(word 3, $(TARGET_CONFIGS_UC))
-	export DEFAULT_KERNEL_CONFIG = $(word 1, $(TARGET_CONFIGS_UC))
+COMPONENT_LIST	= osfmk bsd libkern iokit pexpert libsa security san
+COMPONENT	= $(if $(word 2,$(subst /, ,$(RELATIVE_SOURCE_PATH))),$(word 2,$(subst /, ,$(RELATIVE_SOURCE_PATH))),$(firstword $(subst /, ,$(RELATIVE_SOURCE_PATH))))
+COMPONENT_IMPORT_LIST = $(filter-out $(COMPONENT),$(COMPONENT_LIST))
+
+MACHINE_FLAGS_ARM64_S5L8960X = -DARM64_BOARD_CONFIG_S5L8960X
+MACHINE_FLAGS_ARM64_T7000 = -DARM64_BOARD_CONFIG_T7000
+MACHINE_FLAGS_ARM64_T7001 = -DARM64_BOARD_CONFIG_T7001
+MACHINE_FLAGS_ARM_S7002 = -DARM_BOARD_CONFIG_S7002
+MACHINE_FLAGS_ARM64_S8000 = -DARM64_BOARD_CONFIG_S8000
+MACHINE_FLAGS_ARM64_S8001 = -DARM64_BOARD_CONFIG_S8001
+MACHINE_FLAGS_ARM_T8002 = -DARM_BOARD_CONFIG_T8002
+MACHINE_FLAGS_ARM_T8004 = -DARM_BOARD_CONFIG_T8004
+MACHINE_FLAGS_ARM64_T8010 = -DARM64_BOARD_CONFIG_T8010 -mcpu=hurricane
+MACHINE_FLAGS_ARM64_T8011 = -DARM64_BOARD_CONFIG_T8011 -mcpu=hurricane
+MACHINE_FLAGS_ARM64_BCM2837 = -DARM64_BOARD_CONFIG_BCM2837
+
+
+#
+# Deployment target flag
+#
+ifeq ($(PLATFORM),MacOSX)
+    DEPLOYMENT_TARGET_FLAGS = -mmacosx-version-min=$(SDKVERSION)
+    DEPLOYMENT_LINKER_FLAGS = -Wl,-macosx_version_min,$(SDKVERSION)
+else ifeq ($(PLATFORM),WatchOS)
+    DEPLOYMENT_TARGET_FLAGS = -mwatchos-version-min=$(SDKVERSION) -DXNU_TARGET_OS_WATCH
+    DEPLOYMENT_LINKER_FLAGS =
+else ifeq ($(PLATFORM),tvOS)
+    DEPLOYMENT_TARGET_FLAGS = -mtvos-version-min=$(SDKVERSION)
+    DEPLOYMENT_LINKER_FLAGS =
+else ifeq ($(PLATFORM),AppleTVOS)
+    DEPLOYMENT_TARGET_FLAGS = -mtvos-version-min=$(SDKVERSION)
+else ifeq ($(PLATFORM),BridgeOS)
+    DEPLOYMENT_TARGET_FLAGS = -mbridgeos-version-min=$(SDKVERSION) -DXNU_TARGET_OS_BRIDGE
+    DEPLOYMENT_LINKER_FLAGS =
+else ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
+    DEPLOYMENT_TARGET_FLAGS = -miphoneos-version-min=$(SDKVERSION)
+    DEPLOYMENT_LINKER_FLAGS = -Wl,-ios_version_min,$(SDKVERSION)
+else ifneq ($(filter $(SUPPORTED_SIMULATOR_PLATFORMS),$(PLATFORM)),)
+    DEPLOYMENT_TARGET_FLAGS =
+    DEPLOYMENT_LINKER_FLAGS =
 else
-	# generate TARGET_CONFIGS using KERNEL_CONFIGS and ARCH_CONFIGS and MACHINE_CONFIG (which defaults to "DEFAULT")
-	temp_list = $(foreach my_kern_config, $(KERNEL_CONFIGS), $(my_kern_config) arch_slot $(MACHINE_CONFIG))
-	export TARGET_CONFIGS = $(strip $(foreach my_arch_config, $(ARCH_CONFIGS), $(subst arch_slot,$(my_arch_config),$(temp_list))))
-	export TARGET_CONFIGS_UC := $(shell printf "%s" "$(TARGET_CONFIGS)" | $(TR) a-z A-Z)
-	export MACHINE_CONFIG	= $(word 3, $(TARGET_CONFIGS_UC))
-	export DEFAULT_KERNEL_CONFIG = $(word 1, $(TARGET_CONFIGS_UC))
-endif
+    DEPLOYMENT_TARGET_FLAGS =
+    DEPLOYMENT_LINKER_FLAGS =
 endif
 
-export MACHINE_CONFIG_LC := $(shell printf "%s" "$(MACHINE_CONFIG)" | $(TR) A-Z a-z)
-export KERNEL_CONFIG_LC := $(shell printf "%s" "$(KERNEL_CONFIG)" | $(TR) A-Z a-z)
+DEPLOYMENT_TARGET_DEFINES = -DPLATFORM_$(PLATFORM)
 
-#
-# Kernel Configuration to install
-#
-#  supported install architecture : PPC I386 X86_64 ARM
-#
-export INSTALL_TYPE 	= $(DEFAULT_KERNEL_CONFIG)
-
-ifndef INSTALL_ARCHS
-export INSTALL_ARCHS 	= $(strip $(foreach my_config, $(SUPPORTED_ARCH_CONFIGS), $(findstring $(my_config), $(TARGET_CONFIGS_UC))))
-export INSTALL_ARCHS_LC := $(shell printf "%s" "$(INSTALL_ARCHS)" | $(TR) A-Z a-z)
-endif
-
-export INSTALL_ARCH_DEFAULT	= $(firstword $(INSTALL_ARCHS))
 
 #
 # Standard defines list
 #
-export DEFINES = -DAPPLE -DKERNEL -DKERNEL_PRIVATE -DXNU_KERNEL_PRIVATE -DPRIVATE -D__MACHO__=1 -Dvolatile=__volatile $(IDENT)
+DEFINES = -DAPPLE -DKERNEL -DKERNEL_PRIVATE -DXNU_KERNEL_PRIVATE \
+	-DPRIVATE -D__MACHO__=1 -Dvolatile=__volatile $(CONFIG_DEFINES) \
+	$(SEED_DEFINES)
 
 #
 # Compiler command
 #
-KCC  := $(CC)
-KC++ := $(CXX)
+KCC  = $(CC)
+KC++ = $(CXX)
+
+GENASSYM_KCC = $(CC)
 
 #
 # Compiler warning flags
 #
 
+USE_WERROR := 1
+ifneq ($(BUILD_WERROR),)
+USE_WERROR := $(BUILD_WERROR)
+endif
+
+ifeq ($(USE_WERROR),1)
+WERROR := -Werror
+endif
+
+# Shared C/C++ warning flags
+WARNFLAGS_STD := \
+	-Weverything \
+	-Wno-pedantic \
+	$(WERROR) \
+	-Wno-assign-enum \
+	-Wno-bad-function-cast \
+	-Wno-c++98-compat \
+	-Wno-c++-compat \
+	-Wno-conditional-uninitialized \
+	-Wno-conversion \
+	-Wnull-conversion \
+	-Wstring-conversion \
+	-Wliteral-conversion \
+	-Wnon-literal-null-conversion \
+	-Wint-conversion \
+	-Wenum-conversion  \
+	-Wfloat-conversion \
+	-Wconstant-conversion \
+	-Wpointer-bool-conversion \
+	-Wno-covered-switch-default \
+	-Wno-disabled-macro-expansion \
+	-Wno-documentation-unknown-command \
+	-Wno-format-non-iso \
+	-Wno-format-nonliteral \
+	-Wno-reserved-id-macro \
+	-Wno-language-extension-token \
+	-Wno-missing-variable-declarations \
+	-Wno-packed \
+	-Wno-padded \
+	-Wno-partial-availability \
+	-Wno-shift-sign-overflow \
+	-Wno-switch-enum \
+	-Wno-undef \
+	-Wno-unused-macros \
+	-Wno-used-but-marked-unused \
+	-Wno-variadic-macros \
+	-Wno-vla \
+	-Wno-zero-length-array
+
+WARNFLAGS_STD := $(WARNFLAGS_STD) \
+	-Wno-unknown-warning-option \
+	-Wno-error=shadow-field \
+	-Wno-error=cast-qual
+
 CWARNFLAGS_STD = \
-	-Wall -Wno-format-y2k -W -Wstrict-prototypes -Wmissing-prototypes \
-	-Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch \
-	-Wshadow -Wcast-align -Wchar-subscripts -Winline \
-	-Wnested-externs -Wredundant-decls
+	$(WARNFLAGS_STD)
 
+# Can be overridden in Makefile.template or Makefile.$arch
 export CWARNFLAGS ?= $(CWARNFLAGS_STD)
 
-CXXWARNFLAGS_STD = \
-	-Wall -Wno-format-y2k -W \
-	-Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch \
-	-Wcast-align -Wchar-subscripts -Wredundant-decls
+define add_perfile_cflags
+$(1)_CWARNFLAGS_ADD += $2
+endef
 
+CXXWARNFLAGS_STD = \
+	$(WARNFLAGS_STD) \
+	-Wno-c++98-compat-pedantic \
+	-Wno-exit-time-destructors \
+	-Wno-global-constructors \
+	-Wno-old-style-cast \
+	-Wno-zero-as-null-pointer-constant
+
+# Can be overridden in Makefile.template or Makefile.$arch
 export CXXWARNFLAGS ?= $(CXXWARNFLAGS_STD)
 
-
-#
-# Setup for parallel sub-makes based on 2 times number of logical CPUs
-#
-ifndef MAKEJOBS
-export MAKEJOBS = --jobs=$(shell expr `/usr/sbin//sysctl -n hw.logicalcpu` \* 2)
-endif
+define add_perfile_cxxflags
+$(1)_CXXWARNFLAGS_ADD += $2
+endef
 
 #
 # Default ARCH_FLAGS, for use with compiler/linker/assembler/mig drivers
 
-ARCH_FLAGS_PPC		  = -arch ppc
-ARCH_FLAGS_I386		  = -arch i386
 ARCH_FLAGS_X86_64	  = -arch x86_64
-ARCH_FLAGS_ARM		  = $($(addsuffix $(MACHINE_CONFIG),ARCH_FLAGS_ARM_))
+ARCH_FLAGS_X86_64H	  = -arch x86_64h
+
+ifneq ($(filter ARM ARM64,$(CURRENT_ARCH_CONFIG)),)
+
+ifndef ARCH_STRING_FOR_CURRENT_MACHINE_CONFIG
+export ARCH_STRING_FOR_CURRENT_MACHINE_CONFIG := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) -query SELECT DISTINCT KernelMachOArchitecture FROM Targets WHERE KernelPlatform IS \"$(CURRENT_MACHINE_CONFIG_LC)\" LIMIT 1 || echo UNKNOWN )
+endif
+
+BUILD_STATIC_LINK := 1
 
-ARCH_FLAGS_ALL_PPC		= $(ARCH_FLAGS_PPC)
-ARCH_FLAGS_ALL_I386		= $(ARCH_FLAGS_I386)
-ARCH_FLAGS_ALL_X86_64		= $(ARCH_FLAGS_X86_64)
-ARCH_FLAGS_ALL_ARM		= -arch arm
+endif
 
+ARCH_FLAGS_ARM		  = -arch $(ARCH_STRING_FOR_CURRENT_MACHINE_CONFIG)
+ARCH_FLAGS_ARM64	  = -arch $(ARCH_STRING_FOR_CURRENT_MACHINE_CONFIG)
+
+#
+# Clang static analyzer flags
+#
+ANALYZER			= $(CC)
+ANALYZERPP			= $(CXX)
+ANALYZERFLAGS		= --analyze -D__clang_analyzer__
+ifneq ($(ANALYZE_FORMAT),text)
+ANALYZERFLAGS		+= -Xanalyzer -analyzer-output=html
+ANALYZERFLAGS		+= -o $(OBJROOT)/analyzer-html
+else
+ANALYZERFLAGS		+= -Xanalyzer -analyzer-output=text
+endif
+ifneq ($(ANALYZE_VERBOSE),YES)
+ANALYZERFLAGS		+= -Xclang -analyzer-disable-checker -Xclang deadcode.DeadStores
+endif
 
 #
 # Default CFLAGS
 #
-ifdef RC_CFLAGS
-export OTHER_CFLAGS	= $(subst $(addprefix -arch ,$(RC_ARCHS)),,$(RC_CFLAGS))
+ifdef RC_NONARCH_CFLAGS
+OTHER_CFLAGS = $(RC_NONARCH_CLFAGS)
 endif
 
-export DSYMBUILDDIR = ./Contents/Resources/DWARF/
+#
+# Debug info
+#
+DSYMINFODIR	= Contents
+DSYMKGMACROSDIR	= Contents/Resources
+DSYMLLDBMACROSDIR = Contents/Resources/Python
+DSYMDWARFDIR	= Contents/Resources/DWARF
+
+DEBUG_CFLAGS := -g
+BUILD_DSYM := 1
 
 #
 # We must not use -fno-keep-inline-functions, or it will remove the dtrace
 # probes from the kernel.
 #
-export CFLAGS_GEN = -static $(DEBUG_CFLAGS) -nostdinc -nostdlib \
-	-fno-builtin -finline -fno-common -msoft-float \
-	-fsigned-bitfields -fno-stack-protector $(OTHER_CFLAGS)
+CFLAGS_GEN = $(DEBUG_CFLAGS) -nostdinc \
+	-fno-builtin -fno-common \
+	-fsigned-bitfields $(OTHER_CFLAGS)
 
-ifeq ($(BUILD_STABS),1)
-export CFLAGS_GEN += -gstabs+
-export BUILD_DWARF = 0
-export BUILD_STABS = 1
-else
-export CFLAGS_GEN += -gdwarf-2
-export BUILD_DWARF = 1
-export BUILD_STABS = 0
-endif
+CFLAGS_RELEASE	=
+CFLAGS_DEVELOPMENT	=
+CFLAGS_DEBUG	=
+CFLAGS_KASAN = $(CFLAGS_DEVELOPMENT)
+CFLAGS_PROFILE	=  -pg
 
-export CFLAGS_RELEASE 	= 
-export CFLAGS_DEVELOPMENT 	=
-export CFLAGS_DEBUG 	= 
-export CFLAGS_PROFILE 	=  -pg
+CFLAGS_X86_64	= -Dx86_64 -DX86_64 -D__X86_64__ -DLP64 \
+				-DPAGE_SIZE_FIXED -mkernel -msoft-float
 
-export CFLAGS_PPC 	= -Dppc -DPPC -D__PPC__ -DPAGE_SIZE_FIXED \
-				-mno-altivec -force_cpusubtype_ALL
-export CFLAGS_I386 	= -Di386 -DI386 -D__I386__ \
-				-DPAGE_SIZE_FIXED -force_cpusubtype_ALL
-export CFLAGS_X86_64	= -Dx86_64 -DX86_64 -D__X86_64__ -DLP64 \
-				-DPAGE_SIZE_FIXED -mkernel
-export CFLAGS_ARM 	= -Darm -DARM -D__ARM__ -DPAGE_SIZE_FIXED \
-				-fno-strict-aliasing -fno-keep-inline-functions
+CFLAGS_X86_64H = $(CFLAGS_X86_64)
 
-ifeq (-arch armv7,$(ARCH_FLAGS_ARM))
-CFLAGS_ARM		+= -mthumb
-endif
-ifeq (-arch armv6,$(ARCH_FLAGS_ARM))
-CFLAGS_ARM		+= -mthumb
+CFLAGS_ARM	= -Darm -DARM -D__ARM__ -DPAGE_SIZE_FIXED \
+			-fno-strict-aliasing -D__API__=v4
+
+CFLAGS_ARM64	= -Darm64 -DARM64 -D__ARM64__ -DLP64 -DPAGE_SIZE_FIXED \
+			-fno-strict-aliasing -D__API__=v4 -mkernel
+
+CFLAGS_RELEASEX86_64 = -O2
+CFLAGS_DEVELOPMENTX86_64 = -O2
+CFLAGS_KASANX86_64 = $(CFLAGS_DEVELOPMENTX86_64)
+# No space optimization for the DEBUG kernel for the benefit of gdb:
+CFLAGS_DEBUGX86_64 = -O0
+CFLAGS_PROFILEX86_64 = -O2
+
+CFLAGS_RELEASEX86_64H = -O2
+CFLAGS_DEVELOPMENTX86_64H = -O2
+CFLAGS_KASANX86_64H = $(CFLAGS_DEVELOPMENTX86_64H)
+# No space optimization for the DEBUG kernel for the benefit of gdb:
+CFLAGS_DEBUGX86_64H = -O0
+CFLAGS_PROFILEX86_64H = -O2
+
+CFLAGS_RELEASEARM = -O2
+CFLAGS_DEVELOPMENTARM = -O2
+CFLAGS_DEBUGARM = -O0
+CFLAGS_PROFILEARM = -O2
+
+CFLAGS_RELEASEARM64 = -O2
+CFLAGS_DEVELOPMENTARM64 = -O2
+CFLAGS_KASANARM64 = $(CFLAGS_DEVELOPMENTARM64)
+CFLAGS_DEBUGARM64 = -O0
+CFLAGS_PROFILEARM64 = -O2
+
+#
+# Sanitizers Support (KASan, UBSan)
+#
+
+
+SAN=0
+
+ifeq ($(CURRENT_KERNEL_CONFIG),KASAN)
+KASAN = 1
 endif
-ifeq (-arch armv5,$(ARCH_FLAGS_ARM))
-CFLAGS_ARM		+= -mthumb
+
+ifeq ($(KASAN),1)
+SAN=1
+BUILD_LTO = 0
+KASAN_SHIFT_ARM64=0xdffffff800000000
+KASAN_SHIFT_X86_64=0xdffffe1000000000
+KASAN_SHIFT_X86_64H=$(KASAN_SHIFT_X86_64)
+KASAN_SHIFT=$($(addsuffix $(CURRENT_ARCH_CONFIG),KASAN_SHIFT_))
+CFLAGS_GEN += -DKASAN=1 -DKASAN_SHIFT=$(KASAN_SHIFT) -fsanitize=address \
+		-mllvm -asan-globals-live-support \
+		-mllvm -asan-mapping-offset=$(KASAN_SHIFT)
+
 endif
-ifeq (-arch xscale,$(ARCH_FLAGS_ARM))
-CFLAGS_ARM		+= -mthumb
+
+ifeq ($(UBSAN),1)
+SAN=1
+UBSAN_CHECKS = signed-integer-overflow shift pointer-overflow  # non-fatal (calls runtime, can return)
+UBSAN_CHECKS_FATAL =                                           # fatal (calls runtime, must not return)
+UBSAN_CHECKS_TRAP = vla-bound builtin                          # emit a trap instruction (no runtime support)
+UBSAN_DISABLED = bounds object-size
+
+ifneq ($(KASAN),1)
+UBSAN_CHECKS += alignment         # UBSan alignment + KASan code size is too large
+UBSAN_CHECKS_FATAL += unreachable # UBSan unreachable doesn't play nice with ASan (40723397)
 endif
 
-export CFLAGS_RELEASEPPC = -O2 -mcpu=750 -mmultiple
-export CFLAGS_DEVELOPMENTPPC = -O2 -mcpu=750 -mmultiple
-export CFLAGS_DEBUGPPC = -O2 -mcpu=750 -mmultiple
-export CFLAGS_PROFILEPPC = -O2 -mcpu=750 -mmultiple
+CFLAGS_GEN += -DUBSAN=1
+CFLAGS_GEN += $(foreach x,$(UBSAN_CHECKS) $(UBSAN_CHECKS_FATAL) $(UBSAN_CHECKS_TRAP),-fsanitize=$(x))
+CFLAGS_GEN += $(foreach x,$(UBSAN_CHECKS_FATAL),-fno-sanitize-recover=$(x))
+CFLAGS_GEN += $(foreach x,$(UBSAN_CHECKS_TRAP),-fsanitize-trap=$(x))
+endif
 
-export CFLAGS_RELEASEI386 = -Os
-export CFLAGS_DEVELOPMENTI386 = -Os
-export CFLAGS_DEBUGI386 = -Os
-export CFLAGS_PROFILEI386 = -Os
+ifeq ($(SAN),1)
+CFLAGS_GEN += -fsanitize-blacklist=$(OBJROOT)/san/kasan-blacklist-$(CURRENT_ARCH_CONFIG_LC)
+endif
 
-export CFLAGS_RELEASEX86_64 = -Os
-export CFLAGS_DEVELOPMENTX86_64 = -Os
-# No space optimization for the DEBUG kernel for the benefit of gdb:
-export CFLAGS_DEBUGX86_64 = -O0
-export CFLAGS_PROFILEX86_64 = -Os
-
-export CFLAGS_RELEASEARM = -O2
-export CFLAGS_DEVELOPMENTARM = -O2
-export CFLAGS_DEBUGARM = -O2
-export CFLAGS_PROFILEARM = -O2
-
-export CFLAGS 	= $(CFLAGS_GEN) \
-		  $($(addsuffix $(MACHINE_CONFIG),MACHINE_FLAGS_)) \
-		  $($(addsuffix $(ARCH_CONFIG),ARCH_FLAGS_)) \
-		  $($(addsuffix $(ARCH_CONFIG),CFLAGS_)) \
-		  $($(addsuffix $(KERNEL_CONFIG),CFLAGS_)) \
-		  $($(addsuffix $(ARCH_CONFIG), $(addsuffix $(KERNEL_CONFIG),CFLAGS_))) \
+CFLAGS	= $(CFLAGS_GEN) \
+		  $($(addsuffix $(CURRENT_MACHINE_CONFIG),MACHINE_FLAGS_$(CURRENT_ARCH_CONFIG)_)) \
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG),ARCH_FLAGS_)) \
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG),CFLAGS_)) \
+		  $($(addsuffix $(CURRENT_KERNEL_CONFIG),CFLAGS_)) \
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG), $(addsuffix $(CURRENT_KERNEL_CONFIG),CFLAGS_))) \
+		  $(DEPLOYMENT_TARGET_FLAGS) \
+		  $(DEPLOYMENT_TARGET_DEFINES) \
 		  $(DEFINES)
 
+#
 # Default C++ flags
 #
-CXXFLAGS_GEN  = -fno-rtti -fno-exceptions -fcheck-new -fapple-kext
+
+OTHER_CXXFLAGS	=
+
+CXXFLAGS_GEN  = -std=gnu++1z -fapple-kext $(OTHER_CXXFLAGS)
 
 CXXFLAGS      = $(CXXFLAGS_GEN) \
-		  $($(addsuffix $(ARCH_CONFIG),CXXFLAGS_)) \
-		  $($(addsuffix $(KERNEL_CONFIG),CXXFLAGS_))
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG),CXXFLAGS_)) \
+		  $($(addsuffix $(CURRENT_KERNEL_CONFIG),CXXFLAGS_))
 
 #
 # Assembler command
@@ -302,23 +372,26 @@ S_KCC	= $(CC)
 #
 # Default SFLAGS
 #
-export SFLAGS_GEN = -static -D__ASSEMBLER__ $(OTHER_CFLAGS)
-
-export SFLAGS_RELEASE 	= 
-export SFLAGS_DEVELOPMENT 	= 
-export SFLAGS_DEBUG 	= 
-export SFLAGS_PROFILE 	= 
-
-export SFLAGS_PPC 	= $(CFLAGS_PPC) -force_cpusubtype_ALL
-export SFLAGS_I386	= $(CFLAGS_I386)
-export SFLAGS_ARM	= $(CFLAGS_ARM)
-export SFLAGS_X86_64 	= $(CFLAGS_X86_64)
-
-export SFLAGS 	= $(SFLAGS_GEN) \
-		  $($(addsuffix $(MACHINE_CONFIG),MACHINE_FLAGS_)) \
-		  $($(addsuffix $(ARCH_CONFIG),ARCH_FLAGS_)) \
-		  $($(addsuffix $(ARCH_CONFIG),SFLAGS_)) \
-		  $($(addsuffix $(KERNEL_CONFIG),SFLAGS_)) \
+SFLAGS_GEN = -D__ASSEMBLER__ -DASSEMBLER $(OTHER_CFLAGS)
+
+SFLAGS_RELEASE	=
+SFLAGS_DEVELOPMENT	=
+SFLAGS_KASAN = $(SFLAGS_DEVELOPMENT) -DKASAN=1
+SFLAGS_DEBUG	=
+SFLAGS_PROFILE	=
+
+SFLAGS_X86_64	= $(CFLAGS_X86_64)
+SFLAGS_X86_64H	= $(CFLAGS_X86_64H)
+SFLAGS_ARM	= $(CFLAGS_ARM)
+SFLAGS_ARM64	= $(CFLAGS_ARM64)
+
+SFLAGS	= $(SFLAGS_GEN) \
+		  $($(addsuffix $(CURRENT_MACHINE_CONFIG),MACHINE_FLAGS_$(CURRENT_ARCH_CONFIG)_)) \
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG),ARCH_FLAGS_)) \
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG),SFLAGS_)) \
+		  $($(addsuffix $(CURRENT_KERNEL_CONFIG),SFLAGS_)) \
+		  $(DEPLOYMENT_TARGET_FLAGS) \
+		  $(DEPLOYMENT_TARGET_DEFINES) \
 		  $(DEFINES)
 
 #
@@ -329,138 +402,347 @@ LD	= $(KC++) -nostdlib
 #
 # Default LDFLAGS
 #
-
-export LDFLAGS_KERNEL_GEN = \
-	-static \
+# Availability of DWARF allows DTrace CTF (compressed type format) to be constructed.
+# ctf_insert creates the CTF section.  It needs reserved padding in the
+# headers for the load command segment and the CTF section structures.
+#
+LDFLAGS_KERNEL_GEN = \
+	-nostdlib \
 	-fapple-kext \
 	-Wl,-e,__start \
 	-Wl,-sectalign,__TEXT,__text,0x1000 \
 	-Wl,-sectalign,__DATA,__common,0x1000 \
 	-Wl,-sectalign,__DATA,__bss,0x1000 \
 	-Wl,-sectcreate,__PRELINK_TEXT,__text,/dev/null \
-	-Wl,-sectcreate,__PRELINK_STATE,__kernel,/dev/null \
-        -Wl,-sectcreate,__PRELINK_STATE,__kexts,/dev/null \
-	-Wl,-sectcreate,__PRELINK_INFO,__info,/dev/null
-
-# Availability of DWARF allows DTrace CTF (compressed type format) to be constructed
-ifeq ($(BUILD_DWARF),1)
-export LDFLAGS_KERNEL_GEN += \
-    -Wl,-sectcreate,__CTF,__ctf,/dev/null
-endif
-
-export LDFLAGS_KERNEL_RELEASE 	=
-export LDFLAGS_KERNEL_DEVELOPMENT 	=
-export LDFLAGS_KERNEL_DEBUG 	= 
-export LDFLAGS_KERNEL_PROFILE 	= 
-
-export LDFLAGS_KERNEL_PPC      = \
-	-force_cpusubtype_ALL \
+	-Wl,-sectcreate,__PRELINK_INFO,__info,/dev/null \
 	-Wl,-new_linker \
 	-Wl,-pagezero_size,0x0 \
-	-Wl,-segaddr,__VECTORS,0x0 \
-	-Wl,-segaddr,__HIB,0x7000  \
-	-Wl,-segaddr,__TEXT,0xe000
- 
-export LDFLAGS_KERNEL_RELEASEI386     = \
-	-Wl,-new_linker \
-	-Wl,-pagezero_size,0x0 \
-	-Wl,-segaddr,__INITPT,0x00100000 \
-	-Wl,-segaddr,__INITGDT,0x00106000 \
-	-Wl,-segaddr,__SLEEP,0x00107000 \
-	-Wl,-segaddr,__HIB,0x00108000 \
-	-Wl,-image_base,0x200000 \
-	-Wl,-seg_page_size,__TEXT,0x200000
-
-export LDFLAGS_KERNEL_DEBUGI386 = $(LDFLAGS_KERNEL_RELEASEI386)
-export LDFLAGS_KERNEL_DEVELOPMENTI386 = $(LDFLAGS_KERNEL_RELEASEI386)
-export LDFLAGS_KERNEL_PROFILEI386 = $(LDFLAGS_KERNEL_RELEASEI386)
-
-# Keep these constants in sync with the *_SEG_BASE definitions in i386/pmap.h
-export LDFLAGS_KERNEL_RELEASEX86_64   = \
-	-Wl,-new_linker \
-	-Wl,-pagezero_size,0x0 \
-	-Wl,-segaddr,__INITPT,0xffffff8000100000 \
-	-Wl,-segaddr,__INITGDT,0xffffff8000106000 \
-	-Wl,-segaddr,__SLEEP,0xffffff8000107000 \
-	-Wl,-segaddr,__HIB,0xffffff8000108000 \
-	-Wl,-image_base,0xffffff8000200000 \
-	-Wl,-seg_page_size,__TEXT,0x200000
-
-export LDFLAGS_KERNEL_DEBUGX86_64 = $(LDFLAGS_KERNEL_RELEASEX86_64)
-export LDFLAGS_KERNEL_DEVELOPMENTX86_64 = $(LDFLAGS_KERNEL_RELEASEX86_64)
-export LDFLAGS_KERNEL_PROFILEX86_64 = $(LDFLAGS_KERNEL_RELEASEX86_64)
-
-export LDFLAGS_KERNEL_ARM     = \
-	-Wl,-new_linker \
-	-Wl,-pagezero_size,0x0 \
-	-Wl,-segaddr,__HIB,0xC0000000 \
-	-Wl,-image_base,0xC0008000
-
+	-Wl,-version_load_command \
+	-Wl,-function_starts \
+	-Wl,-headerpad,152
+
+# LDFLAGS_KERNEL_SDK	= -L$(SDKROOT)/usr/local/lib/kernel -lfirehose_kernel
+LDFLAGS_KERNEL_SDK	= -L$(SDKROOT)/usr/local/lib/kernel
+
+LDFLAGS_KERNEL_RELEASE	=
+LDFLAGS_KERNEL_DEVELOPMENT     =
+LDFLAGS_KERNEL_KASAN = $(LDFLAGS_KERNEL_DEVELOPMENT)
+LDFLAGS_KERNEL_DEBUG	=
+LDFLAGS_KERNEL_PROFILE	=
+
+# KASLR static slide config:
+ifndef SLIDE
+SLIDE=0x00
+endif
+KERNEL_MIN_ADDRESS      = 0xffffff8000000000
+KERNEL_BASE_OFFSET      = 0x100000
+KERNEL_STATIC_SLIDE     = $(shell printf "0x%016x" \
+			  $$[ $(SLIDE) << 21 ])
+KERNEL_STATIC_BASE      = $(shell printf "0x%016x" \
+			  $$[ $(KERNEL_MIN_ADDRESS) + $(KERNEL_BASE_OFFSET) ])
+KERNEL_HIB_SECTION_BASE = $(shell printf "0x%016x" \
+			  $$[ $(KERNEL_STATIC_BASE) + $(KERNEL_STATIC_SLIDE) ])
+KERNEL_TEXT_BASE        = $(shell printf "0x%016x" \
+			  $$[ $(KERNEL_HIB_SECTION_BASE) + 0x100000 ])
+
+LDFLAGS_KERNEL_RELEASEX86_64 = \
+	-Wl,-pie \
+	-Wl,-segaddr,__HIB,$(KERNEL_HIB_SECTION_BASE) \
+	-Wl,-image_base,$(KERNEL_TEXT_BASE) \
+	-Wl,-seg_page_size,__TEXT,0x200000 \
+	-Wl,-sectalign,__HIB,__bootPT,0x1000 \
+	-Wl,-sectalign,__HIB,__desc,0x1000 \
+	-Wl,-sectalign,__HIB,__data,0x1000 \
+	-Wl,-sectalign,__HIB,__text,0x1000 \
+	-Wl,-sectalign,__HIB,__const,0x1000 \
+	-Wl,-sectalign,__HIB,__bss,0x1000 \
+	-Wl,-sectalign,__HIB,__common,0x1000 \
+	-Wl,-sectalign,__HIB,__llvm_prf_cnts,0x1000 \
+	-Wl,-sectalign,__HIB,__llvm_prf_names,0x1000 \
+	-Wl,-sectalign,__HIB,__llvm_prf_data,0x1000 \
+	-Wl,-sectalign,__HIB,__textcoal_nt,0x1000 \
+	-Wl,-rename_section,__DATA,__const,__CONST,__constdata \
+	-Wl,-no_zero_fill_sections \
+	$(LDFLAGS_NOSTRIP_FLAG)
+
+ifeq ($(SAN),1)
+LDFLAGS_KERNEL_RELEASEX86_64 += \
+	-Wl,-sectalign,__HIB,__cstring,0x1000
+endif
 
-export LDFLAGS_KERNEL	= $(LDFLAGS_KERNEL_GEN) \
-		  $($(addsuffix $(MACHINE_CONFIG),MACHINE_FLAGS_)) \
-		  $($(addsuffix $(ARCH_CONFIG),ARCH_FLAGS_)) \
-		  $($(addsuffix $(ARCH_CONFIG),LDFLAGS_KERNEL_)) \
-		  $($(addsuffix $(KERNEL_CONFIG),LDFLAGS_KERNEL_)) \
-		  $($(addsuffix $(ARCH_CONFIG), $(addsuffix $(KERNEL_CONFIG),LDFLAGS_KERNEL_))) \
+ifeq ($(KASAN),1)
+LDFLAGS_KERNEL_RELEASEX86_64 += \
+	-Wl,-sectalign,__HIB,__asan_globals,0x1000 \
+	-Wl,-sectalign,__HIB,__asan_liveness,0x1000 \
+	-Wl,-sectalign,__HIB,__mod_term_func,0x1000 \
+	-Wl,-rename_section,__HIB,__mod_init_func,__NULL,__mod_init_func \
+	-Wl,-rename_section,__HIB,__eh_frame,__NULL,__eh_frame
+endif
 
+# Define KERNEL_BASE_OFFSET so known at compile time:
+CFLAGS_X86_64 += -DKERNEL_BASE_OFFSET=$(KERNEL_BASE_OFFSET)
+CFLAGS_X86_64H += -DKERNEL_BASE_OFFSET=$(KERNEL_BASE_OFFSET)
+
+LDFLAGS_KERNEL_DEBUGX86_64 = $(LDFLAGS_KERNEL_RELEASEX86_64)
+LDFLAGS_KERNEL_DEVELOPMENTX86_64 = $(LDFLAGS_KERNEL_RELEASEX86_64)
+LDFLAGS_KERNEL_KASANX86_64 = $(LDFLAGS_KERNEL_RELEASEX86_64)
+LDFLAGS_KERNEL_PROFILEX86_64 = $(LDFLAGS_KERNEL_RELEASEX86_64)
+
+LDFLAGS_KERNEL_RELEASEX86_64H = $(LDFLAGS_KERNEL_RELEASEX86_64)
+LDFLAGS_KERNEL_DEBUGX86_64H = $(LDFLAGS_KERNEL_RELEASEX86_64H)
+LDFLAGS_KERNEL_DEVELOPMENTX86_64H = $(LDFLAGS_KERNEL_RELEASEX86_64H)
+LDFLAGS_KERNEL_KASANX86_64H = $(LDFLAGS_KERNEL_RELEASEX86_64H)
+LDFLAGS_KERNEL_PROFILEX86_64H = $(LDFLAGS_KERNEL_RELEASEX86_64H)
+
+# We preload ___udivmoddi4 in order to work around an issue with building
+# LTO on armv7.
+LDFLAGS_KERNEL_GENARM = \
+	-Wl,-pie \
+	-Wl,-static \
+	-Wl,-image_base,0x80001000 \
+	-Wl,-sectalign,__DATA,__const,0x1000 \
+	-Wl,-u,___udivmoddi4
+
+LDFLAGS_KERNEL_RELEASEARM     = \
+	$(LDFLAGS_KERNEL_GENARM)
+
+LDFLAGS_KERNEL_EXPORTS_RELEASEARM     = \
+	-Wl,-exported_symbols_list,$(TARGET)/all-kpi.exp
+
+LDFLAGS_KERNEL_DEVELOPMENTARM     = \
+	$(LDFLAGS_KERNEL_GENARM) \
+	$(LDFLAGS_NOSTRIP_FLAG)
+
+LDFLAGS_KERNEL_EXPORTS_DEVELOPMENTARM =
+
+LDFLAGS_KERNEL_DEBUGARM = $(LDFLAGS_KERNEL_DEVELOPMENTARM)
+LDFLAGS_KERNEL_EXPORTS_DEBUGARM = $(LDFLAGS_KERNEL_EXPORTS_DEVELOPMENTARM)
+
+# Offset image base by page to have iBoot load kernel TEXT correctly.
+# First page is used for various purposes : sleep token, reset vector.
+# We also need a 32MB offset, as this is the minimum block mapping size
+# for a 16KB page runtime, and we wish to use the first virtual block
+# to map the low globals page.  We also need another 4MB to account for
+# the address space reserved by L4 (because the reservation is not a
+# multiple of the block size in alignment/length, we will implictly map
+# it with our block mapping, and we therefore must reflect that the
+# first 4MB of the block mapping for xnu do not belong to xnu).
+# For the moment, kaliber has a unique memory layout (monitor at the top
+# of memory).  Support this by breaking 16KB on other platforms and
+# mandating 32MB alignment. Image base (i.e. __TEXT) must be 16KB
+# aligned since ld64 will link with 16KB alignment for ARM64.
+#
+# We currently offset by an additional 32MB in order to reclaim memory.
+# We need a dedicated virtual page for the low globals.  Our bootloader
+# may have a significant chunk of memory (up to an L2 entry in size)
+# that lies before the kernel.  The addition 32MB of virtual padding
+# ensures that we have enough virtual address space to map all of that
+# memory as part of the V-to-P mapping.
+# 23355738 - put __PRELINK_TEXT first. We reserve enough room
+# for 0x0000000003000000 = 48MB of kexts
+#
+# 0xfffffff000000000 (32MB range for low globals)
+# 0xfffffff002000000 (32MB range to allow for large page physical slide)
+# 0xfffffff004000000 (16KB range to reserve the first available page)
+# 0xfffffff004004000 (48MB range for kexts)
+# 0xfffffff007004000 (Start of xnu proper).
+LDFLAGS_KERNEL_GENARM64 = \
+	-Wl,-pie \
+	-Wl,-static \
+	-Wl,-segaddr,__PRELINK_TEXT,0xfffffff004004000 \
+	-Wl,-image_base,0xfffffff007004000 \
+	-Wl,-sectalign,__DATA,__const,0x4000 \
+	-Wl,-rename_section,__DATA,__mod_init_func,__DATA_CONST,__mod_init_func \
+	-Wl,-rename_section,__DATA,__mod_term_func,__DATA_CONST,__mod_term_func \
+	-Wl,-rename_section,__DATA,__const,__DATA_CONST,__const \
+	-Wl,-rename_section,__TEXT,__text,__TEXT_EXEC,__text \
+	-Wl,-rename_section,__TEXT,__stubs,__TEXT_EXEC,__stubs \
+	-Wl,-rename_section,__TEXT,initcode,__TEXT_EXEC,initcode \
+	-Wl,-sectcreate,"__PLK_TEXT_EXEC",__text,/dev/null \
+	-Wl,-sectcreate,__PRELINK_DATA,__data,/dev/null \
+	-Wl,-sectcreate,"__PLK_DATA_CONST",__data,/dev/null \
+	-Wl,-sectcreate,"__PLK_LLVM_COV",__llvm_covmap,/dev/null \
+	-Wl,-sectcreate,"__PLK_LINKEDIT",__data,/dev/null
+
+
+LDFLAGS_KERNEL_SEGARM64 ?= \
+	-Wl,-segment_order,__TEXT:__DATA_CONST:__LINKEDIT:__TEXT_EXEC:__LAST:__KLD:__DATA:__BOOTDATA
+
+LDFLAGS_KERNEL_RELEASEARM64     = \
+	$(LDFLAGS_KERNEL_GENARM64) \
+	$(LDFLAGS_KERNEL_SEGARM64)
+
+LDFLAGS_KERNEL_EXPORTS_RELEASEARM64     = \
+	-Wl,-exported_symbols_list,$(TARGET)/all-kpi.exp
+
+LDFLAGS_KERNEL_DEVELOPMENTARM64     = \
+	$(LDFLAGS_KERNEL_GENARM64) \
+	$(LDFLAGS_KERNEL_SEGARM64) \
+	$(LDFLAGS_NOSTRIP_FLAG)
+
+LDFLAGS_KERNEL_EXPORTS_DEVELOPMENTARM64 =
+
+LDFLAGS_KERNEL_KASANARM64 = $(LDFLAGS_KERNEL_DEVELOPMENTARM64)
+LDFLAGS_KERNEL_DEBUGARM64 = $(LDFLAGS_KERNEL_DEVELOPMENTARM64)
+
+LDFLAGS_KERNEL_EXPORTS_KASANARM64 = $(LDFLAGS_KERNEL_EXPORTS_DEVELOPMENTARM64)
+LDFLAGS_KERNEL_EXPORTS_DEBUGARM64 = $(LDFLAGS_KERNEL_EXPORTS_DEVELOPMENTARM64)
+
+LDFLAGS_KERNEL	= $(LDFLAGS_KERNEL_GEN) \
+		  $(LDFLAGS_KERNEL_SDK) \
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG),ARCH_FLAGS_)) \
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG),LDFLAGS_KERNEL_)) \
+		  $($(addsuffix $(CURRENT_KERNEL_CONFIG),LDFLAGS_KERNEL_)) \
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG), $(addsuffix $(CURRENT_KERNEL_CONFIG),LDFLAGS_KERNEL_))) \
+		  $(DEPLOYMENT_TARGET_FLAGS)
+
+
+LDFLAGS_KERNEL_EXPORTS   =   \
+		  $($(addsuffix $(CURRENT_ARCH_CONFIG), $(addsuffix $(CURRENT_KERNEL_CONFIG),LDFLAGS_KERNEL_EXPORTS_)))
 
 #
 # Default runtime libraries to be linked with the kernel
 #
-export LD_KERNEL_LIBS	= -lcc_kext
+LD_KERNEL_LIBS	   = -lcc_kext
+LD_KERNEL_ARCHIVES = $(LDFLAGS_KERNEL_SDK) -lfirehose_kernel
 
 #
-# Command to generate host binaries. Intentionally not
-# $(CC), which controls the target compiler
+# DTrace support
 #
-HOST_CC			= cc
+ifeq ($(CURRENT_KERNEL_CONFIG),RELEASE)
+ifneq ($(filter ARM%,$(CURRENT_ARCH_CONFIG)),)
+DO_CTFCONVERT = 0
+DO_CTFMERGE   = 0
+DO_CTFMACHO   = 0
+else
+DO_CTFCONVERT = $(SUPPORTS_CTFCONVERT)
+DO_CTFMERGE   = 1
+DO_CTFMACHO   = $(NEEDS_CTF_MACHOS)
+endif
+else
+DO_CTFCONVERT = $(SUPPORTS_CTFCONVERT)
+DO_CTFMERGE   = 1
+DO_CTFMACHO   = $(NEEDS_CTF_MACHOS)
+endif
 
 #
 # Default INCFLAGS
 #
-export INCFLAGS_IMPORT 	= $(patsubst %, -I$(OBJROOT)/EXPORT_HDRS/%, $(COMPONENT_IMPORT_LIST))
-export INCFLAGS_EXTERN 	= -I$(OBJROOT)/EXTERN_HDRS -I$(SRCROOT)/EXTERNAL_HEADERS -I$(SRCROOT)/EXTERNAL_HEADERS/bsd
-export INCFLAGS_GEN	= -I$(SRCROOT)/$(COMPONENT) -I$(OBJROOT)/EXPORT_HDRS/$(COMPONENT)
-export INCFLAGS_POSIX	= -I$(OBJROOT)/EXPORT_HDRS/bsd
-export INCFLAGS_LOCAL	= -I.
+INCFLAGS_IMPORT	= $(patsubst %, -I$(OBJROOT)/EXPORT_HDRS/%, $(COMPONENT_IMPORT_LIST))
+INCFLAGS_EXTERN	= -I$(SRCROOT)/EXTERNAL_HEADERS
+INCFLAGS_GEN	= -I$(SRCROOT)/$(COMPONENT) -I$(OBJROOT)/EXPORT_HDRS/$(COMPONENT)
+INCFLAGS_LOCAL	= -I.
+INCFLAGS_SDK	= -I$(SDKROOT)/usr/local/include/kernel
 
-export INCFLAGS 	= $(INCFLAGS_LOCAL) $(INCFLAGS_GEN) $(INCFLAGS_IMPORT) $(INCFLAGS_EXTERN) $(INCFLAGS_MAKEFILE)
+INCFLAGS	= $(INCFLAGS_LOCAL) $(INCFLAGS_GEN) $(INCFLAGS_IMPORT) $(INCFLAGS_EXTERN) $(INCFLAGS_MAKEFILE) $(INCFLAGS_SDK)
 
 #
 # Default MIGFLAGS
 #
-export MIGFLAGS	= $(DEFINES) $(INCFLAGS) $($(addsuffix $(ARCH_CONFIG),CFLAGS_)) $($(addsuffix $(ARCH_CONFIG),ARCH_FLAGS_))
+MIGFLAGS	= $(DEFINES) $(INCFLAGS) -novouchers $($(addsuffix $(CURRENT_ARCH_CONFIG),CFLAGS_)) $($(addsuffix $(CURRENT_ARCH_CONFIG),ARCH_FLAGS_)) \
+		$(DEPLOYMENT_TARGET_FLAGS)
+
+# Support for LLVM Profile Guided Optimization (PGO)
+
+ifeq ($(BUILD_PROFILE),1)
+CFLAGS_GEN += -fprofile-instr-generate -DPROFILE
+CXXFLAGS_GEN += -fprofile-instr-generate -DPROFILE
+endif
+
+ifdef USE_PROFILE
+CFLAGS_GEN += -fprofile-instr-use=$(USE_PROFILE)
+CXXFLAGS_GEN += -fprofile-instr-use=$(USE_PROFILE)
+LDFLAGS_KERNEL_GEN += -fprofile-instr-use=$(USE_PROFILE)
+
+CFLAGS_GEN += -Wno-error=profile-instr-out-of-date
+endif
+
+#
+# Support for LLVM Link Time Optimization (LTO)
+#
+# LTO can be explicitly enabled or disabled with BUILD_LTO=1|0
+# and defaults to enabled except for DEBUG kernels
+#
+# CFLAGS_NOLTO_FLAG is needed on a per-file basis (for files
+# that deal poorly with LTO, or files that must be machine
+# code *.o files for xnu to build (i.e, setsegname runs on
+# them).
+#
+# LDFLAGS_NOSTRIP_FLAG is used to support configurations that
+# do not utilize an export list.  For these configs to build,
+# we need to prevent the LTO logic from dead stripping them.
+
+LTO_ENABLED_RELEASE = 1
+LTO_ENABLED_DEVELOPMENT = 1
+LTO_ENABLED_DEBUG = 0
+LTO_ENABLED_KASAN = 0
+
+ifneq ($(BUILD_LTO),)
+USE_LTO = $(BUILD_LTO)
+else
+USE_LTO = $(LTO_ENABLED_$(CURRENT_KERNEL_CONFIG))
+endif
+
+SUPPORTS_CTFCONVERT	= 0
+ifeq ($(USE_LTO),1)
+CFLAGS_GEN	+= -flto
+CXXFLAGS_GEN	+= -flto
+LDFLAGS_KERNEL_GEN	+= -Wl,-mllvm,-inline-threshold=100 -Wl,-object_path_lto,$(TARGET)/lto.o
+LDFLAGS_NOSTRIP_FLAG = -rdynamic
+CFLAGS_NOLTO_FLAG = -fno-lto
+NEEDS_CTF_MACHOS	= 1
+else
+LDFLAGS_NOSTRIP_FLAG =
+CFLAGS_NOLTO_FLAG =
+ifneq ($(CTFCONVERT),)
+SUPPORTS_CTFCONVERT	= 1
+endif
+NEEDS_CTF_MACHOS	= 0
+endif
+
+ifeq ($(BUILD_JSON_COMPILATION_DATABASE),1)
+BUILD_DSYM	:= 0
+DO_CTFCONVERT	:= 0
+DO_CTFMERGE	:= 0
+DO_CTFMACHO	:= 0
+KCC		= $(JSONCOMPILATIONDB) $(OBJPATH)/compile_commands.json $(PWD) $< $(CC)
+KC++		= $(JSONCOMPILATIONDB) $(OBJPATH)/compile_commands.json $(PWD) $< $(CXX)
+S_KCC		= $(JSONCOMPILATIONDB) $(OBJPATH)/compile_commands.json $(PWD) $< $(CC)
+STRIP		= true
+endif
 
 #
 # Default VPATH
 #
-empty:=
-space:= $(empty) $(empty)
-export VPATH_IMPORT 	= $(subst $(space),:,$(patsubst %,$(OBJROOT)/EXPORT_HDRS/%,$(strip $(COMPONENT_IMPORT_LIST)))):
-export VPATH_EXTERN 	= $(OBJROOT)/EXTERN_HDRS:
-export VPATH_GEN	= .:$(SOURCE):
+export VPATH = .:$(SOURCE)
+
 
-export VPATH	 	= $(VPATH_GEN)$(VPATH_IMPORT)$(VPATH_EXTERN)$(VPATH_MAKEFILE)
 
 #
 # Macros that control installation of kernel and its header files
 #
 # install flags for header files
-# 
-INSTALL_FLAGS = -c -m 0444
-FILE_INSTALL_FLAGS = -c -m 0644
-DATA_INSTALL_FLAGS = -c -m 0644
+#
+INSTALL_FLAGS = -c -S -m 0444
+DATA_INSTALL_FLAGS = -c -S -m 0644
+EXEC_INSTALL_FLAGS = -c -S -m 0755
 
 #
 # Header file destinations
 #
-FRAMEDIR = System/Library/Frameworks
+FRAMEDIR = /System/Library/Frameworks
+
+SINCVERS = B
+SINCFRAME = $(FRAMEDIR)/System.framework
+SINCDIR = $(SINCFRAME)/Versions/$(SINCVERS)/Headers
+SPINCDIR = $(SINCFRAME)/Versions/$(SINCVERS)/PrivateHeaders
+SRESDIR = $(SINCFRAME)/Versions/$(SINCVERS)/Resources
+
 ifndef INCDIR
     INCDIR = /usr/include
 endif
 ifndef LCLDIR
-    LCLDIR = $(FRAMEDIR)/System.framework/Versions/B/PrivateHeaders
+    LCLDIR = $(SPINCDIR)
 endif
 
 KINCVERS = A
@@ -471,11 +753,15 @@ KRESDIR = $(KINCFRAME)/Versions/$(KINCVERS)/Resources
 
 XNU_PRIVATE_UNIFDEF = -UMACH_KERNEL_PRIVATE -UBSD_KERNEL_PRIVATE -UIOKIT_KERNEL_PRIVATE -ULIBKERN_KERNEL_PRIVATE -ULIBSA_KERNEL_PRIVATE -UPEXPERT_KERNEL_PRIVATE -UXNU_KERNEL_PRIVATE
 
-SPINCFRAME_UNIFDEF = $(XNU_PRIVATE_UNIFDEF) -UKERNEL_PRIVATE -UKERNEL -DPRIVATE -U_OPEN_SOURCE_
-SINCFRAME_UNIFDEF  = $(XNU_PRIVATE_UNIFDEF) -UKERNEL_PRIVATE -UKERNEL -UPRIVATE -D_OPEN_SOURCE_
-KPINCFRAME_UNIFDEF = $(XNU_PRIVATE_UNIFDEF) -DKERNEL_PRIVATE -DPRIVATE -DKERNEL -U_OPEN_SOURCE_
-KINCFRAME_UNIFDEF  = $(XNU_PRIVATE_UNIFDEF) -UKERNEL_PRIVATE -UPRIVATE -DKERNEL -D_OPEN_SOURCE_
 
+PLATFORM_UNIFDEF = $(foreach x,$(SUPPORTED_PLATFORMS),$(if $(filter $(PLATFORM),$(x)),-DPLATFORM_$(x) $(foreach token,$(PLATFORM_UNIFDEF_BLACKLIST_TOKENS_$(x)),-U$(token)),-UPLATFORM_$(x)))
+
+
+SPINCFRAME_UNIFDEF = $(PLATFORM_UNIFDEF) $(XNU_PRIVATE_UNIFDEF) $(SEED_DEFINES) -UKERNEL_PRIVATE -UKERNEL -DPRIVATE -U_OPEN_SOURCE_ -U__OPEN_SOURCE__
+SINCFRAME_UNIFDEF  = $(PLATFORM_UNIFDEF) $(XNU_PRIVATE_UNIFDEF) $(SEED_DEFINES) -UKERNEL_PRIVATE -UKERNEL -UPRIVATE -D_OPEN_SOURCE_ -D__OPEN_SOURCE__
+KPINCFRAME_UNIFDEF = $(PLATFORM_UNIFDEF) $(XNU_PRIVATE_UNIFDEF) $(SEED_DEFINES) -DKERNEL_PRIVATE -DPRIVATE -DKERNEL -U_OPEN_SOURCE_ -U__OPEN_SOURCE__
+KINCFRAME_UNIFDEF  = $(PLATFORM_UNIFDEF) $(XNU_PRIVATE_UNIFDEF) $(SEED_DEFINES) -UKERNEL_PRIVATE -UPRIVATE -DKERNEL -D_OPEN_SOURCE_ -D__OPEN_SOURCE__
+DATA_UNIFDEF       = $(PLATFORM_UNIFDEF) $(XNU_PRIVATE_UNIFDEF) $(SEED_DEFINES) -D_OPEN_SOURCE_ -D__OPEN_SOURCE__
 
 #
 # Compononent Header file destinations
@@ -485,40 +771,114 @@ EXPDIR = EXPORT_HDRS/$(COMPONENT)
 #
 # Strip Flags
 #
-export STRIP_FLAGS_RELEASE	= -S -x 
-export STRIP_FLAGS_DEVELOPMENT	= -S -x 
-export STRIP_FLAGS_DEBUG	= -S 
-export STRIP_FLAGS_PROFILE	= -S -x
+STRIP_FLAGS_RELEASE	= -S -x
+STRIP_FLAGS_DEVELOPMENT	= -S
+STRIP_FLAGS_KASAN = $(STRIP_FLAGS_DEVELOPMENT)
+STRIP_FLAGS_DEBUG	= -S
+STRIP_FLAGS_PROFILE	= -S -x
 
-export STRIP_FLAGS 	= $($(addsuffix $(KERNEL_CONFIG),STRIP_FLAGS_)) 
+STRIP_FLAGS	= $($(addsuffix $(CURRENT_KERNEL_CONFIG),STRIP_FLAGS_))
 
 #
 # dsymutil flags
 #
-export DSYMUTIL_FLAGS_I386 = --arch=i386
-export DSYMUTIL_FLAGS_X86_64 = --arch=x86_64
-export DSYMUTIL_FLAGS_PPC = --arch=ppc
-export DSYMUTIL_FLAGS_ARM = --arch=arm
+DSYMUTIL_FLAGS_GEN	= --minimize
 
-export DSYMUTIL_FLAGS = $($(addsuffix $(ARCH_CONFIG),DSYMUTIL_FLAGS_))
+DSYMUTIL_FLAGS_X86_64	= --arch=x86_64
+DSYMUTIL_FLAGS_X86_64H	= --arch=x86_64h
+DSYMUTIL_FLAGS_ARM	= --arch=arm
+DSYMUTIL_FLAGS_ARM64	=
+
+DSYMUTIL_FLAGS = $(DSYMUTIL_FLAGS_GEN) \
+	$($(addsuffix $(CURRENT_ARCH_CONFIG),DSYMUTIL_FLAGS_))
 
 #
 # Man Page destination
 #
-MANDIR = usr/share/man
+MANDIR = /usr/share/man
 
 #
 # DEBUG alias location
 #
-DEVELOPER_EXTRAS_DIR = AppleInternal/Developer/Extras
+DEVELOPER_EXTRAS_DIR = /AppleInternal/CoreOS/xnu_$(CURRENT_KERNEL_CONFIG_LC)
+
+#
+# mach_kernel install location
+#
+INSTALL_KERNEL_DIR = /
 
 #
-#  This must be here before any rules are possibly defined by the
-#  machine dependent makefile fragment so that a plain "make" command
-#  always works.  The config program will emit an appropriate rule to
-#  cause "all" to depend on every kernel configuration it generates.
+# new OS X install location
 #
+SYSTEM_LIBRARY_KERNELS_DIR = /System/Library/Kernels
 
-default: all
+#
+# File names in DSTROOT
+#
+
+ifeq ($(PLATFORM),MacOSX)
+KERNEL_FILE_NAME_PREFIX = kernel
+else
+KERNEL_FILE_NAME_PREFIX = mach
+endif
+
+ifeq ($(CURRENT_MACHINE_CONFIG),NONE)
+ifeq ($(CURRENT_KERNEL_CONFIG),RELEASE)
+KERNEL_FILE_NAME = $(KERNEL_FILE_NAME_PREFIX)
+KERNEL_LLDBBOOTSTRAP_NAME = $(KERNEL_FILE_NAME_PREFIX).py
+else
+KERNEL_FILE_NAME = $(KERNEL_FILE_NAME_PREFIX).$(CURRENT_KERNEL_CONFIG_LC)
+KERNEL_LLDBBOOTSTRAP_NAME = $(KERNEL_FILE_NAME_PREFIX).py
+endif
+else
+KERNEL_FILE_NAME = $(KERNEL_FILE_NAME_PREFIX).$(CURRENT_KERNEL_CONFIG_LC).$(CURRENT_MACHINE_CONFIG_LC)
+KERNEL_LLDBBOOTSTRAP_NAME = $(KERNEL_FILE_NAME_PREFIX)_$(CURRENT_KERNEL_CONFIG_LC).py
+endif
+
+CURRENT_ALIAS_MACHINE_CONFIG = $(word 4,$(subst ^, ,$(CURRENT_BUILD_CONFIG)))
+CURRENT_ALIAS_MACHINE_CONFIG_LC = $(shell printf "%s" "$(CURRENT_ALIAS_MACHINE_CONFIG)" | $(TR) A-Z a-z)
+ifneq ($(CURRENT_ALIAS_MACHINE_CONFIG),)
+ALIAS_FILE_NAME = $(KERNEL_FILE_NAME_PREFIX).$(CURRENT_KERNEL_CONFIG_LC).$(CURRENT_ALIAS_MACHINE_CONFIG_LC)
+endif
+
+#
+# System.kext pseudo-kext install location
+#
+INSTALL_EXTENSIONS_DIR = /System/Library/Extensions
+
+#
+# KDK location
+#
+INSTALL_KERNEL_SYM_DIR = /System/Library/Extensions/KDK
+
+#
+# Misc. Etc.
+#
+INSTALL_SHARE_MISC_DIR = /usr/share/misc
+INSTALL_DTRACE_SCRIPTS_DIR = /usr/lib/dtrace
+INSTALL_DTRACE_LIBEXEC_DIR = /usr/libexec/dtrace
+
+#
+# Overrides for XBS build aliases
+#
+ifeq ($(RC_ProjectName),xnu_debug)
+INSTALL_KERNEL_DIR := $(DEVELOPER_EXTRAS_DIR)
+INSTALL_KERNEL_SYM_DIR := $(DEVELOPER_EXTRAS_DIR)
+INSTALL_KERNEL_SYM_TO_KDK = 1
+INSTALL_XNU_DEBUG_FILES = 1
+else ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
+INSTALL_KERNEL_SYM_TO_KDK = 1
+USE_BINARY_PLIST = 1
+else ifneq ($(filter $(SUPPORTED_SIMULATOR_PLATFORMS),$(PLATFORM)),)
+USE_BINARY_PLIST = 1
+else ifeq ($(PLATFORM),MacOSX)
+INSTALL_KERNEL_DIR := $(SYSTEM_LIBRARY_KERNELS_DIR)
+INSTALL_KERNEL_SYM_DIR := $(SYSTEM_LIBRARY_KERNELS_DIR)
+INSTALL_KERNEL_SYM_TO_KDK = $(if $(filter YES,$(DWARF_DSYM_FILE_SHOULD_ACCOMPANY_PRODUCT)),1,0)
+endif
+
+ifeq ($(RC_ProjectName),xnu_kasan)
+INSTALL_KASAN_ONLY = 1
+endif
 
 # vim: set ft=make: