xnu-3789.1.32.tar.gz

[apple/xnu.git] / osfmk / mach / Makefile

diff --git a/osfmk/mach/Makefile b/osfmk/mach/Makefile
index 99a57a3587d2c518bab6df7775d6eeaf2d596c39..c948506ae55ea9c3df3648c93897f36d4df9e169 100644 (file)
--- a/osfmk/mach/Makefile
+++ b/osfmk/mach/Makefile
@@ -7,12 +7,16 @@ include $(MakeInc_cmd)
 include $(MakeInc_def)
 
 INSTINC_SUBDIRS = machine
 include $(MakeInc_def)
 
 INSTINC_SUBDIRS = machine

-INSTINC_SUBDIRS_ARM = arm

 INSTINC_SUBDIRS_X86_64 = i386
 INSTINC_SUBDIRS_X86_64 = i386

+INSTINC_SUBDIRS_X86_64H = i386
+INSTINC_SUBDIRS_ARM = arm arm64
+INSTINC_SUBDIRS_ARM64 = arm arm64

 
 EXPINC_SUBDIRS = machine
 EXPINC_SUBDIRS_X86_64 = i386
 
 EXPINC_SUBDIRS = machine
 EXPINC_SUBDIRS_X86_64 = i386

-EXPINC_SUBDIRS_ARM = arm
+EXPINC_SUBDIRS_X86_64H = i386
+EXPINC_SUBDIRS_ARM = arm arm64
+EXPINC_SUBDIRS_ARM64 = arm arm64

 
 MIG_TYPES = \
        clock_types.defs \
 
 MIG_TYPES = \
        clock_types.defs \


@@ -33,23 +37,24 @@ MIG_DEFS =  \
        mach_host.defs \
        mach_port.defs \
        mach_vm.defs \
        mach_host.defs \
        mach_port.defs \
        mach_vm.defs \

+       mach_voucher.defs \
+       mach_voucher_attr_control.defs \

        notify.defs \
        processor.defs \
        processor_set.defs \
        notify.defs \
        processor.defs \
        processor_set.defs \

-       security.defs \

        task.defs \
        task_access.defs \
        telemetry_notification.defs \
        thread_act.defs \
        vm_map.defs
 
        task.defs \
        task_access.defs \
        telemetry_notification.defs \
        thread_act.defs \
        vm_map.defs
 

-

 MACH_PRIVATE_DEFS = \
 MACH_PRIVATE_DEFS = \

+       coalition_notification.defs \
+       ktrace_background.defs \

        mach_notify.defs \
        mach_notify.defs \

-       memory_object.defs \

        memory_object_control.defs \
        memory_object_default.defs \
        memory_object_control.defs \
        memory_object_default.defs \

-       memory_object_name.defs \
+       sysdiagnose_notification.defs \

        upl.defs \
        vm32_map.defs
 
        upl.defs \
        vm32_map.defs
 


@@ -60,28 +65,30 @@ MACH_PRIVATE_DEFS = \
 MIG_USHDRS = \
        audit_triggers_server.h \
        clock_reply_server.h \
 MIG_USHDRS = \
        audit_triggers_server.h \
        clock_reply_server.h \

+       coalition_notification_server.h \

        exc_server.h \
        mach_exc_server.h \
        exc_server.h \
        mach_exc_server.h \

-       memory_object_server.h \

        memory_object_default_server.h \
        notify_server.h \
        task_access_server.h \
        memory_object_default_server.h \
        notify_server.h \
        task_access_server.h \

-       telemetry_notification_server.h
+       telemetry_notification_server.h \
+       sysdiagnose_notification_server.h

 
 MIG_UUHDRS = \
        clock.h \
        clock_priv.h \
        host_priv.h \
        host_security.h \
 
 MIG_UUHDRS = \
        clock.h \
        clock_priv.h \
        host_priv.h \
        host_security.h \

+       ktrace_background.h \

        lock_set.h \
        mach_host.h \
        mach_port.h \
        mach_vm.h \
        lock_set.h \
        mach_host.h \
        mach_port.h \
        mach_vm.h \

+       mach_voucher.h \
+       mach_voucher_attr_control.h \

        memory_object_control.h \
        memory_object_control.h \

-       memory_object_name.h \

        processor.h \
        processor_set.h \
        processor.h \
        processor_set.h \

-       security.h \

        task.h \
        task_access.h \
        thread_act.h \
        task.h \
        task_access.h \
        thread_act.h \


@@ -93,6 +100,7 @@ MIGINCLUDES = ${MIG_UUHDRS} ${MIG_USHDRS}
 DATAFILES = \
         boolean.h \
         clock_types.h \
 DATAFILES = \
         boolean.h \
         clock_types.h \

+        dyld_kernel.h \

         error.h \
        exception.h \
        exception_types.h \
         error.h \
        exception.h \
        exception_types.h \


@@ -106,12 +114,15 @@ DATAFILES = \
        mach_time.h \
        mach_traps.h \
         mach_types.h \
        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 \
        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 \
        ndr.h \
         notify.h \
        policy.h \


@@ -151,11 +162,38 @@ INSTALL_MI_LIST   = \
        bootstrap.h \
        ${DATAFILES}
 
        bootstrap.h \
        ${DATAFILES}
 

+# installed into System.framework's PrivateHeaders/mach subdirectory
+PRIVATE_DATAFILES = \
+       bootstrap.h \
+       coalition.h \
+       coalition_notification.defs \
+       host_info.h \
+       ktrace_background.defs \
+       mach_host.defs \
+       mach_traps.h \
+       memory_object_types.h \
+       mig.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_policy.h \
+       thread_policy.h \
+       thread_switch.h \
+       vm_prot.h
+
+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 = \
 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})
 
        mach_interface.h \
        $(filter-out mach_traps.h mach_syscalls.h thread_switch.h, ${DATAFILES})
 


@@ -165,7 +203,10 @@ INSTALL_MI_DIR = mach
 
 EXPORT_MI_LIST = \
        branch_predicates.h \
 
 EXPORT_MI_LIST = \
        branch_predicates.h \

+       coalition.h \

        mach_interface.h \
        mach_interface.h \

+       resource_monitors.h \
+       sfi_class.h \

        ${DATAFILES}
 
 EXPORT_MI_GEN_LIST = \
        ${DATAFILES}
 
 EXPORT_MI_GEN_LIST = \


@@ -177,21 +218,21 @@ ${MIGINCLUDES} : ${MIG_TYPES}
 
 ${MIG_UUHDRS} : \
        %.h : %.defs
 
 ${MIG_UUHDRS} : \
        %.h : %.defs

-       @echo MIG $@
+       @echo "$(ColorM)MIG$(Color0) $(ColorF)$@$(Color0)"

        $(_v)$(MIG) $(MIGFLAGS)         \
                -server /dev/null       \
                -user /dev/null         \
        $(_v)$(MIG) $(MIGFLAGS)         \
                -server /dev/null       \
                -user /dev/null         \

-               -header $@              \
+               -header $@              \

                $<
 
 ${MIG_USHDRS} : \
        %_server.h : %.defs
                $<
 
 ${MIG_USHDRS} : \
        %_server.h : %.defs

-       @echo MIG $@
+       @echo "$(ColorM)MIG$(Color0) $(ColorF)$@$(Color0)"

        $(_v)$(MIG) $(MIGFLAGS)         \
                -server /dev/null       \
                -user /dev/null         \
                -header /dev/null       \
        $(_v)$(MIG) $(MIGFLAGS)         \
                -server /dev/null       \
                -user /dev/null         \
                -header /dev/null       \

-               -sheader $@             \
+               -sheader $@             \

                $<
 
 #
                $<
 
 #


@@ -206,34 +247,43 @@ MIGKUFLAGS      = -DMACH_KERNEL_PRIVATE -DKERNEL_USER=1 -maxonstack 1024
 # MIG-generated headers that are traditionally used by kernel
 # level code.
 #
 # 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 \
 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 \
        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
 
        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 \
 MIG_KUSRC = \
        audit_triggers_user.c \
        clock_reply_user.c \

+       coalition_notification_user.c \

        exc_user.c \
        host_notify_reply_user.c \
        exc_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 \
        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 \
        task_access_user.c \
        telemetry_notification_user.c \
        upl_user.c \

-       vm_map_user.c
+       vm_map_user.c \
+       sysdiagnose_notification_user.c

 
 MIG_KSHDRS = \
        clock_server.h \
 
 MIG_KSHDRS = \
        clock_server.h \


@@ -247,13 +297,12 @@ MIG_KSHDRS = \
        mach_notify_server.h \
        mach_port_server.h \
        mach_vm_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_object_control_server.h \
        memory_object_default_server.h \
        memory_object_control_server.h \
        memory_object_default_server.h \

-       memory_object_name_server.h \

        processor_server.h \
        processor_set_server.h \
        processor_server.h \
        processor_set_server.h \

-       security_server.h \

        task_server.h \
        thread_act_server.h \
        upl_server.h \
        task_server.h \
        thread_act_server.h \
        upl_server.h \


@@ -272,13 +321,12 @@ MIG_KSSRC = \
        mach_notify_server.c \
        mach_port_server.c \
        mach_vm_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_object_control_server.c \
        memory_object_default_server.c \
        memory_object_control_server.c \
        memory_object_default_server.c \

-       memory_object_name_server.c \

        processor_server.c \
        processor_set_server.c \
        processor_server.c \
        processor_set_server.c \

-       security_server.c \

        task_server.c \
        thread_act_server.c \
        upl_server.c \
        task_server.c \
        thread_act_server.c \
        upl_server.c \


@@ -309,7 +357,7 @@ ${COMP_FILES} : ${MIG_TYPES}
 
 ${MIG_KUSRC} : \
        %_user.c : %.defs
 
 ${MIG_KUSRC} : \
        %_user.c : %.defs

-       @echo MIG $@
+       @echo "$(ColorM)MIG$(Color0) $(ColorF)$@$(Color0)"

        $(_v)${MIG} ${MIGFLAGS} ${MIGKUFLAGS}        \
                -user    $*_user.c              \
                -header  $*.h              \
        $(_v)${MIG} ${MIGFLAGS} ${MIGKUFLAGS}        \
                -user    $*_user.c              \
                -header  $*.h              \


@@ -319,7 +367,7 @@ ${MIG_KUSRC} : \
 
 ${MIG_KSSRC}: \
        %_server.c : %.defs
 
 ${MIG_KSSRC}: \
        %_server.c : %.defs

-       @echo MIG $@
+       @echo "$(ColorM)MIG$(Color0) $(ColorF)$@$(Color0)"

        $(_v)${MIG} ${MIGFLAGS} ${MIGKSFLAGS}        \
                -user    /dev/null              \
                -header  /dev/null              \
        $(_v)${MIG} ${MIGFLAGS} ${MIGKSFLAGS}        \
                -user    /dev/null              \
                -header  /dev/null              \