From a8982557ccd0c7567458dbc06d7926b7db80e48f Mon Sep 17 00:00:00 2001
From: Felix Schulze <mail@felixschulze.de>
Date: Thu, 6 Aug 2015 08:02:24 +0200
Subject: [PATCH] Add support for bitcode #Fixes 56

---
 README.md       |  3 +++
 build-libssl.sh | 21 +++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e92dc92..d19b154 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@ This repository contains a iOS 8.4 XCode Project with usese the OpenSSL Libaries
 ## System support
 **iOS 4.3 - iOS 9.0 (i386, x86_64, armv7, armv7s, armv64) is currently supported.**
 
+**If you build with Xcode 7 Bitcode support is enabled. This is only supported by iOS 8/9**
+
 For iOS < 4.3 you must use iOS SDK < 6.0 and an older version of the build script.
 
 If you have problems building for arm64 please uninstall MacPorts (see #28).
@@ -23,6 +25,7 @@ If you have problems building for arm64 please uninstall MacPorts (see #28).
 * <http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/>
 
 ## Changelog
+* 2015-08-06: iOS 9.0 support, Bitcode support
 * 2015-07-09: OpenSSL 1.0.2d, iOS 8.4
 * 2015-06-15: OpenSSL 1.0.2c, iOS 8.3
 * 2015-06-11: OpenSSL 1.0.2b
diff --git a/build-libssl.sh b/build-libssl.sh
index 1c320b1..e3bf9cd 100755
--- a/build-libssl.sh
+++ b/build-libssl.sh
@@ -35,6 +35,12 @@ CURRENTPATH=`pwd`
 ARCHS="i386 x86_64 armv7 armv7s arm64"
 DEVELOPER=`xcode-select -print-path`
 
+if [ "${SDKVERSION}" == "9.0" ]; then
+	MIN_SDK_VERSION="8.0"
+else
+	MIN_SDK_VERSION="7.0"
+fi
+
 if [ ! -d "$DEVELOPER" ]; then
   echo "xcode path is not set correctly $DEVELOPER does not exist (most likely because of xcode > 4.3)"
   echo "run"
@@ -91,15 +97,18 @@ do
 	echo "Building openssl-${VERSION} for ${PLATFORM} ${SDKVERSION} ${ARCH}"
 	echo "Please stand by..."
 
-	export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}"
+	if [ "${SDKVERSION}" == "9.0" ]; then
+		export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH} -fembed-bitcode"
+	else
+		export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}"
+	fi
+
 	mkdir -p "${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk"
 	LOG="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/build-openssl-${VERSION}.log"
 
 	set +e
-    if [[ "$VERSION" =~ 1.0.0. ]]; then
-	    ./Configure BSD-generic32 --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1
-	elif [ "${ARCH}" == "x86_64" ]; then
-	    ./Configure darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1
+	if [ "${ARCH}" == "x86_64" ]; then
+	    ./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1
     else
 	    ./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1
     fi
@@ -111,7 +120,7 @@ do
     fi
 
 	# add -isysroot to CC=
-	sed -ie "s!^CFLAG=!CFLAG=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=7.0 !" "Makefile"
+	sed -ie "s!^CFLAG=!CFLAG=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=${MIN_SDK_VERSION} !" "Makefile"
 
 	if [ "$1" == "verbose" ];
 	then