Merge pull request livecode#3526 from livecodefraser/windows_lto_installer_fix

livecodefraser · livecodefraser · commit b53396231a21 · 2016-01-28T10:59:55.000Z
Ensure LTO doesn't discard the .payload and .project sections of the installer
diff --git a/engine/src/mode_installer.cpp b/engine/src/mode_installer.cpp
@@ -105,7 +105,7 @@ __declspec(allocate(".project")) volatile MCCapsuleInfo MCcapsule = {};
 #define PAYLOAD_SECTION_NAME ".payload"
 #define PROJECT_SECTION_NAME ".project"
 
-extern MCCapsuleInfo MCpayload, MCcapsule;
+extern volatile MCCapsuleInfo MCpayload, MCcapsule;
 asm (".section .payload, \"aw\", \"nobits\"; .global MCpayload; MCpayload: .align 16; .space 16;");
 asm (".section .project, \"aw\", \"nobits\"; .global MCcapsule; MCcapsule: .align 16; .space 16;");
 
@@ -263,6 +263,11 @@ class MCInternalPayloadOpen: public MCStatement
 				}			
 			}			
 #else
+            // Force references to the payload and project sections to prevent
+            // extra-clever optimising linkers from discarding the sections.
+            (void)MCpayload.size;
+            (void)MCcapsule.size;
+            
 			// Search for the payload section - first see if there is a payload
 			// section of suitable size; then if in debug mode, try to load a stack
 			// via env var.
