From 751acde7ec335506b54e94ed6f2c998f6c0a22c6 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Fri, 11 Dec 2020 17:30:49 +0000 Subject: elf: Fix dl-load.c Rebasing broke commit 38a3836011f3fe3290a94ab136dcb5f3c5c9f4e2 it was supposed to move code. --- elf/dl-load.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'elf') diff --git a/elf/dl-load.c b/elf/dl-load.c index e9afad544a..755e92eda6 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1262,21 +1262,6 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, maplength, has_holes, loader); if (__glibc_unlikely (errstring != NULL)) goto call_lose; - - /* Process program headers again after load segments are mapped in - case processing requires accessing those segments. Scan program - headers backward so that PT_NOTE can be skipped if PT_GNU_PROPERTY - exits. */ - for (ph = &phdr[l->l_phnum]; ph != phdr; --ph) - switch (ph[-1].p_type) - { - case PT_NOTE: - _dl_process_pt_note (l, &ph[-1]); - break; - case PT_GNU_PROPERTY: - _dl_process_pt_gnu_property (l, &ph[-1]); - break; - } } if (l->l_ld == 0) -- cgit 1.4.1