public inbox for
help / color / mirror / Atom feed
* [glibc] ARC: update definitions in elf/elf.h
@ 2022-11-30  2:10 Vineet Gupta
  0 siblings, 0 replies; only message in thread
From: Vineet Gupta @ 2022-11-30  2:10 UTC (permalink / raw)
  To: glibc-cvs;h=6ae0737d430900fff02569548a92bdca49622a15

commit 6ae0737d430900fff02569548a92bdca49622a15
Author: Shahab Vahedi <>
Date:   Sun Nov 27 18:38:25 2022 +0100

    ARC: update definitions in elf/elf.h
    While 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
    Else, it would result in a collision:
      _register_elf_h(Sht, ranges=True,
     File "/src/glibc/scripts/", line x, in _register_elf_h
       raise ValueError('duplicate value {}: {}, {}'.format(
                        ValueError: duplicate value 1879048193:
                        SHT_ARC_ATTRIBUTES, SHT_X86_64_UNWIND
    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
    Signed-off-by: Shahab Vahedi <>
    Signed-off-by: Vineet Gupta <>

 elf/elf.h                | 29 ++++++++++++++++++++++++-----
 scripts/      |  3 +++
 sysdeps/arc/dl-machine.h |  8 ++++----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/elf/elf.h b/elf/elf.h
index 920e6891e6..da41bad34b 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -4159,6 +4159,15 @@ 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
+/* 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
diff --git a/scripts/ b/scripts/
index 59aab56ecf..a85594c3d9 100644
--- a/scripts/
+++ b/scripts/
@@ -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)
diff --git a/sysdeps/arc/dl-machine.h b/sysdeps/arc/dl-machine.h
index c6ad232384..8420cd0006 100644
--- a/sysdeps/arc/dl-machine.h
+++ b/sysdeps/arc/dl-machine.h
@@ -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 cmdline arg lookups to reject PLT entries.  */
 /* 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[],
         case R_ARC_GLOB_DAT:
-        case R_ARC_JUMP_SLOT:
+        case R_ARC_JMP_SLOT:
             *reloc_addr = value;
@@ -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;
     _dl_reloc_bad_type (map, r_type, 1);

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-11-30  2:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-30  2:10 [glibc] ARC: update definitions in elf/elf.h Vineet Gupta

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).