X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4bd07ac2140668789aa3ee8ec4dde4a3e0a3bba5..HEAD:/Makefile

diff --git a/Makefile b/Makefile
index 2a4b9ab19..9b62aadb1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 #
-# Copyright (C) 1999-2013 Apple Inc. All rights reserved.
+# Copyright (C) 1999-2020 Apple Inc. All rights reserved.
 #
-
 ifndef VERSDIR
 export VERSDIR := $(shell /bin/pwd)
 endif
@@ -18,6 +17,12 @@ endif
 ifndef SYMROOT
 export SYMROOT = $(SRCROOT)/BUILD/sym
 endif
+ifndef MallocNanoZone
+export MallocNanoZone := 1
+endif
+
+# Avoid make default rules, make becomes faster
+MAKEFLAGS+=r
 
 export MakeInc_top=${VERSDIR}/makedefs/MakeInc.top
 export MakeInc_kernel=${VERSDIR}/makedefs/MakeInc.kernel
@@ -26,71 +31,87 @@ export MakeInc_def=${VERSDIR}/makedefs/MakeInc.def
 export MakeInc_rule=${VERSDIR}/makedefs/MakeInc.rule
 export MakeInc_dir=${VERSDIR}/makedefs/MakeInc.dir
 
+
 #
 # Dispatch non-xnu build aliases to their own build
 # systems. All xnu variants start with MakeInc_top.
 #
 
-ifeq ($(findstring Libsyscall,$(RC_ProjectName)),Libsyscall)
+ifneq ($(findstring Libsyscall,$(RC_ProjectName)),)
+
+include $(MakeInc_cmd)
 
 ifeq ($(RC_ProjectName),Libsyscall_headers_Sim)
 TARGET=-target Libsyscall_headers_Sim
 endif
 
+ifeq ($(RC_ProjectName),Libsyscall_driverkit)
+TARGET=-target Libsyscall_driverkit
+endif
+
 default: install
 
+# default to OS X
+SDKROOT ?= macosx.internal
+
 installhdrs install:
 	cd libsyscall ; \
 		xcodebuild $@ $(TARGET)	\
+			$(MAKEOVERRIDES)	\
 			"SRCROOT=$(SRCROOT)/libsyscall"					\
-			"OBJROOT=$(OBJROOT)" 						\
-			"SYMROOT=$(SYMROOT)" 						\
+			"OBJROOT=$(OBJROOT)"						\
+			"SYMROOT=$(SYMROOT)"						\
 			"DSTROOT=$(DSTROOT)"						\
 			"SDKROOT=$(SDKROOT)"
 
+Libsyscall_driverkit: install
+
+.PHONY: Libsyscall_driverkit
+
 clean:
 
 installsrc:
 	pax -rw . $(SRCROOT)
 
-else ifeq ($(RC_ProjectName),libkxld)
+else ifneq ($(findstring libkxld_host,$(RC_ProjectName)),)
 
 include $(MakeInc_cmd)
 
 default: install
 
 installhdrs install clean:
-	 $(MAKE) -C libkern/kxld $@ USE_APPLE_PB_SUPPORT=all
+	 $(MAKE) -C libkern/kxld $@ USE_APPLE_PB_SUPPORT=all PRODUCT_TYPE=ARCHIVE
 
 installsrc:
 	$(_v)$(MKDIR) $(SRCROOT)
 	$(_v)$(FIND) -x . \! \( \( -name BUILD -o -name .svn -o -name .git -o -name cscope.\* -o -name \*~ \) -prune \) -print0 | $(PAX) -rw -p a -d0 $(SRCROOT)
 	$(_v)$(CHMOD) -R go+rX $(SRCROOT)
 
-else ifeq ($(RC_ProjectName),libkxld_host)
+else ifneq ($(findstring libkxld,$(RC_ProjectName)),)
 
 include $(MakeInc_cmd)
 
 default: install
 
 installhdrs install clean:
-	 $(MAKE) -C libkern/kxld $@ USE_APPLE_PB_SUPPORT=all PRODUCT_TYPE=ARCHIVE
+	 $(MAKE) -C libkern/kxld $@ USE_APPLE_PB_SUPPORT=all
 
 installsrc:
 	$(_v)$(MKDIR) $(SRCROOT)
 	$(_v)$(FIND) -x . \! \( \( -name BUILD -o -name .svn -o -name .git -o -name cscope.\* -o -name \*~ \) -prune \) -print0 | $(PAX) -rw -p a -d0 $(SRCROOT)
 	$(_v)$(CHMOD) -R go+rX $(SRCROOT)
 
-else ifeq ($(RC_ProjectName),libkmod)
+else ifneq ($(findstring libkmod,$(RC_ProjectName)),)
 
 default: install
 
 installhdrs install:
 	cd libkern/kmod ; \
-		xcodebuild $@ 	\
+		xcodebuild $@	\
+			$(MAKEOVERRIDES)	\
 			"SRCROOT=$(SRCROOT)/libkern/kmod"				\
-			"OBJROOT=$(OBJROOT)" 						\
-			"SYMROOT=$(SYMROOT)" 						\
+			"OBJROOT=$(OBJROOT)"						\
+			"SYMROOT=$(SYMROOT)"						\
 			"DSTROOT=$(DSTROOT)"						\
 			"SDKROOT=$(SDKROOT)"
 
@@ -99,8 +120,12 @@ clean:
 installsrc:
 	pax -rw . $(SRCROOT)
 
-else ifeq ($(RC_ProjectName),xnu_quick_test)
-# This rule should be removed once rdar://22820602 is complete.
+else ifneq ($(findstring xnu_tests,$(RC_ProjectName)),)
+
+export SYSCTL_HW_PHYSICALCPU := $(shell /usr/sbin/sysctl -n hw.physicalcpu)
+export SYSCTL_HW_LOGICALCPU  := $(shell /usr/sbin/sysctl -n hw.logicalcpu)
+MAKEJOBS := --jobs=$(shell expr $(SYSCTL_HW_LOGICALCPU) + 1)
+
 default: install
 
 installhdrs:
@@ -112,13 +137,17 @@ clean:
 installsrc:
 	pax -rw . $(SRCROOT)
 
-else ifeq ($(RC_ProjectName),xnu_tests)
+else ifeq ($(RC_ProjectName),xnu_tests_driverkit)
+
+export SYSCTL_HW_PHYSICALCPU := $(shell /usr/sbin/sysctl -n hw.physicalcpu)
+export SYSCTL_HW_LOGICALCPU  := $(shell /usr/sbin/sysctl -n hw.logicalcpu)
+MAKEJOBS := --jobs=$(shell expr $(SYSCTL_HW_LOGICALCPU) + 1)
 
 default: install
 
 installhdrs:
 
-install: xnu_tests
+install: xnu_tests_driverkit
 
 clean:
 
@@ -145,35 +174,31 @@ endif
 #
 export SYSCTL_HW_PHYSICALCPU := $(shell /usr/sbin/sysctl -n hw.physicalcpu)
 export SYSCTL_HW_LOGICALCPU  := $(shell /usr/sbin/sysctl -n hw.logicalcpu)
-ifeq ($(SYSCTL_HW_PHYSICALCPU),$(SYSCTL_HW_LOGICALCPU))
-MAKEJOBS := --jobs=$(shell expr $(SYSCTL_HW_PHYSICALCPU) + 1)
-else
-MAKEJOBS := --jobs=$(SYSCTL_HW_LOGICALCPU)
-endif
-
-TOP_TARGETS = 								\
-	clean 								\
-	installsrc 							\
-	exporthdrs 							\
-	all all_desktop all_embedded					\
-	all_release_embedded all_development_embedded 			\
-	installhdrs installhdrs_desktop installhdrs_embedded 		\
-	installhdrs_release_embedded installhdrs_development_embedded 	\
-	install install_desktop install_embedded 			\
-	install_release_embedded install_development_embedded 		\
-	installopensource 						\
-	cscope tags TAGS reindent					\
+MAKEJOBS := --jobs=$(shell expr $(SYSCTL_HW_LOGICALCPU) + 1)
+
+TOP_TARGETS = \
+	clean \
+	installsrc \
+	exporthdrs \
+	all all_desktop all_embedded \
+	all_release_embedded all_development_embedded \
+	installhdrs installhdrs_desktop installhdrs_embedded \
+	installhdrs_release_embedded installhdrs_development_embedded \
+	install install_desktop install_embedded \
+	install_release_embedded install_development_embedded \
+	install_kernels \
+	cscope tags TAGS \
 	help
 
 DEFAULT_TARGET = all
 
 # Targets for internal build system debugging
-TOP_TARGETS += 						\
-	print_exports print_exports_first_build_config	\
-	setup 						\
-	build						\
-	config						\
-	install_textfiles				\
+TOP_TARGETS += \
+	print_exports print_exports_first_build_config \
+	setup \
+	build \
+	config \
+	install_textfiles \
 	install_config
 
 ifeq ($(BUILD_JSON_COMPILATION_DATABASE),1)
@@ -199,16 +224,17 @@ include $(MakeInc_cmd)
 include $(MakeInc_def)
 
 ALL_SUBDIRS = \
+	security \
 	bsd  \
 	iokit \
 	osfmk \
 	pexpert \
 	libkern \
 	libsa \
-	security \
-	config
+	config \
+	san
 
-CONFIG_SUBDIRS = config tools
+CONFIG_SUBDIRS = config tools san
 
 INSTINC_SUBDIRS = $(ALL_SUBDIRS) EXTERNAL_HEADERS
 INSTINC_SUBDIRS_X86_64 = $(INSTINC_SUBDIRS)
@@ -222,7 +248,7 @@ EXPINC_SUBDIRS_X86_64H = $(EXPINC_SUBDIRS)
 EXPINC_SUBDIRS_ARM = $(EXPINC_SUBDIRS)
 EXPINC_SUBDIRS_ARM64 = $(EXPINC_SUBDIRS)
 
-SETUP_SUBDIRS = SETUP
+SETUP_SUBDIRS = SETUP san bsd
 
 COMP_SUBDIRS_X86_64 = $(ALL_SUBDIRS)
 COMP_SUBDIRS_X86_64H = $(ALL_SUBDIRS)
@@ -231,6 +257,10 @@ COMP_SUBDIRS_ARM64 = $(ALL_SUBDIRS)
 
 INSTTEXTFILES_SUBDIRS =	\
 	bsd
+INSTTEXTFILES_SUBDIRS_X86_64 = $(INSTTEXTFILES_SUBDIRS)
+INSTTEXTFILES_SUBDIRS_X86_64H = $(INSTTEXTFILES_SUBDIRS)
+INSTTEXTFILES_SUBDIRS_ARM = $(INSTTEXTFILES_SUBDIRS)
+INSTTEXTFILES_SUBDIRS_ARM64 = $(INSTTEXTFILES_SUBDIRS)
 
 include $(MakeInc_kernel)
 include $(MakeInc_rule)
@@ -240,12 +270,35 @@ endif # CURRENT_BUILD_CONFIG
 
 endif # all other RC_ProjectName
 
-installhdrs_libkdd install_libkdd:
+installapi_libkdd installhdrs_libkdd install_libkdd:
+	cd libkdd; \
+		xcodebuild -target Default $(subst _libkdd,,$@)	\
+			$(MAKEOVERRIDES)	\
+			"SRCROOT=$(SRCROOT)/libkdd"		\
+			"OBJROOT=$(OBJROOT)"			\
+			"SYMROOT=$(SYMROOT)"			\
+			"DSTROOT=$(DSTROOT)"			\
+			"SDKROOT=$(SDKROOT)"
+
+
+installapi_libkdd_tests installhdrs_libkdd_tests install_libkdd_tests:
 	cd libkdd; \
-		xcodebuild $(subst _libkdd,,$@) 	\
+		xcodebuild -target tests $(subst _libkdd_tests,,$@)	\
+			$(MAKEOVERRIDES)	\
 			"SRCROOT=$(SRCROOT)/libkdd"		\
-			"OBJROOT=$(OBJROOT)" 			\
-			"SYMROOT=$(SYMROOT)" 			\
+			"OBJROOT=$(OBJROOT)"			\
+			"SYMROOT=$(SYMROOT)"			\
+			"DSTROOT=$(DSTROOT)"			\
+			"SDKROOT=$(SDKROOT)"
+
+
+installapi_libkdd_host installhdrs_libkdd_host install_libkdd_host:
+	cd libkdd; \
+		xcodebuild -configuration ReleaseHost -target kdd.framework $(subst _libkdd_host,,$@)	\
+			$(MAKEOVERRIDES)	\
+			"SRCROOT=$(SRCROOT)/libkdd"		\
+			"OBJROOT=$(OBJROOT)"			\
+			"SYMROOT=$(SYMROOT)"			\
 			"DSTROOT=$(DSTROOT)"			\
 			"SDKROOT=$(SDKROOT)"
 
@@ -254,14 +307,52 @@ installhdrs_libkdd install_libkdd:
 # "make xnu_tests" or via buildit/XBS with the RC_ProjectName=xnu_tests.
 # Define the target here in the outermost scope of the initial Makefile
 
-xnu_tests xnu_quick_test:
-	$(MAKE) -C $(SRCROOT)/tools/tests					\
+xnu_tests:
+	$(MAKE) -C $(SRCROOT)/tools/tests	$(if $(filter -j,$(MAKEFLAGS)),,$(MAKEJOBS)) \
 		SRCROOT=$(SRCROOT)/tools/tests
+	$(MAKE) -C $(SRCROOT)/tests	$(if $(filter -j,$(MAKEFLAGS)),,$(MAKEJOBS)) \
+		SRCROOT=$(SRCROOT)/tests
+
+xnu_tests_driverkit:
+	$(MAKE) -C $(SRCROOT)/tests/driverkit $(if $(filter -j,$(MAKEFLAGS)),,$(MAKEJOBS)) \
+		SRCROOT=$(SRCROOT)/tests/driverkit
+
+
+include $(MakeInc_cmd)
+
+#
+# The "analyze" target defined below invokes Clang Static Analyzer
+# with a predefined set of checks and options for the project.
+#
 
-# This target is defined to compile and run xnu_quick_test under testbots
-testbots:
-	$(MAKE) -C $(SRCROOT)/tools/tests/xnu_quick_test			\
-		SRCROOT=$(SRCROOT)/tools/tests/xnu_quick_test			\
-		MORECFLAGS="-DRUN_UNDER_TESTBOTS=1" 				\
-		MAKE=$(MAKE)							\
-		testbots
+# By default, analysis results are available in BUILD/StaticAnalyzer.
+# Set this variable in your make invocation to use a different directory.
+# Note that these results are only deleted when the build directory
+# is cleaned. They aren't deleted every time the analyzer is re-run,
+# but they are deleted after "make clean".
+STATIC_ANALYZER_OUTPUT_DIR ?= $(SRCROOT)/BUILD/StaticAnalyzer
+
+# By default, the default make target is analyzed. You can analyze
+# other targets by setting this variable in your make invocation.
+STATIC_ANALYZER_TARGET ?=
+
+# You can pass additional flags to scan-build by setting this variable
+# in your make invocation. For example, you can enable additional checks.
+STATIC_ANALYZER_EXTRA_FLAGS ?=
+
+analyze:
+# This is where the reports are going to be available.
+# Old reports are deleted on make clean only.
+	$(_v)$(MKDIR) $(STATIC_ANALYZER_OUTPUT_DIR)
+
+# Recursively build the requested target under scan-build.
+# Exclude checks that weren't deemed to be security critical,
+# like null pointer dereferences.
+	$(_v)$(XCRUN) $(SCAN_BUILD) -o $(STATIC_ANALYZER_OUTPUT_DIR) \
+		-disable-checker deadcode.DeadStores \
+		-disable-checker core.NullDereference \
+		-disable-checker core.DivideZero \
+		$(STATIC_ANALYZER_EXTRA_FLAGS) \
+		$(MAKE) $(STATIC_ANALYZER_TARGET) QUIET=1 2>&1 | $(GREP) "^scan-build:"
+
+.PHONY: analyze