From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7510 invoked by alias); 29 Oct 2016 16:15:42 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 7498 invoked by uid 89); 29 Oct 2016 16:15:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=no version=3.3.2 spammy=commitdiff, glibcgit, schwab@linux-m68k.org, glibc.git X-HELO: mail-wm0-f68.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cCTbeQwx+IelSfN+L/cOgNFimAzMaWuat2CwAaveoc4=; b=aXVhtopto26I9gPQ0BWkqaVKcKcpKfezZnMh9kg+R9cODDTvAI0JuSeDCgYfsoDXtI nx1kNaseR/C2v4Nj9LC9WFsVxA4dYLG6K6gKQizJBbzb014zuiQmi+T49YKKamg1yfYn eReO0zM6pLtlUzS2jCmC4uLFTHbBggQgv97JkjmfLkVFDtw7wnf7OJWQ4c04EnULBKs/ 8400RU6ddnR8LCD6bzbzA4JVS2XAdp84+WrYW5biFtTH9Bc6UyGcfHW5yV6DBJdqg9OG ZRiKcpYFLxFezgZK6OqpNbSm2KhqpoSyLdB52Gvu66soel+pDmBLnt/z8yQq0bjwflcW CqKw== X-Gm-Message-State: ABUngvdnKlZP8C59vi8sGYJR1AvrJoTduFPZILY0jWwZ7E6wT2mdRklP6PynHzlRXGJckw== X-Received: by 10.28.71.14 with SMTP id u14mr4011417wma.10.1477757730024; Sat, 29 Oct 2016 09:15:30 -0700 (PDT) Date: Sat, 29 Oct 2016 16:15:00 -0000 From: Sergei Trofimovich To: Andreas Schwab Cc: libc-alpha@sourceware.org, Sergei Trofimovich , Roland McGrath Subject: Re: [PATCH] m68k: restore handling of R_68K_NONE in elf_machine_lazy_rel() Message-ID: <20161029171527.423b573e@sf> In-Reply-To: <87pomjnp3v.fsf@linux-m68k.org> References: <20161029134801.15082-1-slyich@gmail.com> <87pomjnp3v.fsf@linux-m68k.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SW-Source: 2016-10/txt/msg00586.txt.bz2 On Sat, 29 Oct 2016 17:37:08 +0200 Andreas Schwab wrote: > On Okt 29 2016, slyich@gmail.com wrote: > > > commit 96e1bff2513873062233a13c7fd1eea57bb8db24 > > Author: Roland McGrath > > Date: Wed Jul 17 18:00:33 1996 +0000 > > ??? This commit touches csu/initfini.c only. > > Andreas. I was looking at this tree: Commit https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=96e1bff2513873062233a13c7fd1eea57bb8db24 among other thing shows disappearance of 'case R_68K_NONE': -static inline void -elf_machine_lazy_rel (struct link_map *map, const Elf32_Rela *reloc) -{ - Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset); - switch (ELF32_R_TYPE (reloc->r_info)) - { - case R_68K_NONE: - break; - case R_68K_JMP_SLOT: - *reloc_addr += map->l_addr; - break; - default: - assert (! "unexpected PLT reloc type"); - break; - } -} +static inline void +elf_machine_lazy_rel (struct link_map *map, const Elf32_Rela *reloc) +{ + Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset); + switch (ELF32_R_TYPE (reloc->r_info)) + { + case R_68K_JMP_SLOT: + *reloc_addr += map->l_addr; + break; + default: + assert (! "unexpected PLT reloc type"); + break; + } +} -- Sergei