xnu-3247.10.11.tar.gz

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

diff --git a/osfmk/mach/Makefile b/osfmk/mach/Makefile
index eaadb00bdcfb2f46d8b67f6ee030d7d3d2c539f3..b14ee43e43ec4972046dbca887a8c5dd6d0e37a8 100644 (file)
--- a/osfmk/mach/Makefile
+++ b/osfmk/mach/Makefile
@@ -3,39 +3,20 @@ export MakeInc_def=${SRCROOT}/makedefs/MakeInc.def
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 
 export MakeInc_rule=${SRCROOT}/makedefs/MakeInc.rule
 export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 

-

 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 

-INSTINC_SUBDIRS = \
-       machine
-
-INSTINC_SUBDIRS_PPC = \
-       ppc
-
-INSTINC_SUBDIRS_ARM = \
-       arm
-
-INSTINC_SUBDIRS_I386 = \
-       i386
-
-INSTINC_SUBDIRS_X86_64 = \
-       i386
-
-EXPINC_SUBDIRS = \
-       machine
+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_PPC = \
-       ppc
-
-EXPINC_SUBDIRS_I386 = \
-       i386
-
-EXPINC_SUBDIRS_X86_64 = \
-       i386
-
-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 \
 
 MIG_TYPES = \
        clock_types.defs \


@@ -51,28 +32,30 @@ MIG_DEFS =  \
        host_notify_reply.defs \
        host_priv.defs \
        host_security.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 \
        lock_set.defs \
        mach_exc.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 \
        task.defs \
        task_access.defs \

+       telemetry_notification.defs \

        thread_act.defs \
        vm_map.defs
 
 
 MACH_PRIVATE_DEFS = \
        thread_act.defs \
        vm_map.defs
 
 
 MACH_PRIVATE_DEFS = \

+       coalition_notification.defs \

        mach_notify.defs \
        memory_object.defs \
        memory_object_control.defs \
        memory_object_default.defs \
        mach_notify.defs \
        memory_object.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
 


@@ -83,28 +66,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 \
        memory_object_server.h \
        memory_object_default_server.h \
        notify_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
+       task_access_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 \

-       ledger.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 \


@@ -129,12 +114,14 @@ 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 \

        ndr.h \
         notify.h \
        policy.h \
        ndr.h \
         notify.h \
        policy.h \


@@ -149,7 +136,6 @@ DATAFILES = \
        sync_policy.h \
         syscall_sw.h \
        task_info.h \
        sync_policy.h \
         syscall_sw.h \
        task_info.h \

-       task_ledger.h \

        task_policy.h \
        task_special_ports.h \
         thread_info.h \
        task_policy.h \
        task_special_ports.h \
         thread_info.h \


@@ -175,11 +161,34 @@ INSTALL_MI_LIST   = \
        bootstrap.h \
        ${DATAFILES}
 
        bootstrap.h \
        ${DATAFILES}
 

+PRIVATE_DATAFILES = \
+       bootstrap.h \
+       coalition.h \
+       coalition_notification.defs \
+       host_info.h \
+       mach_host.defs \
+       mach_traps.h \
+       memory_object_types.h \
+       mig.h \
+       processor_info.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})
 


@@ -188,7 +197,10 @@ INSTALL_MI_GEN_LIST =
 INSTALL_MI_DIR = mach
 
 EXPORT_MI_LIST = \
 INSTALL_MI_DIR = mach
 
 EXPORT_MI_LIST = \

+       branch_predicates.h \
+       coalition.h \

        mach_interface.h \
        mach_interface.h \

+       sfi_class.h \

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


@@ -196,12 +208,8 @@ EXPORT_MI_GEN_LIST = \
 
 EXPORT_MI_DIR = mach
 
 
 EXPORT_MI_DIR = mach
 

-.ORDER: ${MIGINCLUDES}
-

 ${MIGINCLUDES} : ${MIG_TYPES}
 
 ${MIGINCLUDES} : ${MIG_TYPES}
 

-.ORDER: ${MIG_UUHDRS}
-

 ${MIG_UUHDRS} : \
        %.h : %.defs
        @echo MIG $@
 ${MIG_UUHDRS} : \
        %.h : %.defs
        @echo MIG $@


@@ -211,8 +219,6 @@ ${MIG_UUHDRS} : \
                -header $@              \
                $<
 
                -header $@              \
                $<
 

-.ORDER: ${MIG_USHDRS}
-

 ${MIG_USHDRS} : \
        %_server.h : %.defs
        @echo MIG $@
 ${MIG_USHDRS} : \
        %_server.h : %.defs
        @echo MIG $@


@@ -226,8 +232,6 @@ ${MIG_USHDRS} : \
 #
 # Build path
 #
 #
 # Build path
 #

-COMP_SUBDIRS_I386 = \
-       i386

 
 INCFLAGS_MAKEFILE= -I..
 
 
 INCFLAGS_MAKEFILE= -I..
 


@@ -254,6 +258,7 @@ MIG_KUHDRS = \
 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 \
        mach_exc_user.c \
        exc_user.c \
        host_notify_reply_user.c \
        mach_exc_user.c \


@@ -262,8 +267,10 @@ MIG_KUSRC = \
        memory_object_control_user.c \
        memory_object_default_user.c \
        task_access_user.c \
        memory_object_control_user.c \
        memory_object_default_user.c \
        task_access_user.c \

+       telemetry_notification_user.c \

        upl_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 \


@@ -271,20 +278,19 @@ MIG_KSHDRS = \
        exc_server.h \
        host_priv_server.h \
        host_security_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 \
        lock_set_server.h \
        mach_exc_server.h \
        mach_host_server.h \
        mach_notify_server.h \
        mach_port_server.h \
        mach_vm_server.h \

+       mach_voucher_server.h \
+       mach_voucher_attr_control_server.h \

        memory_object_server.h \
        memory_object_control_server.h \
        memory_object_default_server.h \
        memory_object_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 \


@@ -297,20 +303,19 @@ MIG_KSSRC = \
        exc_server.c \
        host_priv_server.c \
        host_security_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 \
        lock_set_server.c \
        mach_exc_server.c \
        mach_host_server.c \
        mach_notify_server.c \
        mach_port_server.c \
        mach_vm_server.c \

+       mach_voucher_server.c \
+       mach_voucher_attr_control_server.c \

        memory_object_server.c \
        memory_object_control_server.c \
        memory_object_default_server.c \
        memory_object_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 \


@@ -335,9 +340,9 @@ MIG_KSSRC = \
 #
 COMP_FILES = ${MIG_KUSRC} ${MIG_KSSRC}
 
 #
 COMP_FILES = ${MIG_KUSRC} ${MIG_KSSRC}
 

+do_build_all:: $(COMP_FILES)
+

 ${COMP_FILES} : ${MIG_TYPES}
 ${COMP_FILES} : ${MIG_TYPES}

-        
-.ORDER: ${MIG_KUSRC}                           

 
 ${MIG_KUSRC} : \
        %_user.c : %.defs
 
 ${MIG_KUSRC} : \
        %_user.c : %.defs


@@ -349,8 +354,6 @@ ${MIG_KUSRC} : \
                -sheader /dev/null              \
                $<
 
                -sheader /dev/null              \
                $<
 

-.ORDER: ${MIG_KSSRC}                           
-        

 ${MIG_KSSRC}: \
        %_server.c : %.defs
        @echo MIG $@
 ${MIG_KSSRC}: \
        %_server.c : %.defs
        @echo MIG $@