Skip to content

Commit

Permalink
[Linux] Add support for PCK embedding section with non GNU-ld linkers.
Browse files Browse the repository at this point in the history
(cherry picked from commit 625c4bd)
  • Loading branch information
bruvzg authored and akien-mga committed May 11, 2024
1 parent 90aa656 commit c40e088
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 40 deletions.
4 changes: 2 additions & 2 deletions platform/windows/godot_windows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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)
Expand All @@ -44,7 +44,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_
Expand Down
18 changes: 0 additions & 18 deletions platform/x11/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -422,24 +422,6 @@ def configure(env):
if env["execinfo"]:
env.Append(LIBS=["execinfo"])

if not env["tools"]:
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/x11/pck_embed.ld"])
else:
env.Append(LINKFLAGS=["-T", "platform/x11/pck_embed.legacy.ld"])

# Link those statically for portability
if env["use_static_cpp"]:
env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"])
Expand Down
12 changes: 12 additions & 0 deletions platform/x11/godot_x11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@
#include "main/main.h"
#include "os_x11.h"

// 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[]) {
OS_X11 os;

Expand Down
10 changes: 0 additions & 10 deletions platform/x11/pck_embed.ld

This file was deleted.

10 changes: 0 additions & 10 deletions platform/x11/pck_embed.legacy.ld

This file was deleted.

0 comments on commit c40e088

Please sign in to comment.