From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7814) id C0EDF3858D32; Wed, 15 Jun 2022 20:02:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C0EDF3858D32 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Fangrui Song To: glibc-cvs@sourceware.org Subject: [glibc] Remove remnant reference to ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA X-Act-Checkin: glibc X-Git-Author: Fangrui Song X-Git-Refname: refs/heads/master X-Git-Oldrev: de38b2a343e6d64b95c50004943d6107a9e380d0 X-Git-Newrev: 686216945a7873237bf892bbe38a2eef23aadeba Message-Id: <20220615200220.C0EDF3858D32@sourceware.org> Date: Wed, 15 Jun 2022 20:02:20 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2022 20:02:20 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=686216945a7873237bf892bbe38a2eef23aadeba commit 686216945a7873237bf892bbe38a2eef23aadeba Author: Fangrui Song 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