ARC: update definitions in elf/elf.h
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 8 lines · Shahab Vahedi
While porting ARCv2 to elfutils [1], it was brought up that the necessary changes to the project's
libelf/elf.hmust come from glibc, because they sync it from glibc [2]. Therefore, this patch is to update ARC entries inelf/elf.h.The majority of the update is about adding new definitions, specially for the relocations. However, there is one rename, one deletion, and one change:
For completeness: And some cosmetic changes to uppercase hex digits.
Quoted 4 lines
-
R_ARC_JUMP_SLOTrenamed toR_ARC_JMP_SLOTto match binutils.
-R_ARC_B26removed because it is unused and deprecated.
-R_ARC_TLS_DTPOFF_S9changed from0x4ato the correct value0x49.
Technically this would be an ABI change, but is currently not being used in glibc at all (and I doubt anything outside glibc would use it anyways) so this should be non-controversial.
Quoted 41 lines
[1]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005530.html[2]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005548.htmlSigned-off-by Shahab Vahedi <[email protected]>--- elf/elf.h | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-)elf/elf.h +11
-1@@ -4160,13 +4160,23 @@ enum#define R_LARCH_GNU_VTENTRY 58 +/* ARC specific declarations. */ + +/* Processor specific flags for the Ehdr e_flags field. */ +#define EF_ARC_MACH_MSK 0x000000ff +#define EF_ARC_OSABI_MSK 0x00000f00 +#define EF_ARC_ALL_MSK (EF_ARC_MACH_MSK | EF_ARC_OSABI_MSK) + +/* Processor specific values for the Shdr sh_type field. */ +#define SHT_ARC_ATTRIBUTES (SHT_LOPROC + 1)/* ARC attributes section. */ +/* ARCompact/ARCv2 specific relocs. */ #define R_ARC_NONE 0x0#define R_ARC_8 0x1#define R_ARC_16 0x2#define R_ARC_24 0x3#define R_ARC_32 0x4 -#define R_ARC_B26 0x5 +#define R_ARC_B22_PCREL 0x6#define R_ARC_H30 0x7#define R_ARC_N8 0x8
elf/elf.h enum · line 4221
Quoted 6 lines
elf/elf.h +3
-0@@ -4206,16 +4216,23 @@ enum#define R_ARC_SECTOFF_ME_2 0x2A#define R_ARC_SECTOFF_1 0x2B#define R_ARC_SECTOFF_2 0x2C +#define R_ARC_SDA_12 0x2D +#define R_ARC_SDA16_ST2 0x30 +#define R_ARC_32_PCREL 0x31
OK.
elf/elf.h enum · line 4227
Quoted 7 lines
elf/elf.h +1
-1#define R_ARC_PC32 0x32#define R_ARC_GOTPC32 0x33#define R_ARC_PLT32 0x34#define R_ARC_COPY 0x35#define R_ARC_GLOB_DAT 0x36 -#define R_ARC_JUMP_SLOT 0x37 +#define R_ARC_JMP_SLOT 0x37
Did you build glibc with this change ? There are references to old definition.
git grep R_ARC_JUMP_SLOT
sysdeps/arc/dl-machine.h:199: ((((type) == R_ARC_JUMP_SLOT \
sysdeps/arc/dl-machine.h:206:#define ELF_MACHINE_JMP_SLOT R_ARC_JUMP_SLOT sysdeps/arc/dl-machine.h:277: case R_ARC_JUMP_SLOT:
sysdeps/arc/dl-machine.h:337: if (r_type == R_ARC_JUMP_SLOT)
elf/elf.h enum · line 4235
Quoted 8 lines
elf/elf.h +4
-0#define R_ARC_RELATIVE 0x38#define R_ARC_GOTOFF 0x39#define R_ARC_GOTPC 0x3A#define R_ARC_GOT32 0x3B +#define R_ARC_S21W_PCREL_PLT 0x3C +#define R_ARC_S25H_PCREL_PLT 0x3D + +#define R_ARC_JLI_SECTOFF 0x3F
OK.
elf/elf.h enum · line 4244
Quoted 10 lines
elf/elf.h +1
-3#define R_ARC_TLS_DTPMOD 0x42#define R_ARC_TLS_DTPOFF 0x43@@ -4224,9 +4241,12 @@ enum#define R_ARC_TLS_GD_LD 0x46#define R_ARC_TLS_GD_CALL 0x47#define R_ARC_TLS_IE_GOT 0x48 -#define R_ARC_TLS_DTPOFF_S9 0x4a -#define R_ARC_TLS_LE_S9 0x4a -#define R_ARC_TLS_LE_32 0x4b +#define R_ARC_TLS_DTPOFF_S9 0x49
Value change, but not used currently so no ABI implications.
elf/elf.h enum · line 4245
Quoted 1 line
elf/elf.h +1
-0+#define R_ARC_TLS_LE_S9 0x4A
cosmetic. OK
elf/elf.h enum · line 4246
Quoted 1 line
elf/elf.h +1
-0+#define R_ARC_TLS_LE_32 0x4B
Ditto.
elf/elf.h enum · line 4249
Quoted 3 lines
elf/elf.h +3
-0+#define R_ARC_S25W_PCREL_PLT 0x4C +#define R_ARC_S21H_PCREL_PLT 0x4D +#define R_ARC_NPS_CMEM16 0x4E
OK.
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Hi Vineet,
FYI, a second version of the patch is submitted [1]. Regarding what has changed, a changelog is put right after the sign-off line.
Quoted 6 lines · Vineet Gupta
Quoted 3 lines · Shahab Vahedi
The majority of the update is about adding new definitions, specially for the relocations. However, there is one rename, one deletion, and one change:
For completeness: And some cosmetic changes to uppercase hex digits.
Indeed, there are some cosmetic changes. If you don't mind, I'm going to leave this part out of the commit message.
Quoted 11 lines
Review
Quoted 2 lines
(quoted diff) +1
-1-#define R_ARC_JUMP_SLOT 0x37 +#define R_ARC_JMP_SLOT 0x37Did you build glibc with this change ? There are references to old definition.
git grep
R_ARC_JUMP_SLOT
sysdeps/arc/dl-machine.h:199: ((((type) ==R_ARC_JUMP_SLOT\
sysdeps/arc/dl-machine.h:206:#defineELF_MACHINE_JMP_SLOTR_ARC_JUMP_SLOTsysdeps/arc/dl-machine.h:277: caseR_ARC_JUMP_SLOT:sysdeps/arc/dl-machine.h:337: if (r_type==R_ARC_JUMP_SLOT)
Thank you very much for noticing this. This was a snafu on my part. I forgot to bring the complete changes from an old downstream branch I had. This has been fixed in v2 of the patch [1] which is now tested by building the current master branch:
$ module load <arcv2_toolchain>
$ configure --prefix=/usr \
--with-headers=/path/to/sysroot/usr/include \
--build=x86_64-pc-linux-gnu \
--host=arc-snps-linux-gnu \
--target=arc-snps-linux-gnu \
--disable-werror \
CFLAGS="-Og -g3 -fvar-tracking-assignments" \
CXXFLAGS="-Og -g3 -fvar-tracking-assignments"
$ make[1]
https://sourceware.org/pipermail/libc-alpha/2022-November/143536.html
Signature · 5 lines
Shahab _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH v2 1/1 ARC: update definitions in elf/elf.h
In reply to a message not in the archiveWhile porting ARCv2 to elfutils [1], it was brought up that the necessary changes to the project's libelf/elf.h must come from glibc, because they sync it from glibc [2]. Therefore, this patch is to update ARC entries in elf/elf.h.
The majority of the update is about adding new definitions, specially for the relocations. However, there is one rename, one deletion, and one change:
- R_ARC_JUMP_SLOT renamed to R_ARC_JMP_SLOT to match binutils.
- R_ARC_B26 removed because it is unused and deprecated.
- R_ARC_TLS_DTPOFF_S9 changed from 0x4a to the correct value 0x49.
[1]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005530.html
[2]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005548.html
---
Chagelog:
v2:
- Rename instances of R_ARC_JUMP_SLOT to R_ARC_JMP_SLOT.
- Remove an unnecessary extra empty line introduced in elf/elf.h.
elf/elf.h | 29 ++++++++++++++++++++++++----- sysdeps/arc/dl-machine.h | 8 ++++---- 2 files changed, 28 insertions(+), 9 deletions(-)
elf/elf.h +24 -5
@@ -4159,6 +4159,15 @@ enum#define R_LARCH_GNU_VTINHERIT 57#define R_LARCH_GNU_VTENTRY 58 +/* ARC specific declarations. */ + +/* Processor specific flags for the Ehdr e_flags field. */ +#define EF_ARC_MACH_MSK 0x000000ff +#define EF_ARC_OSABI_MSK 0x00000f00 +#define EF_ARC_ALL_MSK (EF_ARC_MACH_MSK | EF_ARC_OSABI_MSK) + +/* Processor specific values for the Shdr sh_type field. */ +#define SHT_ARC_ATTRIBUTES (SHT_LOPROC + 1)/* ARC attributes section. */ /* ARCompact/ARCv2 specific relocs. */ #define R_ARC_NONE 0x0
@@ -4166,7 +4175,7 @@ enum#define R_ARC_16 0x2#define R_ARC_24 0x3#define R_ARC_32 0x4 -#define R_ARC_B26 0x5 +#define R_ARC_B22_PCREL 0x6#define R_ARC_H30 0x7#define R_ARC_N8 0x8
@@ -4206,16 +4215,23 @@ enum#define R_ARC_SECTOFF_ME_2 0x2A#define R_ARC_SECTOFF_1 0x2B#define R_ARC_SECTOFF_2 0x2C +#define R_ARC_SDA_12 0x2D +#define R_ARC_SDA16_ST2 0x30 +#define R_ARC_32_PCREL 0x31#define R_ARC_PC32 0x32#define R_ARC_GOTPC32 0x33#define R_ARC_PLT32 0x34#define R_ARC_COPY 0x35#define R_ARC_GLOB_DAT 0x36 -#define R_ARC_JUMP_SLOT 0x37 +#define R_ARC_JMP_SLOT 0x37#define R_ARC_RELATIVE 0x38#define R_ARC_GOTOFF 0x39#define R_ARC_GOTPC 0x3A#define R_ARC_GOT32 0x3B +#define R_ARC_S21W_PCREL_PLT 0x3C +#define R_ARC_S25H_PCREL_PLT 0x3D + +#define R_ARC_JLI_SECTOFF 0x3F#define R_ARC_TLS_DTPMOD 0x42#define R_ARC_TLS_DTPOFF 0x43
@@ -4224,9 +4240,12 @@ enum#define R_ARC_TLS_GD_LD 0x46#define R_ARC_TLS_GD_CALL 0x47#define R_ARC_TLS_IE_GOT 0x48 -#define R_ARC_TLS_DTPOFF_S9 0x4a -#define R_ARC_TLS_LE_S9 0x4a -#define R_ARC_TLS_LE_32 0x4b +#define R_ARC_TLS_DTPOFF_S9 0x49 +#define R_ARC_TLS_LE_S9 0x4A +#define R_ARC_TLS_LE_32 0x4B +#define R_ARC_S25W_PCREL_PLT 0x4C +#define R_ARC_S21H_PCREL_PLT 0x4D +#define R_ARC_NPS_CMEM16 0x4E/* OpenRISC 1000 specific relocs. */ #define R_OR1K_NONE 0
sysdeps/arc/dl-machine.h +4 -4
@@ -183,14 +183,14 @@ __start: \n\ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one of the main executable's symbols, as for a COPY reloc. */ #define elf_machine_type_class (type) \ - ((((type) == R_ARC_JUMP_SLOT \ + ((((type) == R_ARC_JMP_SLOT \ || (type) == R_ARC_TLS_DTPMOD \ || (type) == R_ARC_TLS_DTPOFF \ || (type) == R_ARC_TLS_TPOFF) * ELF_RTYPE_CLASS_PLT) \ | (((type) == R_ARC_COPY) * ELF_RTYPE_CLASS_COPY))/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ -#define ELF_MACHINE_JMP_SLOT R_ARC_JUMP_SLOT +#define ELF_MACHINE_JMP_SLOT R_ARC_JMP_SLOT/* Fixup a PLT entry to bounce directly to the function at VALUE. */
@@ -261,7 +261,7 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[],break ;case R_ARC_GLOB_DAT : -case R_ARC_JUMP_SLOT : +case R_ARC_JMP_SLOT : *reloc_addr = value;break ;
@@ -321,7 +321,7 @@ elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[],ElfW (Addr) *const reloc_addr = (void *) (l_addr + reloc->r_offset);const unsigned int r_type =ELFW (R_TYPE ) (reloc->r_info); -if (r_type ==R_ARC_JUMP_SLOT ) +if (r_type ==R_ARC_JMP_SLOT ) *reloc_addr += l_addr;else _dl_reloc_bad_type (map, r_type,1 );
Signature · 7 lines
2.38.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Quoted 13 lines · Shahab Vahedi via Libc-alpha
While porting ARCv2 to elfutils [1], it was brought up that the necessary changes to the project's
libelf/elf.hmust come from glibc, because they sync it from glibc [2]. Therefore, this patch is to update ARC entries inelf/elf.h.The majority of the update is about adding new definitions, specially for the relocations. However, there is one rename, one deletion, and one change:
-
R_ARC_JUMP_SLOTrenamed toR_ARC_JMP_SLOTto match binutils.
-R_ARC_B26removed because it is unused and deprecated.
-R_ARC_TLS_DTPOFF_S9changed from0x4ato the correct value0x49.
Quoted 7 lines
[1]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005530.html[2]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005548.htmlSigned-off-by Shahab Vahedi <[email protected]>
We discussed this briefly on glibc patchwork review meeting [1], and if does not trigger any regression it ok to arch maintainers to handle such changes.
[1] https://sourceware.org/glibc/wiki/PatchworkReviewMeetings
Quoted 111 lines
---
Chagelog:
v2:
- Rename instances ofR_ARC_JUMP_SLOTtoR_ARC_JMP_SLOT.
- Remove an unnecessary extra empty line introduced inelf/elf.h.elf/elf.h | 29 ++++++++++++++++++++++++----- sysdeps/arc/dl-machine.h | 8 ++++---- 2 files changed, 28 insertions(+), 9 deletions(-)elf/elf.h +24
-5@@ -4159,6 +4159,15 @@ enum#define R_LARCH_GNU_VTINHERIT 57#define R_LARCH_GNU_VTENTRY 58 +/* ARC specific declarations. */ + +/* Processor specific flags for the Ehdr e_flags field. */ +#define EF_ARC_MACH_MSK 0x000000ff +#define EF_ARC_OSABI_MSK 0x00000f00 +#define EF_ARC_ALL_MSK (EF_ARC_MACH_MSK | EF_ARC_OSABI_MSK) + +/* Processor specific values for the Shdr sh_type field. */ +#define SHT_ARC_ATTRIBUTES (SHT_LOPROC + 1)/* ARC attributes section. */ /* ARCompact/ARCv2 specific relocs. */ #define R_ARC_NONE 0x0@@ -4166,7 +4175,7 @@ enum#define R_ARC_16 0x2#define R_ARC_24 0x3#define R_ARC_32 0x4 -#define R_ARC_B26 0x5 +#define R_ARC_B22_PCREL 0x6#define R_ARC_H30 0x7#define R_ARC_N8 0x8@@ -4206,16 +4215,23 @@ enum#define R_ARC_SECTOFF_ME_2 0x2A#define R_ARC_SECTOFF_1 0x2B#define R_ARC_SECTOFF_2 0x2C +#define R_ARC_SDA_12 0x2D +#define R_ARC_SDA16_ST2 0x30 +#define R_ARC_32_PCREL 0x31#define R_ARC_PC32 0x32#define R_ARC_GOTPC32 0x33#define R_ARC_PLT32 0x34#define R_ARC_COPY 0x35#define R_ARC_GLOB_DAT 0x36 -#define R_ARC_JUMP_SLOT 0x37 +#define R_ARC_JMP_SLOT 0x37#define R_ARC_RELATIVE 0x38#define R_ARC_GOTOFF 0x39#define R_ARC_GOTPC 0x3A#define R_ARC_GOT32 0x3B +#define R_ARC_S21W_PCREL_PLT 0x3C +#define R_ARC_S25H_PCREL_PLT 0x3D + +#define R_ARC_JLI_SECTOFF 0x3F#define R_ARC_TLS_DTPMOD 0x42#define R_ARC_TLS_DTPOFF 0x43@@ -4224,9 +4240,12 @@ enum#define R_ARC_TLS_GD_LD 0x46#define R_ARC_TLS_GD_CALL 0x47#define R_ARC_TLS_IE_GOT 0x48 -#define R_ARC_TLS_DTPOFF_S9 0x4a -#define R_ARC_TLS_LE_S9 0x4a -#define R_ARC_TLS_LE_32 0x4b +#define R_ARC_TLS_DTPOFF_S9 0x49 +#define R_ARC_TLS_LE_S9 0x4A +#define R_ARC_TLS_LE_32 0x4B +#define R_ARC_S25W_PCREL_PLT 0x4C +#define R_ARC_S21H_PCREL_PLT 0x4D +#define R_ARC_NPS_CMEM16 0x4E/* OpenRISC 1000 specific relocs. */ #define R_OR1K_NONE 0sysdeps/arc/dl-machine.h +3
-3@@ -183,14 +183,14 @@ __start: \n\ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one of the main executable's symbols, as for a COPY reloc. */ #define elf_machine_type_class (type) \ - ((((type) == R_ARC_JUMP_SLOT \ + ((((type) == R_ARC_JMP_SLOT \ || (type) == R_ARC_TLS_DTPMOD \ || (type) == R_ARC_TLS_DTPOFF \ || (type) == R_ARC_TLS_TPOFF) * ELF_RTYPE_CLASS_PLT) \ | (((type) == R_ARC_COPY) * ELF_RTYPE_CLASS_COPY))/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ -#define ELF_MACHINE_JMP_SLOT R_ARC_JUMP_SLOT +#define ELF_MACHINE_JMP_SLOT R_ARC_JMP_SLOT/* Fixup a PLT entry to bounce directly to the function at VALUE. */ @@ -261,7 +261,7 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[],break ;case R_ARC_GLOB_DAT : -case R_ARC_JUMP_SLOT : +case R_ARC_JMP_SLOT : *reloc_addr = value;break ;
sysdeps/arc/dl-machine.h elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[], · line 327
Quoted 8 lines
sysdeps/arc/dl-machine.h +1
-1@@ -321,7 +321,7 @@ elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[],ElfW (Addr) *const reloc_addr = (void *) (l_addr + reloc->r_offset);const unsigned int r_type =ELFW (R_TYPE ) (reloc->r_info); -if (r_type ==R_ARC_JUMP_SLOT ) +if (r_type ==R_ARC_JMP_SLOT ) *reloc_addr += l_addr;else _dl_reloc_bad_type (map, r_type,1 );
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Quoted 17 lines · Adhemerval Zanella Netto
Quoted 16 lines · Shahab Vahedi via Libc-alpha
While porting ARCv2 to elfutils [1], it was brought up that the necessary changes to the project's
libelf/elf.hmust come from glibc, because they sync it from glibc [2]. Therefore, this patch is to update ARC entries inelf/elf.h.The majority of the update is about adding new definitions, specially for the relocations. However, there is one rename, one deletion, and one change:
-
R_ARC_JUMP_SLOTrenamed toR_ARC_JMP_SLOTto match binutils.
-R_ARC_B26removed because it is unused and deprecated.
-R_ARC_TLS_DTPOFF_S9changed from0x4ato the correct value0x49.[1]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005530.html
Quoted 7 lines
Quoted 4 lines
[2]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005548.htmlSigned-off-by Shahab Vahedi<[email protected]>We discussed this briefly on glibc patchwork review meeting [1], and if does not trigger any regression it ok to arch maintainers to handle such changes.
Shahab as a process followup, can you run the full glibc testsuite w/ and w/o this change and post the results summary here. It should be easy to do this with hsdk dev board. It can also help find fill the the glibc testing log for arc for the upcoming release ;-) as 2.36 [1] seems untested.
-Vineet
[1] https://sourceware.org/glibc/wiki/Release/2.36
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
v3 cover Update ARC definitions in elf/elf.h
In reply to a message not in the archiveAfter updating the ARC definitions in elf/elf.h (the second patch of this series), I noticed a lack of parsing support for it in glibcpp.py. Please read the description of the first patch for more details. To have the tests pass all the time, the first patch fixes the potential issue and the second one is related to the actual update of definitions in elf.h header.
Rationale for the CCs:
Florian Weimer -- Changes related to glibcpp and glibcelf Vineet Gupta -- Changes related to elf.h (ARC section)
Shahab Vahedi (2):
scripts: Add "|" operator support to glibcpp's parsing
ARC: update definitions in elf/elf.h
elf/elf.h | 29 ++++++++++++++++++++++++----- scripts/glibcelf.py | 3 +++ scripts/glibcpp.py | 1 + support/tst-glibcpp.py | 1 + sysdeps/arc/dl-machine.h | 8 ++++---- 5 files changed, 33 insertions(+), 9 deletions(-)
Signature · 7 lines
2.38.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH v3 1/2 scripts: Add "|" operator support to glibcpp's parsing
From the tests point of view, this is a necessary step for another patch [1] and allows parsing macros such as "#define A | B". Without it, a few tests [2] choke when the other patch [1] is applied:
/src/glibc/scripts/../elf/elf.h:4167: error: uninterpretable macro token sequence: ( EF_ARC_MACH_MSK | EF_ARC_OSABI_MSK ) Traceback (most recent call last):
File "/src/glibc/elf/tst-glibcelf.py", line 23, in <module>
import glibcelf
File "/src/glibc/scripts/glibcelf.py", line 226, in <module>
_elf_h = _parse_elf_h()
^^^^^^^^^^^^^^
File "/src/glibc/scripts/glibcelf.py", line 223, in _parse_elf_h
raise IOError('parse error in elf.h')
OSError: parse error in elf.h
[1] ARC: update definitions in elf/elf.h
https://sourceware.org/pipermail/libc-alpha/2022-November/143503.html
[2]
tst-glibcelf, tst-relro-ldso, and tst-relro-libc
--- scripts/glibcpp.py | 1 + support/tst-glibcpp.py | 1 + 2 files changed, 2 insertions(+)
scripts/glibcpp.py +1 -0
@@ -346,6 +346,7 @@ RE_SPLIT_INTEGER_SUFFIX = re.compile(r'([^ullULL]+)([ullULL]*)') BINARY_OPERATORS = { '+': operator.add, '<<': operator.lshift, + '|': operator.or_, } # Use the general-purpose dict type if it is order-preserving.
support/tst-glibcpp.py +1 -0
@@ -131,6 +131,7 @@ check_macro_eval('#define A 1', {'A': 1}) check_macro_eval('#define A (1)', {'A': 1}) check_macro_eval('#define A (1 + 1)', {'A': 2}) check_macro_eval('#define A (1U << 31)', {'A': 1 << 31}) +check_macro_eval('#define A (1 | 2)', {'A': 1 | 2}) check_macro_eval('''\ #define A (B + 1) #define B 10
Signature · 7 lines
2.38.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH v3 1/2] scripts: Add "|" operator support to glibcpp's parsing
* Shahab Vahedi:
Quoted 16 lines
From the tests point of view, this is a necessary step for another patch [1] and allows parsing macros such as "#define A | B". Without it, a few tests [2] choke when the other patch [1] is applied:
/src/glibc/scripts/../elf/elf.h:4167: error: uninterpretable macro token sequence: (
EF_ARC_MACH_MSK|EF_ARC_OSABI_MSK) Traceback (most recent call last):
File "/src/glibc/elf/tst-glibcelf.py", line 23, in <module>
import glibcelf
File "/src/glibc/scripts/glibcelf.py", line 226, in <module>
_elf_h=_parse_elf_h()
^^^^^^^^^^^^^^
File "/src/glibc/scripts/glibcelf.py", line 223, in_parse_elf_h
raise IOError('parse error inelf.h')
OSError: parse error inelf.h
Quoted 7 lines
[1] ARC: update definitions in
elf/elf.h
https://sourceware.org/pipermail/libc-alpha/2022-November/143503.html[2]
tst-glibcelf, tst-relro-ldso, and tst-relro-libcSigned-off-by Shahab Vahedi <[email protected]>
This okay and can go in separately, thanks.
Florian
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH v3 1/2] scripts: Add "|" operator support to glibcpp's parsing
Quoted 21 lines · Florian Weimer via Libc-alpha
* Shahab Vahedi:
Quoted 19 lines
From the tests point of view, this is a necessary step for another
patch [1] and allows parsing macros such as "#define A | B". Without it, a few tests [2] choke when the other patch [1] is applied:/src/glibc/scripts/../elf/elf.h:4167: error: uninterpretable macro token sequence: (
EF_ARC_MACH_MSK|EF_ARC_OSABI_MSK) Traceback (most recent call last):
File "/src/glibc/elf/tst-glibcelf.py", line 23, in <module>
import glibcelf
File "/src/glibc/scripts/glibcelf.py", line 226, in <module>
_elf_h=_parse_elf_h()
^^^^^^^^^^^^^^
File "/src/glibc/scripts/glibcelf.py", line 223, in_parse_elf_h
raise IOError('parse error inelf.h')
OSError: parse error inelf.h[1] ARC: update definitions in
elf/elf.h
https://sourceware.org/pipermail/libc-alpha/2022-November/143503.html
Quoted 8 lines
Quoted 4 lines
[2]
tst-glibcelf, tst-relro-ldso, and tst-relro-libcSigned-off-by Shahab Vahedi <[email protected]>This okay and can go in separately, thanks.
Reviewed-by Florian Weimer <[email protected]>
Committed !
Thx,
-Vineet
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH v3 2/2 ARC: update definitions in elf/elf.h
In reply to Shahab VahediWhile porting ARCv2 to elfutils [1], it was brought up that the necessary changes to the project's libelf/elf.h must come from glibc, because they sync it from glibc [2]. Therefore, this patch is to update ARC entries in elf/elf.h.
The majority of the update is about adding new definitions, specially for the relocations. However, there is one rename, one deletion, and one change:
- R_ARC_JUMP_SLOT renamed to R_ARC_JMP_SLOT to match binutils.
- R_ARC_B26 removed because it is unused and deprecated.
- R_ARC_TLS_DTPOFF_S9 changed from 0x4a to the correct value 0x49.
Finally, a specific SHT class for ARC has been added to glibcelf.py. Else, it would result in a collision:
_register_elf_h(Sht, ranges=True,
File "/src/glibc/scripts/glibcelf.py", line x, in _register_elf_h
raise ValueError('duplicate value {}: {}, {}'.format(
ValueError: duplicate value 1879048193:
SHT_ARC_ATTRIBUTES, SHT_X86_64_UNWIND[1]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005530.html
[2]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005548.html
No regression has been observed after applying this patch. Below follows the result:
UNSUPPORTED: crypt/cert
UNSUPPORTED: elf/tst-audit22
FAIL: elf/tst-audit25a
FAIL: elf/tst-audit25b
FAIL: elf/tst-bz15311
FAIL: elf/tst-bz28937
FAIL: elf/tst-dlmopen4
UNSUPPORTED: elf/tst-dlopen-self-container
UNSUPPORTED: elf/tst-dlopen-tlsmodid-container
UNSUPPORTED: elf/tst-glibc-hwcaps-prepend-cache
UNSUPPORTED: elf/tst-ldconfig-bad-aux-cache
UNSUPPORTED: elf/tst-ldconfig-ld_so_conf-update
UNSUPPORTED: elf/tst-pldd
UNSUPPORTED: elf/tst-preload-pthread-libc
XPASS: elf/tst-protected1a
XPASS: elf/tst-protected1b
FAIL: elf/tst-tls-allocation-failure-static-patched
FAIL: elf/tst-tls1
FAIL: elf/tst-tls3
FAIL: elf/tst-tlsalign-extern
UNSUPPORTED: elf/tst-valgrind-smoke
UNSUPPORTED: grp/tst-initgroups1
UNSUPPORTED: grp/tst-initgroups2
UNSUPPORTED: io/tst-getcwd-smallbuff
UNSUPPORTED: locale/tst-localedef-path-norm
FAIL: localedata/sort-test
UNSUPPORTED: localedata/tst-localedef-hardlinks
FAIL: malloc/tst-malloc-thread-fail-malloc-check
FAIL: malloc/tst-malloc_info-malloc-check
UNSUPPORTED: math/test-fesetexcept-traps
UNSUPPORTED: math/test-fexcept-traps
UNSUPPORTED: math/test-nearbyint-except
UNSUPPORTED: math/test-nearbyint-except-2
UNSUPPORTED: misc/tst-adjtimex
UNSUPPORTED: misc/tst-clock_adjtime
FAIL: misc/tst-misalign-clone
FAIL: misc/tst-misalign-clone-internal
UNSUPPORTED: misc/tst-ntp_adjtime
UNSUPPORTED: misc/tst-pkey
UNSUPPORTED: misc/tst-rseq
UNSUPPORTED: misc/tst-rseq-disable
UNSUPPORTED: misc/tst-syslog
UNSUPPORTED: misc/tst-ttyname
FAIL: nptl/test-cond-printers
FAIL: nptl/test-condattr-printers
FAIL: nptl/test-mutex-printers
FAIL: nptl/test-mutexattr-printers
FAIL: nptl/test-rwlock-printers
FAIL: nptl/test-rwlockattr-printers
UNSUPPORTED: nptl/tst-pthread-gdb-attach
UNSUPPORTED: nptl/tst-pthread-gdb-attach-static
UNSUPPORTED: nptl/tst-pthread-getattr
UNSUPPORTED: nptl/tst-rseq-nptl
UNSUPPORTED: nss/tst-nss-compat1
UNSUPPORTED: nss/tst-nss-db-endgrent
UNSUPPORTED: nss/tst-nss-db-endpwent
UNSUPPORTED: nss/tst-nss-files-hosts-long
UNSUPPORTED: nss/tst-nss-gai-actions
UNSUPPORTED: nss/tst-nss-test3
UNSUPPORTED: nss/tst-reload1
UNSUPPORTED: nss/tst-reload2
UNSUPPORTED: posix/bug-ga2
UNSUPPORTED: posix/bug-ga2-mem
FAIL: posix/globtest
UNSUPPORTED: posix/tst-vfork3
UNSUPPORTED: posix/tst-vfork3-mem
UNSUPPORTED: resolv/mtrace-tst-leaks2
UNSUPPORTED: resolv/tst-leaks2
UNSUPPORTED: resolv/tst-resolv-ai_idn
UNSUPPORTED: resolv/tst-resolv-ai_idn-latin1
UNSUPPORTED: resolv/tst-resolv-res_init
UNSUPPORTED: resolv/tst-resolv-res_init-thread
UNSUPPORTED: rt/tst-bz28213
UNSUPPORTED: rt/tst-mqueue1
UNSUPPORTED: rt/tst-mqueue10
UNSUPPORTED: rt/tst-mqueue2
UNSUPPORTED: rt/tst-mqueue3
UNSUPPORTED: rt/tst-mqueue4
UNSUPPORTED: rt/tst-mqueue5
UNSUPPORTED: rt/tst-mqueue6
UNSUPPORTED: rt/tst-mqueue8
UNSUPPORTED: rt/tst-mqueue8x
UNSUPPORTED: rt/tst-mqueue9
UNSUPPORTED: stdlib/test-bz22786
UNSUPPORTED: stdlib/tst-system
UNSUPPORTED: string/test-bcopy
UNSUPPORTED: string/test-memmove
UNSUPPORTED: string/tst-memmove-overflow
UNSUPPORTED: string/tst-strerror
UNSUPPORTED: string/tst-strsignal
UNSUPPORTED: time/tst-clock_settime
UNSUPPORTED: time/tst-settimeofday
Summary of test results:
21 FAIL
4184 PASS
69 UNSUPPORTED
16 XFAIL
2 XPASS
---
ChangeLog:
v3:
- Fix a collision in glibcelf.py.
- Add test results to the commit message.
v2:
- Rename instances of R_ARC_JUMP_SLOT to R_ARC_JMP_SLOT.
- Remove an unnecessary extra empty line introduced in elf/elf.h.
elf/elf.h | 29 ++++++++++++++++++++++++----- scripts/glibcelf.py | 3 +++ sysdeps/arc/dl-machine.h | 8 ++++---- 3 files changed, 31 insertions(+), 9 deletions(-)
elf/elf.h +24 -5
@@ -4159,6 +4159,15 @@ enum#define R_LARCH_GNU_VTINHERIT 57#define R_LARCH_GNU_VTENTRY 58 +/* ARC specific declarations. */ + +/* Processor specific flags for the Ehdr e_flags field. */ +#define EF_ARC_MACH_MSK 0x000000ff +#define EF_ARC_OSABI_MSK 0x00000f00 +#define EF_ARC_ALL_MSK (EF_ARC_MACH_MSK | EF_ARC_OSABI_MSK) + +/* Processor specific values for the Shdr sh_type field. */ +#define SHT_ARC_ATTRIBUTES (SHT_LOPROC + 1)/* ARC attributes section. */ /* ARCompact/ARCv2 specific relocs. */ #define R_ARC_NONE 0x0
@@ -4166,7 +4175,7 @@ enum#define R_ARC_16 0x2#define R_ARC_24 0x3#define R_ARC_32 0x4 -#define R_ARC_B26 0x5 +#define R_ARC_B22_PCREL 0x6#define R_ARC_H30 0x7#define R_ARC_N8 0x8
@@ -4206,16 +4215,23 @@ enum#define R_ARC_SECTOFF_ME_2 0x2A#define R_ARC_SECTOFF_1 0x2B#define R_ARC_SECTOFF_2 0x2C +#define R_ARC_SDA_12 0x2D +#define R_ARC_SDA16_ST2 0x30 +#define R_ARC_32_PCREL 0x31#define R_ARC_PC32 0x32#define R_ARC_GOTPC32 0x33#define R_ARC_PLT32 0x34#define R_ARC_COPY 0x35#define R_ARC_GLOB_DAT 0x36 -#define R_ARC_JUMP_SLOT 0x37 +#define R_ARC_JMP_SLOT 0x37#define R_ARC_RELATIVE 0x38#define R_ARC_GOTOFF 0x39#define R_ARC_GOTPC 0x3A#define R_ARC_GOT32 0x3B +#define R_ARC_S21W_PCREL_PLT 0x3C +#define R_ARC_S25H_PCREL_PLT 0x3D + +#define R_ARC_JLI_SECTOFF 0x3F#define R_ARC_TLS_DTPMOD 0x42#define R_ARC_TLS_DTPOFF 0x43
@@ -4224,9 +4240,12 @@ enum#define R_ARC_TLS_GD_LD 0x46#define R_ARC_TLS_GD_CALL 0x47#define R_ARC_TLS_IE_GOT 0x48 -#define R_ARC_TLS_DTPOFF_S9 0x4a -#define R_ARC_TLS_LE_S9 0x4a -#define R_ARC_TLS_LE_32 0x4b +#define R_ARC_TLS_DTPOFF_S9 0x49 +#define R_ARC_TLS_LE_S9 0x4A +#define R_ARC_TLS_LE_32 0x4B +#define R_ARC_S25W_PCREL_PLT 0x4C +#define R_ARC_S21H_PCREL_PLT 0x4D +#define R_ARC_NPS_CMEM16 0x4E/* OpenRISC 1000 specific relocs. */ #define R_OR1K_NONE 0
scripts/glibcelf.py +3 -0
@@ -304,6 +304,8 @@ class Sht(_TypedConstant): prefix = 'SHT_' class ShtALPHA(Sht): """Supplemental SHT_* constants for EM_ALPHA.""" +class ShtARC(Sht): + """Supplemental SHT_* constants for EM_ARC.""" class ShtARM(Sht): """Supplemental SHT_* constants for EM_ARM.""" class ShtCSKY(Sht):
@@ -317,6 +319,7 @@ class ShtPARISC(Sht): class ShtRISCV(Sht): """Supplemental SHT_* constants for EM_RISCV.""" _register_elf_h(ShtALPHA, prefix='SHT_ALPHA_', parent=Sht) +_register_elf_h(ShtARC, prefix='SHT_ARC_', parent=Sht) _register_elf_h(ShtARM, prefix='SHT_ARM_', parent=Sht) _register_elf_h(ShtCSKY, prefix='SHT_CSKY_', parent=Sht) _register_elf_h(ShtIA_64, prefix='SHT_IA_64_', parent=Sht)
sysdeps/arc/dl-machine.h +4 -4
@@ -183,14 +183,14 @@ __start: \n\ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one of the main executable's symbols, as for a COPY reloc. */ #define elf_machine_type_class (type) \ - ((((type) == R_ARC_JUMP_SLOT \ + ((((type) == R_ARC_JMP_SLOT \ || (type) == R_ARC_TLS_DTPMOD \ || (type) == R_ARC_TLS_DTPOFF \ || (type) == R_ARC_TLS_TPOFF) * ELF_RTYPE_CLASS_PLT) \ | (((type) == R_ARC_COPY) * ELF_RTYPE_CLASS_COPY))/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */ -#define ELF_MACHINE_JMP_SLOT R_ARC_JUMP_SLOT +#define ELF_MACHINE_JMP_SLOT R_ARC_JMP_SLOT/* Fixup a PLT entry to bounce directly to the function at VALUE. */
@@ -261,7 +261,7 @@ elf_machine_rela (struct link_map *map, struct r_scope_elem *scope[],break ;case R_ARC_GLOB_DAT : -case R_ARC_JUMP_SLOT : +case R_ARC_JMP_SLOT : *reloc_addr = value;break ;
@@ -321,7 +321,7 @@ elf_machine_lazy_rel (struct link_map *map, struct r_scope_elem *scope[],ElfW (Addr) *const reloc_addr = (void *) (l_addr + reloc->r_offset);const unsigned int r_type =ELFW (R_TYPE ) (reloc->r_info); -if (r_type ==R_ARC_JUMP_SLOT ) +if (r_type ==R_ARC_JMP_SLOT ) *reloc_addr += l_addr;else _dl_reloc_bad_type (map, r_type,1 );
Signature · 7 lines
2.38.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Quoted 124 lines · Shahab Vahedi via Libc-alpha
While porting ARCv2 to elfutils [1], it was brought up that the necessary changes to the project's
libelf/elf.hmust come from glibc, because they sync it from glibc [2]. Therefore, this patch is to update ARC entries inelf/elf.h.The majority of the update is about adding new definitions, specially for the relocations. However, there is one rename, one deletion, and one change:
-
R_ARC_JUMP_SLOTrenamed toR_ARC_JMP_SLOTto match binutils.
-R_ARC_B26removed because it is unused and deprecated.
-R_ARC_TLS_DTPOFF_S9changed from0x4ato the correct value0x49.Finally, a specific SHT class for ARC has been added to
glibcelf.py. Else, it would result in a collision:_register_elf_h(Sht, ranges=True,
File "/src/glibc/scripts/glibcelf.py", line x, in_register_elf_hraise ValueError('duplicate value {}: {}, {}'.format( ValueError: duplicate value 1879048193: SHT_ARC_ATTRIBUTES, SHT_X86_64_UNWIND[1]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005530.html[2]
https://sourceware.org/pipermail/elfutils-devel/2022q4/005548.htmlNo regression has been observed after applying this patch. Below follows the result:
UNSUPPORTED: crypt/cert
UNSUPPORTED: elf/tst-audit22
FAIL: elf/tst-audit25a
FAIL: elf/tst-audit25b
FAIL: elf/tst-bz15311
FAIL: elf/tst-bz28937
FAIL: elf/tst-dlmopen4
UNSUPPORTED: elf/tst-dlopen-self-container
UNSUPPORTED: elf/tst-dlopen-tlsmodid-container
UNSUPPORTED: elf/tst-glibc-hwcaps-prepend-cache
UNSUPPORTED: elf/tst-ldconfig-bad-aux-cache
UNSUPPORTED: elf/tst-ldconfig-ld_so_conf-update
UNSUPPORTED: elf/tst-pldd
UNSUPPORTED: elf/tst-preload-pthread-libc
XPASS: elf/tst-protected1a
XPASS: elf/tst-protected1b
FAIL: elf/tst-tls-allocation-failure-static-patched
FAIL: elf/tst-tls1
FAIL: elf/tst-tls3
FAIL: elf/tst-tlsalign-extern
UNSUPPORTED: elf/tst-valgrind-smoke
UNSUPPORTED: grp/tst-initgroups1
UNSUPPORTED: grp/tst-initgroups2
UNSUPPORTED: io/tst-getcwd-smallbuff
UNSUPPORTED: locale/tst-localedef-path-norm
FAIL: localedata/sort-test
UNSUPPORTED: localedata/tst-localedef-hardlinks
FAIL: malloc/tst-malloc-thread-fail-malloc-check
FAIL: malloc/tst-malloc_info-malloc-check
UNSUPPORTED: math/test-fesetexcept-traps
UNSUPPORTED: math/test-fexcept-traps
UNSUPPORTED: math/test-nearbyint-except
UNSUPPORTED: math/test-nearbyint-except-2
UNSUPPORTED: misc/tst-adjtimex
UNSUPPORTED: misc/tst-clock_adjtime
FAIL: misc/tst-misalign-clone
FAIL: misc/tst-misalign-clone-internal
UNSUPPORTED: misc/tst-ntp_adjtime
UNSUPPORTED: misc/tst-pkey
UNSUPPORTED: misc/tst-rseq
UNSUPPORTED: misc/tst-rseq-disable
UNSUPPORTED: misc/tst-syslog
UNSUPPORTED: misc/tst-ttyname
FAIL: nptl/test-cond-printers
FAIL: nptl/test-condattr-printers
FAIL: nptl/test-mutex-printers
FAIL: nptl/test-mutexattr-printers
FAIL: nptl/test-rwlock-printers
FAIL: nptl/test-rwlockattr-printers
UNSUPPORTED: nptl/tst-pthread-gdb-attach
UNSUPPORTED: nptl/tst-pthread-gdb-attach-static
UNSUPPORTED: nptl/tst-pthread-getattr
UNSUPPORTED: nptl/tst-rseq-nptl
UNSUPPORTED: nss/tst-nss-compat1
UNSUPPORTED: nss/tst-nss-db-endgrent
UNSUPPORTED: nss/tst-nss-db-endpwent
UNSUPPORTED: nss/tst-nss-files-hosts-long
UNSUPPORTED: nss/tst-nss-gai-actions
UNSUPPORTED: nss/tst-nss-test3
UNSUPPORTED: nss/tst-reload1
UNSUPPORTED: nss/tst-reload2
UNSUPPORTED: posix/bug-ga2
UNSUPPORTED: posix/bug-ga2-mem
FAIL: posix/globtest
UNSUPPORTED: posix/tst-vfork3
UNSUPPORTED: posix/tst-vfork3-mem
UNSUPPORTED: resolv/mtrace-tst-leaks2
UNSUPPORTED: resolv/tst-leaks2
UNSUPPORTED: resolv/tst-resolv-ai_idn
UNSUPPORTED: resolv/tst-resolv-ai_idn-latin1
UNSUPPORTED: resolv/tst-resolv-res_init
UNSUPPORTED: resolv/tst-resolv-res_init-thread
UNSUPPORTED: rt/tst-bz28213
UNSUPPORTED: rt/tst-mqueue1
UNSUPPORTED: rt/tst-mqueue10
UNSUPPORTED: rt/tst-mqueue2
UNSUPPORTED: rt/tst-mqueue3
UNSUPPORTED: rt/tst-mqueue4
UNSUPPORTED: rt/tst-mqueue5
UNSUPPORTED: rt/tst-mqueue6
UNSUPPORTED: rt/tst-mqueue8
UNSUPPORTED: rt/tst-mqueue8x
UNSUPPORTED: rt/tst-mqueue9
UNSUPPORTED: stdlib/test-bz22786
UNSUPPORTED: stdlib/tst-system
UNSUPPORTED: string/test-bcopy
UNSUPPORTED: string/test-memmove
UNSUPPORTED: string/tst-memmove-overflow
UNSUPPORTED: string/tst-strerror
UNSUPPORTED: string/tst-strsignal
UNSUPPORTED: time/tst-clock_settime
UNSUPPORTED: time/tst-settimeofday
Summary of test results:
Quoted 8 lines
21 FAIL 4184 PASS 69 UNSUPPORTED 16 XFAIL 2 XPASSSigned-off-by Shahab Vahedi<[email protected]>---
Committed !
Thx,
-Vineet
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc