public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Remove remnant reference to ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA
@ 2022-06-15 20:02 Fangrui Song
0 siblings, 0 replies; only message in thread
From: Fangrui Song @ 2022-06-15 20:02 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=686216945a7873237bf892bbe38a2eef23aadeba
commit 686216945a7873237bf892bbe38a2eef23aadeba
Author: Fangrui Song <maskray@google.com>
Date: Wed Jun 15 13:02:17 2022 -0700
Remove remnant reference to ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA
This fixes nios2 build after commit de38b2a343e6d64b95c50004943d6107a9e380d0.
Diff:
---
sysdeps/i386/dl-machine.h | 5 +----
sysdeps/nios2/dl-machine.h | 3 +--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index a8ee594ff4..56a189fda2 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -185,10 +185,7 @@ _dl_start_user:\n\
TLS variable, so undefined references should not be allowed to
define the value.
ELF_RTYPE_CLASS_COPY iff TYPE should not be allowed to resolve to one
- of the main executable's symbols, as for a COPY reloc.
- ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA iff TYPE describes relocation may
- against protected data whose address be external due to copy relocation.
- */
+ of the main executable's symbols, as for a COPY reloc. */
# define elf_machine_type_class(type) \
((((type) == R_386_JMP_SLOT || (type) == R_386_TLS_DTPMOD32 \
|| (type) == R_386_TLS_DTPOFF32 || (type) == R_386_TLS_TPOFF32 \
diff --git a/sysdeps/nios2/dl-machine.h b/sysdeps/nios2/dl-machine.h
index 9a35cf4160..9d1c241792 100644
--- a/sysdeps/nios2/dl-machine.h
+++ b/sysdeps/nios2/dl-machine.h
@@ -166,8 +166,7 @@ _start:\n\
|| (type) == R_NIOS2_TLS_DTPMOD \
|| (type) == R_NIOS2_TLS_DTPREL \
|| (type) == R_NIOS2_TLS_TPREL) * ELF_RTYPE_CLASS_PLT) \
- | (((type) == R_NIOS2_COPY) * ELF_RTYPE_CLASS_COPY) \
- | (((type) == R_NIOS2_GLOB_DAT) * ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA))
+ | (((type) == R_NIOS2_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_NIOS2_JUMP_SLOT
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-15 20:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-15 20:02 [glibc] Remove remnant reference to ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA Fangrui Song
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).