diff options
| -rw-r--r-- | binutils/testsuite/binutils-all/readelf.s | 3 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/readelf.s-64 | 2 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/readelf.s-64-unused | 2 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/readelf.ss | 1 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/readelf.ss-64 | 1 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/readelf.ss-64-unused | 1 | ||||
| -rwxr-xr-x | gas/configure | 9 | ||||
| -rw-r--r-- | gas/configure.ac | 9 |
8 files changed, 11 insertions, 17 deletions
diff --git a/binutils/testsuite/binutils-all/readelf.s b/binutils/testsuite/binutils-all/readelf.s index 6ae4dc7..ff37acb 100644 --- a/binutils/testsuite/binutils-all/readelf.s +++ b/binutils/testsuite/binutils-all/readelf.s @@ -11,9 +11,10 @@ Section Headers: #... +\[ .\] .* +PROGBITS +00000000 0000(3c|40|44|48|50) 0000(04|10) 00 +WA +0 +0 +(.|..) +\[ .\] .* +NOBITS +00000000 0000(40|44|48|4c|60) 000000 00 +WA +0 +0 +(.|..) -# ARM targets put .ARM.attributes here +# ARM targets put .ARM.attributes here. # MIPS targets put .reginfo, .mdebug, .MIPS.abiflags and .gnu.attributes here. # v850 targets put .call_table_data and .call_table_text here. +# riscv targets put .riscv.attributes here. #... +\[..\] .symtab +SYMTAB +00000000 0+.* 0+.* 10 +.. +.+ +4 +\[..\] .strtab +STRTAB +00000000 0+.* 0+.* 00 .* +0 +0 +1 diff --git a/binutils/testsuite/binutils-all/readelf.s-64 b/binutils/testsuite/binutils-all/readelf.s-64 index 92ec05f..4c957f7 100644 --- a/binutils/testsuite/binutils-all/readelf.s-64 +++ b/binutils/testsuite/binutils-all/readelf.s-64 @@ -14,10 +14,12 @@ Section Headers: +\[ 4\] .bss +NOBITS +0000000000000000 +000000(4c|50|54|58|68) +0000000000000000 +0000000000000000 +WA +0 +0 +.* # x86 targets may put .note.gnu.property here. +# riscv targets put .riscv.attributes here. #... +\[ .\] .symtab +SYMTAB +0000000000000000 +0+.* # aarch64-elf targets have one more data symbol. # x86 targets may have .note.gnu.property. +# riscv targets have .riscv.attributes. +0+.* +0000000000000018 +(6|7) +(3|4) +8 +\[ .\] .strtab +STRTAB +0000000000000000 +0+.* +0+.* +0000000000000000 .* +0 +0 +1 diff --git a/binutils/testsuite/binutils-all/readelf.s-64-unused b/binutils/testsuite/binutils-all/readelf.s-64-unused index a1e6cd1..7714394 100644 --- a/binutils/testsuite/binutils-all/readelf.s-64-unused +++ b/binutils/testsuite/binutils-all/readelf.s-64-unused @@ -14,10 +14,12 @@ Section Headers: +\[ 4\] .bss +NOBITS +0000000000000000 +000000(4c|50|54|58) +0000000000000000 +0000000000000000 +WA +0 +0 +.* # x86 targets may put .note.gnu.property here. +# riscv targets put .riscv.attributes here. #... +\[ .\] .symtab +SYMTAB +0000000000000000 +0+.* # aarch64-elf targets have one more data symbol. # x86 targets may have .note.gnu.property. +# riscv targets have .riscv.attributes. +0+.* +0000000000000018 +(6|7) +(6|7) +8 +\[ .\] .strtab +STRTAB +0000000000000000 +0+.* +0+.* +0000000000000000 .* +0 +0 +1 diff --git a/binutils/testsuite/binutils-all/readelf.ss b/binutils/testsuite/binutils-all/readelf.ss index 5fbb5d0..b81c016 100644 --- a/binutils/testsuite/binutils-all/readelf.ss +++ b/binutils/testsuite/binutils-all/readelf.ss @@ -9,6 +9,7 @@ Symbol table '.symtab' contains .* entries: +.: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +[34] static_data_symbol # v850 targets include extra SECTION symbols here for the .call_table_data # and .call_table_text sections. +# riscv targets add .riscv.attribute symbol here... #... +[0-9]+: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +1 text_symbol +[0-9]+: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol diff --git a/binutils/testsuite/binutils-all/readelf.ss-64 b/binutils/testsuite/binutils-all/readelf.ss-64 index 99a732f..c6ffb0f 100644 --- a/binutils/testsuite/binutils-all/readelf.ss-64 +++ b/binutils/testsuite/binutils-all/readelf.ss-64 @@ -7,6 +7,7 @@ Symbol table '.symtab' contains .* entries: #... +.: 0000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +3 static_data_symbol # ... or here ... +# riscv targets add .riscv.attribute symbol here... #... .* +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +1 text_symbol +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol diff --git a/binutils/testsuite/binutils-all/readelf.ss-64-unused b/binutils/testsuite/binutils-all/readelf.ss-64-unused index f48a4b2..cf515aa 100644 --- a/binutils/testsuite/binutils-all/readelf.ss-64-unused +++ b/binutils/testsuite/binutils-all/readelf.ss-64-unused @@ -10,6 +10,7 @@ Symbol table '.symtab' contains .* entries: #... +.: 0000000000000000 +0 +NOTYPE +LOCAL +DEFAULT +3 static_data_symbol # ... or here ... +# riscv targets add .riscv.attribute symbol here... #... .* +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +1 text_symbol +.: 0000000000000000 +0 +NOTYPE +GLOBAL +DEFAULT +UND external_symbol diff --git a/gas/configure b/gas/configure index 110d707..7a528fd 100755 --- a/gas/configure +++ b/gas/configure @@ -12550,14 +12550,7 @@ _ACEOF if test ${ac_default_generate_riscv_attr} = unset; then - case ${target_os} in - elf) - ac_default_generate_riscv_attr=1 - ;; - *) - ac_default_generate_riscv_attr=0 - ;; - esac + ac_default_generate_riscv_attr=1 fi diff --git a/gas/configure.ac b/gas/configure.ac index 78efba8..e237426 100644 --- a/gas/configure.ac +++ b/gas/configure.ac @@ -727,14 +727,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_X86_USED_NOTE, properties by default.]) if test ${ac_default_generate_riscv_attr} = unset; then - case ${target_os} in - elf) - ac_default_generate_riscv_attr=1 - ;; - *) - ac_default_generate_riscv_attr=0 - ;; - esac + ac_default_generate_riscv_attr=1 fi AC_DEFINE_UNQUOTED(DEFAULT_RISCV_ATTR, |