From 2902e6682d63183d373f385d4efaf8597fd22544 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 27 Jul 2023 18:03:49 +0930 Subject: [PATCH] /DISCARD/ in ld testsuite The canonical form to discard all sections not mentioned earlier in the script is /DISCARD/ : { *(*) } not /DISCARD/ : { *(.*) } ".*" happens to work with the usual section names starting with a dot, but let's not promote something not quite right. --- ld/testsuite/ld-elf/expr1.t | 2 +- ld/testsuite/ld-elf/flags1.ld | 2 +- ld/testsuite/ld-elf/loadaddr.t | 2 +- ld/testsuite/ld-elf/loadaddr3.t | 2 +- ld/testsuite/ld-elf/noload-1.t | 2 +- ld/testsuite/ld-elf/overlay.t | 2 +- ld/testsuite/ld-elf/pr13839.t | 2 +- ld/testsuite/ld-elf/pr14052.t | 2 +- ld/testsuite/ld-elf/pr14156c.t | 2 +- ld/testsuite/ld-elf/pr19005.t | 2 +- ld/testsuite/ld-elf/relocatable.t | 2 +- ld/testsuite/ld-i386/alloc.t | 2 +- ld/testsuite/ld-pe/image_size.t | 2 +- ld/testsuite/ld-scripts/empty-address-1.t | 2 +- ld/testsuite/ld-scripts/empty-address-2a.t | 2 +- ld/testsuite/ld-scripts/empty-address-2b.t | 2 +- ld/testsuite/ld-scripts/empty-address-3a.t | 2 +- ld/testsuite/ld-scripts/empty-address-3b.t | 2 +- ld/testsuite/ld-scripts/empty-address-3c.t | 2 +- ld/testsuite/ld-scripts/empty-address-4.t | 2 +- ld/testsuite/ld-scripts/phdrs.t | 2 +- ld/testsuite/ld-scripts/phdrs2.t | 2 +- ld/testsuite/ld-scripts/phdrs3.t | 2 +- ld/testsuite/ld-scripts/phdrs3a.t | 2 +- ld/testsuite/ld-scripts/provide-9.t | 2 +- ld/testsuite/ld-scripts/sort-file.t | 2 +- ld/testsuite/ld-scripts/sort.t | 2 +- ld/testsuite/ld-scripts/sort_b_a.t | 2 +- ld/testsuite/ld-scripts/sort_b_a_a.t | 2 +- ld/testsuite/ld-scripts/sort_b_a_n.t | 2 +- ld/testsuite/ld-scripts/sort_b_n.t | 2 +- ld/testsuite/ld-scripts/sort_b_n_a.t | 2 +- ld/testsuite/ld-scripts/sort_b_n_n.t | 2 +- ld/testsuite/ld-scripts/sort_no.t | 2 +- ld/testsuite/ld-x86-64/pr18176.t | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ld/testsuite/ld-elf/expr1.t b/ld/testsuite/ld-elf/expr1.t index 9670e255bbd..684cffb862c 100644 --- a/ld/testsuite/ld-elf/expr1.t +++ b/ld/testsuite/ld-elf/expr1.t @@ -2,5 +2,5 @@ SECTIONS { .bar : AT ((ADDR(.foo) + 4095) & ~(4095)) { *(.bar) } .foo : { *(.foo) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-elf/flags1.ld b/ld/testsuite/ld-elf/flags1.ld index c003ce72c19..14d17cbe443 100644 --- a/ld/testsuite/ld-elf/flags1.ld +++ b/ld/testsuite/ld-elf/flags1.ld @@ -9,5 +9,5 @@ SECTIONS { . += 0x160; } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-elf/loadaddr.t b/ld/testsuite/ld-elf/loadaddr.t index 91e9ef294f0..e4036f15425 100644 --- a/ld/testsuite/ld-elf/loadaddr.t +++ b/ld/testsuite/ld-elf/loadaddr.t @@ -6,5 +6,5 @@ SECTIONS .foo : { *(.foo) } . = ALIGN(8192); .data : AT (ADDR(.data)) { *(.data) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-elf/loadaddr3.t b/ld/testsuite/ld-elf/loadaddr3.t index 789f61eda1e..c70e36301f1 100644 --- a/ld/testsuite/ld-elf/loadaddr3.t +++ b/ld/testsuite/ld-elf/loadaddr3.t @@ -12,5 +12,5 @@ SECTIONS .data : {data_load = LOADADDR (.data); data_start = ADDR (.data); *(.data .data.*)} >ram AT>rom - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-elf/noload-1.t b/ld/testsuite/ld-elf/noload-1.t index 768cd423e02..7c5c26dcb3e 100644 --- a/ld/testsuite/ld-elf/noload-1.t +++ b/ld/testsuite/ld-elf/noload-1.t @@ -5,5 +5,5 @@ SECTIONS { *(TEST) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-elf/overlay.t b/ld/testsuite/ld-elf/overlay.t index 640af9650fb..ee37d05d2b5 100644 --- a/ld/testsuite/ld-elf/overlay.t +++ b/ld/testsuite/ld-elf/overlay.t @@ -11,7 +11,7 @@ SECTIONS } = 0 .silly-name3 : { *(.silly-name3) } = 0 .silly-name4 : { *(.silly-name4) } = 0 - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } ASSERT(ADDR(.text1)==ADDR(.text2), "overlay error") ASSERT(ADDR(.silly-name1)==ADDR(.silly-name2), "silly overlay error") } diff --git a/ld/testsuite/ld-elf/pr13839.t b/ld/testsuite/ld-elf/pr13839.t index 6baa2288193..59997198ae5 100644 --- a/ld/testsuite/ld-elf/pr13839.t +++ b/ld/testsuite/ld-elf/pr13839.t @@ -4,6 +4,6 @@ SECTIONS { *(.text) } _end = .; - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } . = ASSERT((_end - _text <= (512 * 1024 * 1024)), "foo"); diff --git a/ld/testsuite/ld-elf/pr14052.t b/ld/testsuite/ld-elf/pr14052.t index 84fffbd499b..ebc40f124ef 100644 --- a/ld/testsuite/ld-elf/pr14052.t +++ b/ld/testsuite/ld-elf/pr14052.t @@ -8,5 +8,5 @@ SECTIONS { _data_start = .; *(.data) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-elf/pr14156c.t b/ld/testsuite/ld-elf/pr14156c.t index c8be2c57bfb..adf1f0a5076 100644 --- a/ld/testsuite/ld-elf/pr14156c.t +++ b/ld/testsuite/ld-elf/pr14156c.t @@ -1,5 +1,5 @@ SECTIONS { .text : { *(.text) } .foo : { *(SORT_NONE(.foo)) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-elf/pr19005.t b/ld/testsuite/ld-elf/pr19005.t index 0e89e0b6342..e9170c37132 100644 --- a/ld/testsuite/ld-elf/pr19005.t +++ b/ld/testsuite/ld-elf/pr19005.t @@ -2,5 +2,5 @@ SECTIONS { .foo : { *(.foo) } .bar : { *(.bar) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-elf/relocatable.t b/ld/testsuite/ld-elf/relocatable.t index 2ec056ae338..0839555b731 100644 --- a/ld/testsuite/ld-elf/relocatable.t +++ b/ld/testsuite/ld-elf/relocatable.t @@ -4,5 +4,5 @@ SECTIONS .text : { *(.text) } . = 0x900000; .data : { *(.data) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-i386/alloc.t b/ld/testsuite/ld-i386/alloc.t index f7dd17a3001..1bbb9a6be17 100644 --- a/ld/testsuite/ld-i386/alloc.t +++ b/ld/testsuite/ld-i386/alloc.t @@ -8,5 +8,5 @@ SECTIONS .bar : AT(ADDR(.bar) - 0xC0000000) { *(.bar) } :text .bss : AT(ADDR(.bss) - 0xC0000000) { *(.bss) } .foo 0 : AT(ADDR(.bss) + SIZEOF(.bss) - 0xC0000000) { *(.foo) } :text - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-pe/image_size.t b/ld/testsuite/ld-pe/image_size.t index f646eca5921..93f2f50b10f 100644 --- a/ld/testsuite/ld-pe/image_size.t +++ b/ld/testsuite/ld-pe/image_size.t @@ -11,5 +11,5 @@ SECTIONS { *(.data) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/empty-address-1.t b/ld/testsuite/ld-scripts/empty-address-1.t index a24f25a138b..a5796836935 100644 --- a/ld/testsuite/ld-scripts/empty-address-1.t +++ b/ld/testsuite/ld-scripts/empty-address-1.t @@ -8,5 +8,5 @@ SECTIONS } __data_end = .; .bss : { *(.bss) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/empty-address-2a.t b/ld/testsuite/ld-scripts/empty-address-2a.t index 0ab29a4db28..bc531158eb3 100644 --- a/ld/testsuite/ld-scripts/empty-address-2a.t +++ b/ld/testsuite/ld-scripts/empty-address-2a.t @@ -4,5 +4,5 @@ SECTIONS .data : { *(.data) } __data_end = .; .bss : { *(.bss) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/empty-address-2b.t b/ld/testsuite/ld-scripts/empty-address-2b.t index c6d1e523fc2..788cd65da48 100644 --- a/ld/testsuite/ld-scripts/empty-address-2b.t +++ b/ld/testsuite/ld-scripts/empty-address-2b.t @@ -8,5 +8,5 @@ SECTIONS } __data_end = .; .bss : { *(.bss) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/empty-address-3a.t b/ld/testsuite/ld-scripts/empty-address-3a.t index 28767a19c51..42128f8c0c0 100644 --- a/ld/testsuite/ld-scripts/empty-address-3a.t +++ b/ld/testsuite/ld-scripts/empty-address-3a.t @@ -7,5 +7,5 @@ SECTIONS } __data_end = .; .bss : { *(.bss) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/empty-address-3b.t b/ld/testsuite/ld-scripts/empty-address-3b.t index 6da24218858..2b9e27d926a 100644 --- a/ld/testsuite/ld-scripts/empty-address-3b.t +++ b/ld/testsuite/ld-scripts/empty-address-3b.t @@ -8,5 +8,5 @@ SECTIONS } __data_end = .; .bss : { *(.bss) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/empty-address-3c.t b/ld/testsuite/ld-scripts/empty-address-3c.t index 0829c58a3e4..13fe34e6cd2 100644 --- a/ld/testsuite/ld-scripts/empty-address-3c.t +++ b/ld/testsuite/ld-scripts/empty-address-3c.t @@ -8,5 +8,5 @@ SECTIONS } __data_end = .; .bss : { *(.bss) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/empty-address-4.t b/ld/testsuite/ld-scripts/empty-address-4.t index f25bbfea8ac..bb0c2f6aebc 100644 --- a/ld/testsuite/ld-scripts/empty-address-4.t +++ b/ld/testsuite/ld-scripts/empty-address-4.t @@ -7,5 +7,5 @@ SECTIONS ASSERT (. < 0x400, oops); } .bss : { *(.bss) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/phdrs.t b/ld/testsuite/ld-scripts/phdrs.t index 283e30c6799..1267322694a 100644 --- a/ld/testsuite/ld-scripts/phdrs.t +++ b/ld/testsuite/ld-scripts/phdrs.t @@ -12,5 +12,5 @@ SECTIONS . = 0x800000 + SIZEOF_HEADERS; .text : { *(.text) } :text .data : { *(.data) } :data - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/phdrs2.t b/ld/testsuite/ld-scripts/phdrs2.t index bccbcecbc8c..d5a4c2a34d7 100644 --- a/ld/testsuite/ld-scripts/phdrs2.t +++ b/ld/testsuite/ld-scripts/phdrs2.t @@ -19,5 +19,5 @@ SECTIONS LONG(EMPTY_START) ; } : Bar - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/phdrs3.t b/ld/testsuite/ld-scripts/phdrs3.t index 4bd4e858cf0..d86e2068962 100644 --- a/ld/testsuite/ld-scripts/phdrs3.t +++ b/ld/testsuite/ld-scripts/phdrs3.t @@ -12,5 +12,5 @@ SECTIONS . = 0x800000 + SIZEOF_HEADERS; .text : { *(.text) } :text .data : { *(.data) } :data - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/phdrs3a.t b/ld/testsuite/ld-scripts/phdrs3a.t index c07ff34b71f..4853b7b1018 100644 --- a/ld/testsuite/ld-scripts/phdrs3a.t +++ b/ld/testsuite/ld-scripts/phdrs3a.t @@ -11,5 +11,5 @@ SECTIONS . = 0x800000 + SIZEOF_HEADERS; .text : { *(.text) } :text .data : { *(.data) } :data - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/provide-9.t b/ld/testsuite/ld-scripts/provide-9.t index 00d906aa80a..b26051a22b8 100644 --- a/ld/testsuite/ld-scripts/provide-9.t +++ b/ld/testsuite/ld-scripts/provide-9.t @@ -20,6 +20,6 @@ SECTIONS *(.bss .bss.*) } >FOO - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/sort-file.t b/ld/testsuite/ld-scripts/sort-file.t index 559a0009256..f46f5748d3e 100644 --- a/ld/testsuite/ld-scripts/sort-file.t +++ b/ld/testsuite/ld-scripts/sort-file.t @@ -2,5 +2,5 @@ SECTIONS { .text : { SORT_BY_NAME(*)(.text*) } .data : { *(.data*) } - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/sort.t b/ld/testsuite/ld-scripts/sort.t index c53481f2f3d..a7bb88fe652 100644 --- a/ld/testsuite/ld-scripts/sort.t +++ b/ld/testsuite/ld-scripts/sort.t @@ -1,5 +1,5 @@ SECTIONS { .text : {*(.text .text.*)} - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/sort_b_a.t b/ld/testsuite/ld-scripts/sort_b_a.t index cbfd3c3a9e9..c53f6c2c30d 100644 --- a/ld/testsuite/ld-scripts/sort_b_a.t +++ b/ld/testsuite/ld-scripts/sort_b_a.t @@ -1,5 +1,5 @@ SECTIONS { .text : {*(SORT_BY_ALIGNMENT(.text*))} - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/sort_b_a_a.t b/ld/testsuite/ld-scripts/sort_b_a_a.t index 359cdffdd4e..df0b190bba1 100644 --- a/ld/testsuite/ld-scripts/sort_b_a_a.t +++ b/ld/testsuite/ld-scripts/sort_b_a_a.t @@ -1,5 +1,5 @@ SECTIONS { .text : {*(SORT_BY_ALIGNMENT(SORT_BY_ALIGNMENT(.text*)))} - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/sort_b_a_n.t b/ld/testsuite/ld-scripts/sort_b_a_n.t index 04c3917b4b4..f5661bb0d78 100644 --- a/ld/testsuite/ld-scripts/sort_b_a_n.t +++ b/ld/testsuite/ld-scripts/sort_b_a_n.t @@ -1,5 +1,5 @@ SECTIONS { .text : {*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.text*)))} - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/sort_b_n.t b/ld/testsuite/ld-scripts/sort_b_n.t index 26c2b6ea5dd..344d7f3218a 100644 --- a/ld/testsuite/ld-scripts/sort_b_n.t +++ b/ld/testsuite/ld-scripts/sort_b_n.t @@ -1,5 +1,5 @@ SECTIONS { .text : {*(SORT_BY_NAME(.text*))} - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/sort_b_n_a.t b/ld/testsuite/ld-scripts/sort_b_n_a.t index 49cbdd36047..532ba5276b9 100644 --- a/ld/testsuite/ld-scripts/sort_b_n_a.t +++ b/ld/testsuite/ld-scripts/sort_b_n_a.t @@ -1,5 +1,5 @@ SECTIONS { .text : {*(SORT_BY_NAME(SORT_BY_ALIGNMENT(.text*)))} - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/sort_b_n_n.t b/ld/testsuite/ld-scripts/sort_b_n_n.t index b4eabfe256c..b8b091491b5 100644 --- a/ld/testsuite/ld-scripts/sort_b_n_n.t +++ b/ld/testsuite/ld-scripts/sort_b_n_n.t @@ -1,5 +1,5 @@ SECTIONS { .text : {*(SORT_BY_NAME(SORT_BY_NAME(.text*)))} - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-scripts/sort_no.t b/ld/testsuite/ld-scripts/sort_no.t index d797c796e29..7ddc3524f23 100644 --- a/ld/testsuite/ld-scripts/sort_no.t +++ b/ld/testsuite/ld-scripts/sort_no.t @@ -1,5 +1,5 @@ SECTIONS { .text : {*(.text*)} - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } diff --git a/ld/testsuite/ld-x86-64/pr18176.t b/ld/testsuite/ld-x86-64/pr18176.t index 480c0cd99a7..0004a5e3607 100644 --- a/ld/testsuite/ld-x86-64/pr18176.t +++ b/ld/testsuite/ld-x86-64/pr18176.t @@ -35,5 +35,5 @@ SECTIONS . = ALIGN(64 / 8); _end = .; PROVIDE (end = .); . = DATA_SEGMENT_END (.); - /DISCARD/ : { *(.*) } + /DISCARD/ : { *(*) } } -- 2.30.2