From patchwork Fri Dec 4 20:30:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 41314 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 3E3C2387085C; Fri, 4 Dec 2020 20:30:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3E3C2387085C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607113843; bh=9UI+p1fF4BwZav2ETr52Th7ti8zLUY3ONgAKPvzwKRw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vot8nuxtK1UjL09W9LVwouZzmLUpe5rpbLZ14hCJH4zX/MwHnYHvqr09wiTNaSqpJ D5utayafKUd1AIprG/F9/TPE/TlYJapumFa19xyVN8RQ5Vi9q9MWx0CbF5WWNZbvwN YoeKIAle1xAxNq5+urJMRK+kaOnuUxsjdgUaxJiw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by sourceware.org (Postfix) with ESMTPS id 564B9385041D for ; Fri, 4 Dec 2020 20:30:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 564B9385041D Received: by mail-pg1-x52d.google.com with SMTP id n7so4251892pgg.2 for ; Fri, 04 Dec 2020 12:30:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9UI+p1fF4BwZav2ETr52Th7ti8zLUY3ONgAKPvzwKRw=; b=KuCD0P/UYPMZiLeiyjg9GmInffMSV9iWirjbZ2j3e9KNA5GvqKLz8K9pNB9EKsj+Sk /Sv6ru4sYwpDut4W/FZFj2c+sVN7P1Wnd7gdJvhPBPx8NAdrzEMsEpw1bmZWyI1IQoQk RjE7rvqdn3E4gzTS0kRiCYhn0n+eeCIVjk5Gr8tjqY/UEs7OKsqK9D7jW9ylptX1Me2M Cj/AUEtN2YmiVBeISB7zd6GPQSX4El9i8p9xsBAIPJgbPaUoldRGJPLGsOVOsoGJw6yE Le7O0Hv+d9orkpmUocycJ9txJX/uIRPqmjRob2CSyLUsHQ2cw1gDZMLpNUoimNGwxN8N 0w7g== X-Gm-Message-State: AOAM533sA+6049ilSEef3mDo7N3XpPPcgHXWdztcw1uVKPkZ9Sp/Bnoe rwrffyGjuerXSc8dSIJlW/U4D0z/P2U= X-Google-Smtp-Source: ABdhPJxh3O5jPniAdTZsMsCcE2WU3r1tUGbAwbEnmhpwRxjmD+gGKJ16fIlGAEyTxhGlaahpZ9zwOQ== X-Received: by 2002:a62:3205:0:b029:197:f692:6a8b with SMTP id y5-20020a6232050000b0290197f6926a8bmr5482564pfy.2.1607113838362; Fri, 04 Dec 2020 12:30:38 -0800 (PST) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id r68sm5761276pfr.113.2020.12.04.12.30.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 12:30:37 -0800 (PST) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id C0EE91A0104 for ; Fri, 4 Dec 2020 12:30:36 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] x86: Rename readelflib.c and remove EM_IA_64 support Date: Fri, 4 Dec 2020 12:30:35 -0800 Message-Id: <20201204203035.883371-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3040.4 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" Errors-To: libc-alpha-bounces@sourceware.org Sender: "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. --- sysdeps/unix/sysv/linux/{i386 => x86}/readelflib.c | 13 ------------- sysdeps/unix/sysv/linux/x86_64/readelflib.c | 2 -- 2 files changed, 15 deletions(-) rename sysdeps/unix/sysv/linux/{i386 => x86}/readelflib.c (90%) 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 90% rename from sysdeps/unix/sysv/linux/i386/readelflib.c rename to sysdeps/unix/sysv/linux/x86/readelflib.c index 05f182734a..ccf9361edf 100644 --- a/sysdeps/unix/sysv/linux/i386/readelflib.c +++ b/sysdeps/unix/sysv/linux/x86/readelflib.c @@ -44,24 +44,11 @@ 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 - case EM_IA_64: - if (elf_header->e_ident[EI_CLASS] == ELFCLASS64) - { - /* IA64 64bit libraries are always libc.so.6+. */ - file_flag = FLAG_IA64_LIB64|FLAG_ELF_LIBC6; - break; - } - goto failed; -#endif case EM_386: if (elf_header->e_ident[EI_CLASS] == ELFCLASS32) break; /* Fall through. */ default: -#ifndef SKIP_EM_IA_64 -failed: -#endif error (0, 0, _("%s is for unknown machine %d.\n"), file_name, elf_header->e_machine); return 1; 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