From c028db03b47f8b38bc2a1b87569fd7fae0ea9067 Mon Sep 17 00:00:00 2001
From: Tharo <17233964+Thar0@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:55:04 +0000
Subject: 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
---
 linker_scripts/data_with_rodata.ld | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linker_scripts')

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)
     }
 }
-- 
cgit v1.2.3