summaryrefslogtreecommitdiff
path: root/linker_scripts
diff options
context:
space:
mode:
authorTharo <17233964+Thar0@users.noreply.github.com>2025-02-04 11:55:04 +0000
committerGitHub <noreply@github.com>2025-02-04 06:55:04 -0500
commitc028db03b47f8b38bc2a1b87569fd7fae0ea9067 (patch)
tree99007ef3e69f69b4e6924ba54468adda49461565 /linker_scripts
parent6c06168e7212616ea08460d487a4b99e89a34108 (diff)
Finish matching ique-cn (#2451)
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin subrepo: subdir: "tools/com-plugin" merged: "e8543312d" upstream: origin: "git@github.com:Thar0/com-plugin.git" branch: "main" commit: "e8543312d" git-subrepo: version: "0.4.6" origin: "https://github.com/ingydotnet/git-subrepo" commit: "110b9eb" * ique-cn OK * Review suggestions * Most suggestions * git subrepo pull tools/com-plugin subrepo: subdir: "tools/com-plugin" merged: "81595ed1c" upstream: origin: "git@github.com:Thar0/com-plugin.git" branch: "main" commit: "81595ed1c" git-subrepo: version: "0.4.6" origin: "https://github.com/ingydotnet/git-subrepo" commit: "110b9eb" * Fix other versions
Diffstat (limited to 'linker_scripts')
-rw-r--r--linker_scripts/data_with_rodata.ld2
1 files changed, 2 insertions, 0 deletions
diff --git a/linker_scripts/data_with_rodata.ld b/linker_scripts/data_with_rodata.ld
index 8d508ee18..9318247f9 100644
--- a/linker_scripts/data_with_rodata.ld
+++ b/linker_scripts/data_with_rodata.ld
@@ -18,5 +18,7 @@ SECTIONS {
* To avoid dealing with this, we just discard all .gptab sections.
*/
*(.gptab.*)
+ /* Inhibit merging of COMMON into scommon */
+ *(.scommon)
}
}