X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/c910b4d9d2451126ae3917b931cd4390c11e1d52..bca245acd4c03fd752d1a45f011ad495e60fe53d:/osfmk/mach/Makefile?ds=sidebyside

diff --git a/osfmk/mach/Makefile b/osfmk/mach/Makefile
index 946bc45e6..310027b65 100644
--- a/osfmk/mach/Makefile
+++ b/osfmk/mach/Makefile
@@ -3,33 +3,20 @@ export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 
-
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
-INSTINC_SUBDIRS = \
-	machine
-
-INSTINC_SUBDIRS_PPC = \
-	ppc
-
-INSTINC_SUBDIRS_ARM = \
-	arm
-
-INSTINC_SUBDIRS_I386 = \
-	i386
-
-EXPINC_SUBDIRS = \
-	machine
-
-EXPINC_SUBDIRS_PPC = \
-	ppc
-
-EXPINC_SUBDIRS_I386 = \
-	i386
+INSTINC_SUBDIRS = machine
+INSTINC_SUBDIRS_X86_64 = i386
+INSTINC_SUBDIRS_X86_64H = i386
+INSTINC_SUBDIRS_ARM = arm arm64
+INSTINC_SUBDIRS_ARM64 = arm arm64
 
-EXPINC_SUBDIRS_ARM = \
-	arm
+EXPINC_SUBDIRS = machine
+EXPINC_SUBDIRS_X86_64 = i386
+EXPINC_SUBDIRS_X86_64H = i386
+EXPINC_SUBDIRS_ARM = arm arm64
+EXPINC_SUBDIRS_ARM64 = arm arm64
 
 MIG_TYPES = \
 	clock_types.defs \
@@ -45,29 +32,38 @@ MIG_DEFS =	\
 	host_notify_reply.defs \
 	host_priv.defs \
 	host_security.defs \
-	ledger.defs \
 	lock_set.defs \
 	mach_exc.defs \
 	mach_host.defs \
 	mach_port.defs \
 	mach_vm.defs \
+	mach_voucher.defs \
+	mach_voucher_attr_control.defs \
+	memory_entry.defs \
 	notify.defs \
 	processor.defs \
 	processor_set.defs \
-	security.defs \
 	task.defs \
 	task_access.defs \
+	telemetry_notification.defs \
 	thread_act.defs \
 	vm_map.defs
 
+MIG_PRIVATE_DEFS = \
+	restartable.defs
 
 MACH_PRIVATE_DEFS = \
+	coalition_notification.defs \
+	fairplayd_notification.defs \
+	arcade_upcall.defs \
+	ktrace_background.defs \
 	mach_notify.defs \
-	memory_object.defs \
 	memory_object_control.defs \
 	memory_object_default.defs \
-	memory_object_name.defs \
-	upl.defs
+	sysdiagnose_notification.defs \
+	upl.defs \
+	vfs_nspace.defs \
+	vm32_map.defs
 
 #
 # MIG-generated headers that are traditionally used by user
@@ -76,39 +72,47 @@ MACH_PRIVATE_DEFS = \
 MIG_USHDRS = \
 	audit_triggers_server.h \
 	clock_reply_server.h \
+	coalition_notification_server.h \
 	exc_server.h \
+	fairplayd_notification_server.h \
+	arcade_upcall_server.h \
 	mach_exc_server.h \
-	memory_object_server.h \
 	memory_object_default_server.h \
 	notify_server.h \
-	task_access_server.h
+	task_access_server.h \
+	telemetry_notification_server.h \
+	sysdiagnose_notification_server.h \
+	vfs_nspace_server.h
 
 MIG_UUHDRS = \
 	clock.h \
 	clock_priv.h \
 	host_priv.h \
 	host_security.h \
-	ledger.h \
+	ktrace_background.h \
 	lock_set.h \
 	mach_host.h \
 	mach_port.h \
 	mach_vm.h \
+	mach_voucher.h \
+	mach_voucher_attr_control.h \
+	memory_entry.h \
 	memory_object_control.h \
-	memory_object_name.h \
 	processor.h \
 	processor_set.h \
-	security.h \
 	task.h \
 	task_access.h \
 	thread_act.h \
 	upl.h \
-	vm_map.h
+	vm_map.h \
+	vfs_nspace.h
 
 MIGINCLUDES = ${MIG_UUHDRS} ${MIG_USHDRS}
 
 DATAFILES = \
         boolean.h \
         clock_types.h \
+        dyld_kernel.h \
         error.h \
 	exception.h \
 	exception_types.h \
@@ -122,12 +126,15 @@ DATAFILES = \
 	mach_time.h \
 	mach_traps.h \
         mach_types.h \
+	mach_voucher_types.h \
 	machine.h \
         mach_syscalls.h \
         memory_object_types.h \
         message.h \
 	mig.h \
 	mig_errors.h \
+	mig_voucher_support.h \
+	mig_strncpy_zerofill_support.h \
 	ndr.h \
         notify.h \
 	policy.h \
@@ -142,7 +149,7 @@ DATAFILES = \
 	sync_policy.h \
         syscall_sw.h \
 	task_info.h \
-	task_ledger.h \
+	task_inspect.h \
 	task_policy.h \
 	task_special_ports.h \
         thread_info.h \
@@ -168,24 +175,56 @@ INSTALL_MI_LIST	= \
 	bootstrap.h \
 	${DATAFILES}
 
+# installed into System.framework's PrivateHeaders/mach subdirectory
+PRIVATE_DATAFILES = \
+	bootstrap.h \
+	coalition.h \
+	coalition_notification.defs \
+	fairplayd_notification.defs \
+	arcade_upcall.defs \
+	host_info.h \
+	ktrace_background.defs \
+	mach_host.defs \
+	mach_traps.h \
+	memory_object_types.h \
+	mig.h \
+	mk_timer.h \
+	processor_info.h \
+	resource_notify.defs \
+	resource_monitors.h \
+	semaphore.h \
+	sfi_class.h \
+	syscall_sw.h \
+	sysdiagnose_notification.defs \
+	task_info.h \
+	task_inspect.h \
+	task_policy.h \
+	thread_policy.h \
+	thread_switch.h \
+	vfs_nspace.defs \
+	vm_prot.h \
+	${MIG_PRIVATE_DEFS}
+
+INSTALL_MI_LCL_LIST = ${PRIVATE_DATAFILES}
+
 INSTALL_KF_MI_LIST = \
 	mach_interface.h \
 	$(filter-out mach_traps.h mach_syscalls.h thread_switch.h, ${DATAFILES})
 
 INSTALL_KF_MI_LCL_LIST = \
+	coalition.h \
 	mach_interface.h \
 	$(filter-out mach_traps.h mach_syscalls.h thread_switch.h, ${DATAFILES})
 
-INSTALL_MI_LCL_LIST = kext_panic_report.h \
-	bootstrap.h \
-	${DATAFILES}
-
 INSTALL_MI_GEN_LIST =
 
 INSTALL_MI_DIR = mach
 
 EXPORT_MI_LIST	= \
+	coalition.h \
 	mach_interface.h \
+	resource_monitors.h \
+	sfi_class.h \
 	${DATAFILES}
 
 EXPORT_MI_GEN_LIST = \
@@ -193,38 +232,30 @@ EXPORT_MI_GEN_LIST = \
 
 EXPORT_MI_DIR = mach
 
-.ORDER: ${MIGINCLUDES}
-
 ${MIGINCLUDES} : ${MIG_TYPES}
 
-.ORDER: ${MIG_UUHDRS}
-
 ${MIG_UUHDRS} : \
 	%.h : %.defs
-	@echo MIG $@
+	$(call makelog,$(ColorM)MIG$(Color0) $(ColorF)$@$(Color0))
 	$(_v)$(MIG) $(MIGFLAGS)		\
 		-server /dev/null	\
 		-user /dev/null		\
-		-header $@ 		\
+		-header $@		\
 		$<
 
-.ORDER: ${MIG_USHDRS}
-
 ${MIG_USHDRS} : \
 	%_server.h : %.defs
-	@echo MIG $@
+	$(call makelog,$(ColorM)MIG$(Color0) $(ColorF)$@$(Color0))
 	$(_v)$(MIG) $(MIGFLAGS)		\
 		-server /dev/null	\
 		-user /dev/null		\
 		-header /dev/null	\
-		-sheader $@ 		\
+		-sheader $@		\
 		$<
 
 #
 # Build path
 #
-COMP_SUBDIRS_I386 = \
-	i386
 
 INCFLAGS_MAKEFILE= -I..
 
@@ -234,85 +265,100 @@ MIGKUFLAGS      = -DMACH_KERNEL_PRIVATE -DKERNEL_USER=1 -maxonstack 1024
 # MIG-generated headers that are traditionally used by kernel
 # level code.
 #
+
+# sender-side ("user") headers generated by MIG from corresponding .defs
 MIG_KUHDRS = \
 	audit_triggers.h \
 	clock_reply.h \
 	exc.h \
 	host_notify_reply.h \
+	ktrace_background.h \
 	mach_exc.h \
 	mach_notify.h \
 	memory_object.h \
 	memory_object_control.h \
 	memory_object_default.h \
+	resource_notify.h \
 	task_access.h \
 	upl.h \
 	vm_map.h
 
+# sender-side ("user") source files generated by MIG from corresponding .defs
 MIG_KUSRC = \
 	audit_triggers_user.c \
 	clock_reply_user.c \
+	coalition_notification_user.c \
 	exc_user.c \
+	fairplayd_notification_user.c \
+	arcade_upcall_user.c \
 	host_notify_reply_user.c \
+	ktrace_background_user.c \
 	mach_exc_user.c \
 	mach_notify_user.c \
 	memory_object_user.c \
 	memory_object_control_user.c \
 	memory_object_default_user.c \
+	resource_notify_user.c \
 	task_access_user.c \
+	telemetry_notification_user.c \
 	upl_user.c \
-	vm_map_user.c
+	vfs_nspace_user.c \
+	vm_map_user.c \
+	sysdiagnose_notification_user.c
 
 MIG_KSHDRS = \
+	arcade_register_server.h \
 	clock_server.h \
 	clock_priv_server.h \
 	exc_server.h \
 	host_priv_server.h \
 	host_security_server.h \
-	ledger_server.h \
 	lock_set_server.h \
 	mach_exc_server.h \
 	mach_host_server.h \
 	mach_notify_server.h \
 	mach_port_server.h \
 	mach_vm_server.h \
-	memory_object_server.h \
+	mach_voucher_server.h \
+	mach_voucher_attr_control_server.h \
+	memory_entry_server.h \
 	memory_object_control_server.h \
 	memory_object_default_server.h \
-	memory_object_name_server.h \
 	processor_server.h \
 	processor_set_server.h \
-	security_server.h \
-	semaphore_server.h \
+	restartable_server.h \
 	task_server.h \
 	thread_act_server.h \
 	upl_server.h \
-	vm_map_server.h
+	vm_map_server.h \
+	vm32_map_server.h
 
 MIG_KSSRC = \
+	arcade_register_server.c \
 	clock_server.c \
 	clock_priv_server.c \
 	exc_server.c \
 	host_priv_server.c \
 	host_security_server.c \
-	ledger_server.c \
 	lock_set_server.c \
 	mach_exc_server.c \
 	mach_host_server.c \
 	mach_notify_server.c \
 	mach_port_server.c \
 	mach_vm_server.c \
-	memory_object_server.c \
+	mach_voucher_server.c \
+	mach_voucher_attr_control_server.c \
+	memory_entry_server.c \
 	memory_object_control_server.c \
 	memory_object_default_server.c \
-	memory_object_name_server.c \
 	processor_server.c \
 	processor_set_server.c \
-	security_server.c \
-	semaphore_server.c \
+	restartable_server.c \
 	task_server.c \
 	thread_act_server.c \
 	upl_server.c \
-	vm_map_server.c
+	vm_map_server.c \
+	vm32_map_server.c
 
 #
 # JMM -
@@ -332,13 +378,13 @@ MIG_KSSRC = \
 #
 COMP_FILES = ${MIG_KUSRC} ${MIG_KSSRC}
 
+do_build_all:: $(COMP_FILES)
+
 ${COMP_FILES} : ${MIG_TYPES}
-        
-.ORDER: ${MIG_KUSRC}                           
 
 ${MIG_KUSRC} : \
 	%_user.c : %.defs
-	@echo MIG $@
+	$(call makelog,$(ColorM)MIG$(Color0) $(ColorF)$@$(Color0))
 	$(_v)${MIG} ${MIGFLAGS} ${MIGKUFLAGS}        \
 		-user    $*_user.c              \
 		-header  $*.h              \
@@ -346,11 +392,9 @@ ${MIG_KUSRC} : \
 		-sheader /dev/null		\
 		$<
 
-.ORDER: ${MIG_KSSRC}                           
-        
 ${MIG_KSSRC}: \
 	%_server.c : %.defs
-	@echo MIG $@
+	$(call makelog,$(ColorM)MIG$(Color0) $(ColorF)$@$(Color0))
 	$(_v)${MIG} ${MIGFLAGS} ${MIGKSFLAGS}        \
 		-user    /dev/null              \
 		-header  /dev/null              \