From 846d55dac5be885f0206dff169eacc6ff701ec9c Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 4 Dec 2014 14:05:44 -0600
Subject: [PATCH] Build support for 64-bit iPhone Simulator

From Tom Palaia.
---
 configure/os/CONFIG.Common.ios-x86      |  5 -----
 configure/os/CONFIG_SITE.Common.ios-arm | 11 ++++++-----
 configure/os/CONFIG_SITE.Common.ios-x86 | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 configure/os/CONFIG_SITE.Common.ios-x86

diff --git a/configure/os/CONFIG.Common.ios-x86 b/configure/os/CONFIG.Common.ios-x86
index 0c786653d..a8175a34e 100644
--- a/configure/os/CONFIG.Common.ios-x86
+++ b/configure/os/CONFIG.Common.ios-x86
@@ -13,10 +13,5 @@ IOS_PLATFORM = iPhoneSimulator
 OP_SYS_CFLAGS += -mios-simulator-version-min=$(IOS_DEPLOYMENT_TARGET)
 OP_SYS_LDFLAGS += -mios-simulator-version-min=$(IOS_DEPLOYMENT_TARGET)
 
-#
-# Architecture-specific information
-#
-ARCH_CLASS = i386
-
 # Include definitions common to all iOS targets
 include $(CONFIG)/os/CONFIG.Common.iosCommon
diff --git a/configure/os/CONFIG_SITE.Common.ios-arm b/configure/os/CONFIG_SITE.Common.ios-arm
index 3e20f58f6..1262b4372 100644
--- a/configure/os/CONFIG_SITE.Common.ios-arm
+++ b/configure/os/CONFIG_SITE.Common.ios-arm
@@ -16,11 +16,12 @@
 #
 #   Xcode 4.5 dropped support for the ARMv6.
 #
-#   ARMv8 (arm64) devices: iPhone 5S
-#   ARMv7s devices: iPhone 5 and 5C, iPad Gen 4
-#   ARMv7 devices: iPhone 3GS, 4 and 4S, iPod Touch Gen 3 to 5
-#                  iPad Gen 1 to 3, iPad Mini, Apple TV Gen 2 and 3
-#   ARMv6 devices: iPhone 1 and 3G, iPod Touch Gen 1 and 2
+#   arm64 devices:  iPhone 5S, 6 and 6 Plus, iPad Air Gen 1 and 2,
+#                   iPad Mini Gen 2 and 3
+#   armv7s devices: iPhone 5 and 5C, iPad Gen 4
+#   armv7 devices:  iPhone 3GS, 4 and 4S, iPod Touch Gen 3 to 5
+#                   iPad Gen 1 to 3, iPad Mini, Apple TV Gen 2 and 3
+#   armv6 devices:  iPhone 1 and 3G, iPod Touch Gen 1 and 2
 
 #ARCH_CLASS = arm64
 #ARCH_CLASS = armv7s arm64
diff --git a/configure/os/CONFIG_SITE.Common.ios-x86 b/configure/os/CONFIG_SITE.Common.ios-x86
new file mode 100644
index 000000000..8c59187c7
--- /dev/null
+++ b/configure/os/CONFIG_SITE.Common.ios-x86
@@ -0,0 +1,18 @@
+# CONFIG_SITE.Common.ios-x86
+#
+# $Revision-Id$
+#
+# Site-specific settings for ios-x86 target builds
+#-------------------------------------------------------
+
+# Which x86 instruction set(s) to generate code for:
+#   The iPhone Simulator now supports both 32-bit and 64-bit
+#   instruction sets since the iPhone 6 uses a 64-bit CPU.
+#
+#   Apple's compilers can build for multiple architectures,
+#   generating a Universal binary.  This is larger and takes
+#   longer to compile, but runs efficiently on all devices.
+
+#ARCH_CLASS = i386
+ARCH_CLASS = i386 x86_64
+#ARCH_CLASS = x86_64