update tests

decompals · Feb 27, 2024 · 69e5a9b · 69e5a9b
1 parent 364663f
commit 69e5a9b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 45 deletions.
diff --git a/tests/input_files/drmario64.yaml b/tests/input_files/drmario64.yaml
@@ -2,11 +2,6 @@ settings:
   base_path: build/us
 
   sections_allowlist:
-    # Basic sections.
-    # lld complains if .shstrtab is not explictly mentioned on the linker script when using a wildcard discard, so here we are
-    - .strtab
-    - .symtab
-    - .shstrtab
     # mips debug sections
     - .pdr
     - .mdebug
@@ -55,6 +50,10 @@ settings:
     # misc
     - .note
     - .comment
+  sections_allowlist_extra:
+    - .shstrtab
+    - .strtab
+    - .symtab
   sections_denylist:
     - .reginfo
     - .MIPS.abiflags

diff --git a/tests/linker_scripts/basic_example.ld b/tests/linker_scripts/basic_example.ld
@@ -262,14 +262,6 @@ SECTIONS
     boot_ROM_END = __romPos;
     boot_ROM_SIZE = ABSOLUTE(boot_ROM_END - boot_ROM_START);
 
-    .strtab 0 :
-    {
-        *(.strtab);
-    }
-    .symtab 0 :
-    {
-        *(.symtab);
-    }
     .shstrtab 0 :
     {
         *(.shstrtab);

diff --git a/tests/linker_scripts/drmario64.ld b/tests/linker_scripts/drmario64.ld
@@ -7475,18 +7475,6 @@ SECTIONS
     segment_tutorial_data_ROM_END = __romPos;
     segment_tutorial_data_ROM_SIZE = ABSOLUTE(segment_tutorial_data_ROM_END - segment_tutorial_data_ROM_START);
 
-    .strtab 0 :
-    {
-        *(.strtab);
-    }
-    .symtab 0 :
-    {
-        *(.symtab);
-    }
-    .shstrtab 0 :
-    {
-        *(.shstrtab);
-    }
     .pdr 0 :
     {
         *(.pdr);
@@ -7624,6 +7612,10 @@ SECTIONS
         *(.comment);
     }
 
+    .shstrtab 0 :
+    {
+        *(.shstrtab);
+    }
     .strtab 0 :
     {
         *(.strtab);
@@ -7632,10 +7624,6 @@ SECTIONS
     {
         *(.symtab);
     }
-    .shstrtab 0 :
-    {
-        *(.shstrtab);
-    }
 
     /DISCARD/ :
     {

diff --git a/tests/linker_scripts/hardcoded_gp.ld b/tests/linker_scripts/hardcoded_gp.ld
@@ -73,14 +73,6 @@ SECTIONS
     main_ROM_END = __romPos;
     main_ROM_SIZE = ABSOLUTE(main_ROM_END - main_ROM_START);
 
-    .strtab 0 :
-    {
-        *(.strtab);
-    }
-    .symtab 0 :
-    {
-        *(.symtab);
-    }
     .shstrtab 0 :
     {
         *(.shstrtab);

diff --git a/tests/linker_scripts/makerom_zelda_like.ld b/tests/linker_scripts/makerom_zelda_like.ld
@@ -133,14 +133,6 @@ SECTIONS
     _bootSegmentRomEnd = __romPos;
     _bootSegmentRomSize = ABSOLUTE(_bootSegmentRomEnd - _bootSegmentRomStart);
 
-    .strtab 0 :
-    {
-        *(.strtab);
-    }
-    .symtab 0 :
-    {
-        *(.symtab);
-    }
     .shstrtab 0 :
     {
         *(.shstrtab);