From b032924a436dc9d2476b09bfaafe184295d26de9 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 3 Sep 2019 13:31:16 -0700 Subject: [PATCH 1/3] Remove ENABLE_BITCODE from Scenarios test app --- .../ios/Scenarios/Scenarios.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj b/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj index c7fe99847ea68..10459ac686541 100644 --- a/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj +++ b/testing/scenario_app/ios/Scenarios/Scenarios.xcodeproj/project.pbxproj @@ -411,7 +411,6 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -471,7 +470,6 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -497,7 +495,6 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = S8QB4VV633; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", @@ -521,7 +518,6 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = S8QB4VV633; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)", From 6097843ff6b1c935601347f16a11afa45661274c Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 3 Sep 2019 14:05:13 -0700 Subject: [PATCH 2/3] Add -fembed-bitcode --- testing/scenario_app/compile_ios_aot.sh | 2 ++ testing/scenario_app/compile_ios_jit.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/testing/scenario_app/compile_ios_aot.sh b/testing/scenario_app/compile_ios_aot.sh index c76f6c3658a56..6059652543895 100755 --- a/testing/scenario_app/compile_ios_aot.sh +++ b/testing/scenario_app/compile_ios_aot.sh @@ -47,6 +47,7 @@ echo "Using $SYSROOT as sysroot." echo "Compiling Assembly..." cc -arch arm64 \ + -fembed-bitcode \ -isysroot "$SYSROOT" \ -miphoneos-version-min=8.0 \ -c "$OUTDIR/snapshot_assembly.S" \ @@ -55,6 +56,7 @@ cc -arch arm64 \ echo "Linking App using $SYSROOT..." clang -arch arm64 \ + -fembed-bitcode \ -isysroot "$SYSROOT" \ -miphoneos-version-min=8.0 \ -dynamiclib -Xlinker -rpath -Xlinker @executable_path/Frameworks \ diff --git a/testing/scenario_app/compile_ios_jit.sh b/testing/scenario_app/compile_ios_jit.sh index 370003195e591..9d5f11825eda0 100755 --- a/testing/scenario_app/compile_ios_jit.sh +++ b/testing/scenario_app/compile_ios_jit.sh @@ -61,6 +61,7 @@ echo "Creating stub App using $SYSROOT..." echo "static const int Moo = 88;" | xcrun clang -x c \ -arch x86_64 \ + -fembed-bitcode \ -isysroot "$SYSROOT" \ -miphoneos-version-min=8.0 \ -dynamiclib \ From e184e759cbae7e2ea2e7975222477eb7d6974ee7 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 3 Sep 2019 16:26:38 -0700 Subject: [PATCH 3/3] -fembed-bitcode-marker --- testing/scenario_app/compile_ios_jit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/scenario_app/compile_ios_jit.sh b/testing/scenario_app/compile_ios_jit.sh index 9d5f11825eda0..565089f5624d5 100755 --- a/testing/scenario_app/compile_ios_jit.sh +++ b/testing/scenario_app/compile_ios_jit.sh @@ -61,7 +61,7 @@ echo "Creating stub App using $SYSROOT..." echo "static const int Moo = 88;" | xcrun clang -x c \ -arch x86_64 \ - -fembed-bitcode \ + -fembed-bitcode-marker \ -isysroot "$SYSROOT" \ -miphoneos-version-min=8.0 \ -dynamiclib \