updating stock to 10.9.0

EXTERNAL_HEADERS/Availability.h

@@ -29,12 +29,12 @@
     were first available; and, if applicable, the OS version in which they 
     became deprecated.  
      
-    The desktop Mac OS X and the iPhone OS X each have different version numbers.
+    The desktop Mac OS X and iOS each have different version numbers.
     The __OSX_AVAILABLE_STARTING() macro allows you to specify both the desktop
-    and phone OS version numbers.  For instance:
+    and iOS version numbers.  For instance:
         __OSX_AVAILABLE_STARTING(__MAC_10_2,__IPHONE_2_0)
     means the function/method was first available on Mac OS X 10.2 on the desktop
-    and first available in OS X 2.0 on the iPhone.
+    and first available in iOS 2.0 on the iPhone.
     
     If a function is available on one platform, but not the other a _NA (not
     applicable) parameter is used.  For instance:
@@ -50,15 +50,15 @@
     as well as the OS version in which it became deprecated.  For instance:
         __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_5,__IPHONE_NA,__IPHONE_NA)
     means that the function/method was introduced in Mac OS X 10.0, then
-    became deprecated beginning in Mac OS X 10.5.  On the iPhone the function 
+    became deprecated beginning in Mac OS X 10.5.  On iOS the function 
     has never been available.  
     
     For these macros to function properly, a program must specify the OS version range 
     it is targeting.  The min OS version is specified as an option to the compiler:
-    -mmacosx-version-min=10.x when building for Mac OS X, and -miphoneos-version-min=x.x
+    -mmacosx-version-min=10.x when building for Mac OS X, and -miphoneos-version-min=y.z
     when building for the iPhone.  The upper bound for the OS version is rarely needed,
-    but it can be set on the command line via: -D__MAC_OS_X_VERSION_MAX_ALLOWED=10xx for
-    Mac OS X and __IPHONE_OS_VERSION_MAX_ALLOWED = 1xxx for iPhone.  
+    but it can be set on the command line via: -D__MAC_OS_X_VERSION_MAX_ALLOWED=10x0 for
+    Mac OS X and __IPHONE_OS_VERSION_MAX_ALLOWED = y0z00 for iOS.  
     
     Examples:
 
@@ -125,6 +125,7 @@
 #define __MAC_10_6      1060
 #define __MAC_10_7      1070
 #define __MAC_10_8      1080
+#define __MAC_10_9      1090
 #define __MAC_NA        9999   /* not available */
 
 #define __IPHONE_2_0     20000
@@ -139,6 +140,9 @@
 #define __IPHONE_4_3     40300
 #define __IPHONE_5_0     50000
 #define __IPHONE_5_1     50100
+#define __IPHONE_6_0     60000
+#define __IPHONE_6_1     60100
+#define __IPHONE_7_0     70000
 #define __IPHONE_NA      99999  /* not available */
 
 #include <AvailabilityInternal.h>
@@ -148,15 +152,20 @@
     #define __OSX_AVAILABLE_STARTING(_osx, _ios) __AVAILABILITY_INTERNAL##_ios
     #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep) \
                                                     __AVAILABILITY_INTERNAL##_iosIntro##_DEP##_iosDep
+    #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(_osxIntro, _osxDep, _iosIntro, _iosDep, _msg) \
+                                                    __AVAILABILITY_INTERNAL##_iosIntro##_DEP##_iosDep##_MSG(_msg)
 
 #elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
     #define __OSX_AVAILABLE_STARTING(_osx, _ios) __AVAILABILITY_INTERNAL##_osx
     #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep) \
                                                     __AVAILABILITY_INTERNAL##_osxIntro##_DEP##_osxDep
+    #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(_osxIntro, _osxDep, _iosIntro, _iosDep, _msg) \
+                                                    __AVAILABILITY_INTERNAL##_osxIntro##_DEP##_osxDep##_MSG(_msg)
 
 #else
     #define __OSX_AVAILABLE_STARTING(_osx, _ios)
-    #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep) 
+    #define __OSX_AVAILABLE_BUT_DEPRECATED(_osxIntro, _osxDep, _iosIntro, _iosDep)
+    #define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(_osxIntro, _osxDep, _iosIntro, _iosDep, _msg)
 #endif
 
 

EXTERNAL_HEADERS/Makefile

@@ -11,9 +11,6 @@ INSTINC_SUBDIRS =	\
 	architecture	\
 	mach-o
 
-INSTINC_SUBDIRS_I386 =	\
-	architecture
-
 INSTINC_SUBDIRS_X86_64 =	\
 	architecture
 
@@ -25,7 +22,6 @@ EXPORT_FILES = \
 	Availability.h	\
 	AvailabilityInternal.h	\
 	AvailabilityMacros.h	\
-	ar.h		\
 	stdarg.h	\
 	stdbool.h	\
 	stdint.h
@@ -34,7 +30,11 @@ INSTALL_MI_LIST =
 
 INSTALL_MI_DIR = .
 
-EXPORT_MI_LIST = ${EXPORT_FILES}
+INSTALL_KF_MI_LIST = ${EXPORT_FILES}
+
+INSTALL_KF_MI_LCL_LIST = ${EXPORT_FILES}
+
+EXPORT_MI_LIST = ${EXPORT_FILES} stddef.h
 
 EXPORT_MI_DIR = .
 

EXTERNAL_HEADERS/architecture/Makefile

@@ -9,9 +9,6 @@ include $(MakeInc_def)
 
 INSTINC_SUBDIRS =
 
-INSTINC_SUBDIRS_I386 =	\
-	i386
-
 INSTINC_SUBDIRS_X86_64 =	\
 	i386
 

EXTERNAL_HEADERS/architecture/i386/Makefile

@@ -7,10 +7,6 @@ export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
-INSTINC_SUBDIRS_I386 =
-
-INSTINC_SUBDIRS_X86_64 =
-
 EXPORT_FILES = 		\
 	asm_help.h	\
 	cpu.h		\

EXTERNAL_HEADERS/architecture/i386/asm_help.h

@@ -52,6 +52,11 @@
 #define ALIGN						\
 	.align	2, 0x90
 
+/* Note that ROUND_TO_STACK rounds to Intel's stack alignment requirement,
+ * but it is not sufficient for the Apple ABI which requires a 16-byte
+ * aligned stack.  Various parts of the OS depend on this requirement,
+ * including dyld.
+ */
 #define	ROUND_TO_STACK(len)				\
 	(((len) + STACK_INCR - 1) / STACK_INCR * STACK_INCR)
 

EXTERNAL_HEADERS/mach-o/Makefile

@@ -7,8 +7,6 @@ export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
-INSTINC_SUBDIRS =
-
 EXPORT_FILES = \
 	fat.h		\
 	loader.h	\

EXTERNAL_HEADERS/mach-o/loader.h

@@ -294,6 +294,7 @@ struct load_command {
 #define LC_DATA_IN_CODE 0x29 /* table of non-instructions in __text */
 #define LC_SOURCE_VERSION 0x2A /* source version used to build binary */
 #define LC_DYLIB_CODE_SIGN_DRS 0x2B /* Code signing DRs copied from linked dylibs */
+#define	LC_ENCRYPTION_INFO_64 0x2C /* 64-bit encrypted segment information */
 
 
 /*
@@ -1174,6 +1175,21 @@ struct encryption_info_command {
 				   0 means not-encrypted yet */
 };
 
+/*
+ * The encryption_info_command_64 contains the file offset and size of an
+ * of an encrypted segment (for use in 64-bit targets).
+ */
+struct encryption_info_command_64 {
+   uint32_t	cmd;		/* LC_ENCRYPTION_INFO_64 */
+   uint32_t	cmdsize;	/* sizeof(struct encryption_info_command_64) */
+   uint32_t	cryptoff;	/* file offset of encrypted range */
+   uint32_t	cryptsize;	/* file size of encrypted range */
+   uint32_t	cryptid;	/* which enryption system,
+				   0 means not-encrypted yet */
+   uint32_t	pad;		/* padding to make this struct's size a multiple
+				   of 8 bytes */
+};
+
 /*
  * The version_min_command contains the min OS version on which this 
  * binary was built to run.
@@ -1428,19 +1444,18 @@ struct source_version_command {
 /*
  * The LC_DATA_IN_CODE load commands uses a linkedit_data_command 
  * to point to an array of data_in_code_entry entries. Each entry
- * describes a range of data in a code section.  This load command
- * is only used in final linked images.
+ * describes a range of data in a code section.
  */
 struct data_in_code_entry {
     uint32_t	offset;  /* from mach_header to start of data range*/
     uint16_t	length;  /* number of bytes in data range */
     uint16_t	kind;    /* a DICE_KIND_* value  */
 };
-#define DICE_KIND_DATA              0x0001  /* L$start$data$...  label */
-#define DICE_KIND_JUMP_TABLE8       0x0002  /* L$start$jt8$...   label */
-#define DICE_KIND_JUMP_TABLE16      0x0003  /* L$start$jt16$...  label */
-#define DICE_KIND_JUMP_TABLE32      0x0004  /* L$start$jt32$...  label */
-#define DICE_KIND_ABS_JUMP_TABLE32  0x0005  /* L$start$jta32$... label */
+#define DICE_KIND_DATA              0x0001
+#define DICE_KIND_JUMP_TABLE8       0x0002
+#define DICE_KIND_JUMP_TABLE16      0x0003
+#define DICE_KIND_JUMP_TABLE32      0x0004
+#define DICE_KIND_ABS_JUMP_TABLE32  0x0005
 
 
 

EXTERNAL_HEADERS/stdarg.h

@@ -26,7 +26,10 @@
 #ifndef __STDARG_H
 #define __STDARG_H
 
+#ifndef _VA_LIST
 typedef __builtin_va_list va_list;
+#define _VA_LIST
+#endif
 #define va_start(ap, param) __builtin_va_start(ap, param)
 #define va_end(ap)          __builtin_va_end(ap)
 #define va_arg(ap, type)    __builtin_va_arg(ap, type)
@@ -36,7 +39,7 @@ typedef __builtin_va_list va_list;
  */
 #define __va_copy(d,s) __builtin_va_copy(d,s)
 
-#if __STDC_VERSION__ >= 199900L || !defined(__STRICT_ANSI__)
+#if __STDC_VERSION__ >= 199900L || __cplusplus >= 201103L || !defined(__STRICT_ANSI__)
 #define va_copy(dest, src)  __builtin_va_copy(dest, src)
 #endif
 

EXTERNAL_HEADERS/stddef.h

@@ -0,0 +1,64 @@
+/*===---- stddef.h - Basic type definitions --------------------------------===
+ *
+ * Copyright (c) 2008 Eli Friedman
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ *===-----------------------------------------------------------------------===
+ */
+
+#ifndef __STDDEF_H
+#define __STDDEF_H
+
+#ifndef _PTRDIFF_T
+#define _PTRDIFF_T
+typedef __typeof__(((int*)0)-((int*)0)) ptrdiff_t;
+#endif
+#ifndef _SIZE_T
+#define _SIZE_T
+typedef __typeof__(sizeof(int)) size_t;
+#endif
+#ifndef __cplusplus
+#ifndef _WCHAR_T
+#define _WCHAR_T
+typedef __WCHAR_TYPE__ wchar_t;
+#endif
+#endif
+
+#undef NULL
+#ifdef __cplusplus
+#undef __null  // VC++ hack.
+#define NULL __null
+#else
+#define NULL ((void*)0)
+#endif
+
+#define offsetof(t, d) __builtin_offsetof(t, d)
+
+#endif /* __STDDEF_H */
+
+/* Some C libraries expect to see a wint_t here. Others (notably MinGW) will use
+__WINT_TYPE__ directly; accommodate both by requiring __need_wint_t */
+#if defined(__need_wint_t)
+#if !defined(_WINT_T)
+#define _WINT_T
+typedef __WINT_TYPE__ wint_t;
+#endif /* _WINT_T */
+#undef __need_wint_t
+#endif /* __need_wint_t */