From patchwork Sat Dec 5 15:15:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 41323 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 25CCA3833011; Sat, 5 Dec 2020 15:16:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 25CCA3833011 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607181400; bh=xW4NvUsNLFSIpF39zp++SjZWFv8CjRZOp9TzwZCFe8A=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=KqniJxqwwMMjm+DohQhMaqSpiO7KSB3s2QG5dwHe5NpU1E9k8j/zOtlbdw5uGrFAv +odyGu5LJ4ATQ/ceQpapEhPowJJUh250xL3mcC1E7etmBJ+EKF/vJZoASkClpblTOA 2kc/cAJ/8+QaFIFivIWrbSpLhBuulazacYszOITI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by sourceware.org (Postfix) with ESMTPS id 28F7F385040D for ; Sat, 5 Dec 2020 15:16:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 28F7F385040D Received: by mail-oi1-x231.google.com with SMTP id o25so9920851oie.5 for ; Sat, 05 Dec 2020 07:16:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xW4NvUsNLFSIpF39zp++SjZWFv8CjRZOp9TzwZCFe8A=; b=ez0RkB8P0LXE1nnE52Um4EcUEds1n7TDUyk/NHlWWRfoGvgqft8FV35G+Xe1zVQmfA o8JcdJvzItNfeB7C5PLsgjbMoIswCx/BaM0Pe0hKhzip2dLmJiCJNPxOXjKw0RHaZ0GT MAlfjdNHY/xUgfJYx7VWRD++GpS5Y+PWGIXlZlSgPcD7KvAvMhFxDLhjLeZoX72s5V1q hS8/rPoC7waJp6uyMEpt0ZdH54CGpmDwISx1sxE29HvjjsJFql4qtZ4Mq4aZs0xpYrks 6VdWmj8WXrEawnerNpNaK6bS62qaJma/COeAFn+A6+mIv8xhXdNxPAeEf0eS/Pcn6V3r vPfA== X-Gm-Message-State: AOAM531C9kFOj2i7HVXJ2tV6KgXjuZPdqv4Cczz8nJlSs/lrPDpMLGLk yIuh1wMqA1/vTI/h9wM20HM3SUlyx+ZHwyxjHtwBulTIEX0= X-Google-Smtp-Source: ABdhPJy0hcD8KRBzEBcbzSQd2uT5nrGbNnYEPgi4C1iscVErTZcKVHxtM22BT4MHpM3U5Q1IJE7joBZ9ogCn9/IDxzg= X-Received: by 2002:aca:f456:: with SMTP id s83mr3724245oih.58.1607181380547; Sat, 05 Dec 2020 07:16:20 -0800 (PST) MIME-Version: 1.0 References: <20201204203035.883371-1-hjl.tools@gmail.com> <874kl1nuxz.fsf@mid.deneb.enyo.de> In-Reply-To: Date: Sat, 5 Dec 2020 07:15:44 -0800 Message-ID: Subject: PATCH] x86: Rename readelflib.c To: Florian Weimer X-Spam-Status: No, score=-3037.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: "H.J. Lu via Libc-alpha" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On Fri, Dec 4, 2020 at 1:15 PM H.J. Lu wrote: > > On Fri, Dec 4, 2020 at 1:13 PM H.J. Lu wrote: > > > > On Fri, Dec 4, 2020 at 1:05 PM Florian Weimer wrote: > > > > > > * H. J. Lu via Libc-alpha: > > > > > > > Rename linux/i386/readelflib.c to linux/x86/readelflib.c and remove > > > > x86_64/readelflib.c. Also remove EM_IA_64 support from i386 ldconfig. > > > > > > I'm curious—what's the context for this change? > > > > It is a cleanup job while working on x86-64 ISA level support to ldconfig. > > > > > Do the remaining ia64 systems use an ia64 ldconfig? (The latest CPUs > > > no longer support i386 IIRC.) > > > > There is a separate, unrelated linux/ia64/readelflib.c. > > With this patch, you can no longer run i386 ldconfig on ia64. I am not > even sure if it works today. > Here is the patch just to rename. I have a followup patch for ldconfig to add ISA level check to glibc-hwcaps From 505716a17248207709bb325dbbb1723b228b9553 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 4 Dec 2020 12:24:39 -0800 Subject: [PATCH] x86: Rename readelflib.c Rename linux/i386/readelflib.c to linux/x86/readelflib.c and remove x86_64/readelflib.c. --- sysdeps/unix/sysv/linux/{i386 => x86}/readelflib.c | 4 ++-- sysdeps/unix/sysv/linux/x86_64/readelflib.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) rename sysdeps/unix/sysv/linux/{i386 => x86}/readelflib.c (98%) delete mode 100644 sysdeps/unix/sysv/linux/x86_64/readelflib.c diff --git a/sysdeps/unix/sysv/linux/i386/readelflib.c b/sysdeps/unix/sysv/linux/x86/readelflib.c similarity index 98% rename from sysdeps/unix/sysv/linux/i386/readelflib.c rename to sysdeps/unix/sysv/linux/x86/readelflib.c index 05f182734a..3e83419f5b 100644 --- a/sysdeps/unix/sysv/linux/i386/readelflib.c +++ b/sysdeps/unix/sysv/linux/x86/readelflib.c @@ -44,7 +44,7 @@ process_elf_file (const char *file_name, const char *lib, int *flag, /* X32 libraries are always libc.so.6+. */ file_flag = FLAG_X8664_LIBX32|FLAG_ELF_LIBC6; break; -#ifndef SKIP_EM_IA_64 +#ifndef __x86_64__ case EM_IA_64: if (elf_header->e_ident[EI_CLASS] == ELFCLASS64) { @@ -59,7 +59,7 @@ process_elf_file (const char *file_name, const char *lib, int *flag, break; /* Fall through. */ default: -#ifndef SKIP_EM_IA_64 +#ifndef __x86_64__ failed: #endif error (0, 0, _("%s is for unknown machine %d.\n"), diff --git a/sysdeps/unix/sysv/linux/x86_64/readelflib.c b/sysdeps/unix/sysv/linux/x86_64/readelflib.c deleted file mode 100644 index 4c4e5f9d1a..0000000000 --- a/sysdeps/unix/sysv/linux/x86_64/readelflib.c +++ /dev/null @@ -1,2 +0,0 @@ -#define SKIP_EM_IA_64 -#include -- 2.28.0