Merge pull request #87464 from bruvzg/pck_section

[Linux] Add support for PCK embedding section with non GNU-ld linkers.

platform/linuxbsd/detect.py

@@ -496,24 +496,6 @@ def configure(env: "Environment"):
     if env["execinfo"]:
         env.Append(LIBS=["execinfo"])
 
-    if not env.editor_build:
-        import subprocess
-        import re
-
-        linker_version_str = subprocess.check_output(
-            [env.subst(env["LINK"]), "-Wl,--version"] + env.subst(env["LINKFLAGS"])
-        ).decode("utf-8")
-        gnu_ld_version = re.search(r"^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE)
-        if not gnu_ld_version:
-            print(
-                "Warning: Creating export template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold, LLD or mold."
-            )
-        else:
-            if float(gnu_ld_version.group(1)) >= 2.30:
-                env.Append(LINKFLAGS=["-T", "platform/linuxbsd/pck_embed.ld"])
-            else:
-                env.Append(LINKFLAGS=["-T", "platform/linuxbsd/pck_embed.legacy.ld"])
-
     if platform.system() == "FreeBSD":
         env.Append(LINKFLAGS=["-lkvm"])
 

platform/linuxbsd/godot_linuxbsd.cpp

@@ -41,6 +41,18 @@
 #include <sys/resource.h>
 #endif
 
+// For export templates, add a section; the exporter will patch it to enclose
+// the data appended to the executable (bundled PCK).
+#if !defined(TOOLS_ENABLED) && defined(__GNUC__)
+static const char dummy[8] __attribute__((section("pck"), used)) = { 0 };
+
+// Dummy function to prevent LTO from discarding "pck" section.
+extern "C" const char *pck_section_dummy_call() __attribute__((used));
+extern "C" const char *pck_section_dummy_call() {
+	return &dummy[0];
+}
+#endif
+
 int main(int argc, char *argv[]) {
 #if defined(SANITIZERS_ENABLED)
 	// Note: Set stack size to be at least 30 MB (vs 8 MB default) to avoid overflow, address sanitizer can increase stack usage up to 3 times.

platform/windows/godot_windows.cpp

@@ -36,7 +36,7 @@
 #include <stdio.h>
 
 // For export templates, add a section; the exporter will patch it to enclose
-// the data appended to the executable (bundled PCK)
+// the data appended to the executable (bundled PCK).
 #ifndef TOOLS_ENABLED
 #if defined _MSC_VER
 #pragma section("pck", read)
@@ -45,7 +45,7 @@ __declspec(allocate("pck")) static char dummy[8] = { 0 };
 // Dummy function to prevent LTO from discarding "pck" section.
 extern "C" char *__cdecl pck_section_dummy_call() {
 	return &dummy[0];
-};
+}
 #if defined _AMD64_
 #pragma comment(linker, "/include:pck_section_dummy_call")
 #elif defined _X86_