First successful build after merge with darling-libsystem

platform-include/mach-o/fat.h

@@ -1,3 +1,4 @@
+// Modified by Lubos Dolezel for Darling build
 /*
  * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
  *
@@ -42,8 +43,9 @@
  * and contains the constants for the possible values of these types.
  */
 #include <stdint.h>
-#include <mach/machine.h>
-#include <architecture/byte_order.h>
+
+typedef int cpu_type_t;
+typedef int cpu_subtype_t;
 
 #define FAT_MAGIC	0xcafebabe
 #define FAT_CIGAM	0xbebafeca	/* NXSwapLong(FAT_MAGIC) */

platform-include/mach-o/loader.h

@@ -1,3 +1,4 @@
+// Modified by Lubos Dolezel for Darling build
 /*
  * Copyright (c) 1999-2010 Apple Inc.  All Rights Reserved.
  *
@@ -27,25 +28,10 @@
  * This file describes the format of mach object files.
  */
 #include <stdint.h>
-
-/*
- * <mach/machine.h> is needed here for the cpu_type_t and cpu_subtype_t types
- * and contains the constants for the possible values of these types.
- */
-#include <mach/machine.h>
-
-/*
- * <mach/vm_prot.h> is needed here for the vm_prot_t type and contains the 
- * constants that are or'ed together for the possible values of this type.
- */
 #include <mach/vm_prot.h>
 
-/*
- * <machine/thread_status.h> is expected to define the flavors of the thread
- * states and the structures of those flavors for each machine.
- */
-#include <mach/machine/thread_status.h>
-#include <architecture/byte_order.h>
+typedef int cpu_type_t;
+typedef int cpu_subtype_t;
 
 /*
  * The 32-bit mach header appears at the very beginning of the object file for