[Bug 16793] Disable LTO on Android (for now)

livecodepanos · livecodeali · commit d78737ca18b7 · 2016-02-01T17:35:43.000Z
diff --git a/config.sh b/config.sh
@@ -324,7 +324,7 @@ if test "${OS}" = "android" ; then
     ANDROID_AR=${AR:-${ANDROID_TOOLCHAIN}ar}
     ANDROID_CC=${CC:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
     ANDROID_CXX=${CXX:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as}
-    ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as}
+    ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang++ -target arm-linux-androideabi -march=armv6 -integrated-as -fuse-ld=bfd}
     ANDROID_OBJCOPY=${OBJCOPY:-${ANDROID_TOOLCHAIN}objcopy}
     ANDROID_OBJDUMP=${OBJDUMP:-${ANDROID_TOOLCHAIN}objdump}
     ANDROID_STRIP=${STRIP:-${ANDROID_TOOLCHAIN}strip}
diff --git a/config/android-settings.gypi b/config/android-settings.gypi
@@ -44,26 +44,7 @@
 				],
 			},
 		],
-		[
-			'supports_lto != 0',
-			{
-				'ldflags':
-				[
-					'-fuse-ld=gold',
-				],
-
-				'arflags':
-				[
-					'--plugin', '<!(echo $(dirname <(ar))/../lib/LLVMgold.so)',
-				],
-			},
-			{
-				'ldflags':
-				[
-					'-fuse-ld=bfd',
-				],
-			},
-		],
+		
 	],
 	
 	'configurations':
@@ -90,27 +71,7 @@
 				'-g3',
 			],
 
-			'conditions':
-			[
-				[
-					'supports_lto != 0',
-					{
-						'cflags':
-						[
-							'-flto',
-							'-ffunction-sections',
-						],
-
-						'ldflags':
-						[
-							'-Wl,--icf=all',
-							'>@(_cflags)',
-							'>@(_cflags_cc)',
-							
-						],
-					},
-				],
-			],
+			
 			
 			'defines':
 			[
diff --git a/config/android.gypi b/config/android.gypi
@@ -27,7 +27,7 @@
 		'objcopy': '<!(echo ${OBJCOPY:-objcopy})',
 		'objdump': '<!(echo ${OBJDUMP:-objdump})',
 		'strip':   '<!(echo ${STRIP:-strip})',
-		'ar': '<!(echo ${AR:-ar})',
+		#'ar': '<!(echo ${AR:-ar})',
 	},
 	
 	'target_defaults':
@@ -41,8 +41,8 @@
 			'exe_suffix': '',
 			'debug_info_suffix': '.dbg',
 			
-			'supports_lto': '<!(if ${CC} -flto -fuse-ld=gold -c -o /dev/null /dev/null 2>/dev/null >/dev/null; then echo 1; else echo 0; fi)',
-			
+			#'supports_lto': '<!(if ${CC} -flto -fuse-ld=gold -c -o /dev/null /dev/null 2>/dev/null >/dev/null; then echo 1; else echo 0; fi)',
+			'supports_lto': 0,
 			'silence_warnings': 0,
 		},
 	
diff --git a/engine/engine.gyp b/engine/engine.gyp
@@ -234,28 +234,10 @@
 						[
 							# Helpful for catching build problems
 							'-Wl,-no-undefined',
+							'-Wl,-T,$(abs_srcdir)/engine/linux.link',
 						],
 						
-						'target_conditions':
-						[
-								[
-										'supports_lto != 0',
-										{
-												'ldflags':
-												[
-														'-Wl,--sort-section=none',
-														'-Wl,--section-ordering-file,$(abs_srcdir)/engine/linux-section-order.txt',
-												],
-										},
-										{
-												'ldflags':
-												[
-														'-T', '$(abs_srcdir)/engine/linux.link',
-												],
-										},
-								],
-						],
-						
+												
 						'actions':
 						[
 							{
diff --git a/engine/src/mode_standalone.cpp b/engine/src/mode_standalone.cpp
@@ -97,8 +97,7 @@ __attribute__((section("__PROJECT,__project"))) volatile MCCapsuleInfo MCcapsule
 #elif defined(TARGET_SUBPLATFORM_IPHONE)
 __attribute__((section("__PROJECT,__project"))) volatile MCCapsuleInfo MCcapsule = {0};
 #elif defined(TARGET_SUBPLATFORM_ANDROID)
-extern MCCapsuleInfo MCcapsule;
-asm (".section .project, \"aw\", \"nobits\"; .global MCcapsule; MCcapsule: .align 16; .space 16;");
+__attribute__((section(".project"))) volatile MCCapsuleInfo MCcapsule = {0};
 #elif defined(TARGET_PLATFORM_MOBILE)
 MCCapsuleInfo MCcapsule = {0};
 #elif defined(__EMSCRIPTEN__)
diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py
@@ -192,10 +192,10 @@ def CalculateGeneratorInputInfo(params):
 
 LINK_COMMANDS_ANDROID = """\
 quiet_cmd_alink = AR($(TOOLSET)) $@
-cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $(ARFLAGS) $@ $(filter %.o,$^)
+cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^)
 
 quiet_cmd_alink_thin = AR($(TOOLSET)) $@
-cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $(ARFLAGS) $@ $(filter %.o,$^)
+cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
 
 # Due to circular dependencies between libraries :(, we wrap the
 # special "figure out circular dependencies" flags around the entire
