From patchwork Wed Mar 8 01:43:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: caiyinyu X-Patchwork-Id: 66098 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 8166B385141E for ; Wed, 8 Mar 2023 01:44:07 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id F25263858412 for ; Wed, 8 Mar 2023 01:43:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F25263858412 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [10.2.5.5]) by gateway (Coremail) with SMTP id _____8Dxj81U6AdkKKkJAA--.12685S3; Wed, 08 Mar 2023 09:43:48 +0800 (CST) Received: from 5.5.5 (unknown [10.2.5.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8DxD79S6AdkKc1OAA--.34192S2; Wed, 08 Mar 2023 09:43:46 +0800 (CST) From: caiyinyu To: libc-alpha@sourceware.org Cc: adhemerval.zanella@linaro.org, xry111@xry111.site, caiyinyu Subject: [PATCH] LoongArch: Add support for ldconfig. Date: Wed, 8 Mar 2023 09:43:44 +0800 Message-Id: <20230308014344.3194588-1-caiyinyu@loongson.cn> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CM-TRANSID: AQAAf8DxD79S6AdkKc1OAA--.34192S2 X-CM-SenderInfo: 5fdl5xhq1xqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBjvJXoWxuw1fZFyxGr1DArWxKFWxZwb_yoWxCryDpF WruFyrKr4rXa1rCayxG3W5uF1rKr97WFyakry5A3yUZ3srJrykZa929FyagFyfGrZ5Gay7 ZFZ8Wa4DCFZ7X3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj qI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUIcSsGvfJTRUUU b7xYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s 1l1IIY67AEw4v_JrI_Jryl8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwA2z4 x0Y4vEx4A2jsIE14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2AI xVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx1l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r 4UYxBIdaVFxhVjvjDU0xZFpf9x07j8yCJUUUUU= X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- elf/cache.c | 6 ++ sysdeps/generic/ldconfig.h | 2 + sysdeps/unix/sysv/linux/loongarch/dl-cache.h | 82 +++++++++++++++++++ .../unix/sysv/linux/loongarch/readelflib.c | 70 ++++++++++++++++ 4 files changed, 160 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/loongarch/dl-cache.h create mode 100644 sysdeps/unix/sysv/linux/loongarch/readelflib.c diff --git a/elf/cache.c b/elf/cache.c index c4c3139264..1a96e770aa 100644 --- a/elf/cache.c +++ b/elf/cache.c @@ -225,6 +225,12 @@ print_entry (const char *lib, int flag, uint64_t hwcap, case FLAG_RISCV_FLOAT_ABI_DOUBLE: fputs (",double-float", stdout); break; + case FLAG_LARCH_FLOAT_ABI_SOFT: + fputs (",soft-float", stdout); + break; + case FLAG_LARCH_FLOAT_ABI_DOUBLE: + fputs (",double-float", stdout); + break; case 0: break; default: diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h index e9e9e19d0f..864d223745 100644 --- a/sysdeps/generic/ldconfig.h +++ b/sysdeps/generic/ldconfig.h @@ -45,6 +45,8 @@ #define FLAG_MIPS64_LIBN64_NAN2008 0x0e00 #define FLAG_RISCV_FLOAT_ABI_SOFT 0x0f00 #define FLAG_RISCV_FLOAT_ABI_DOUBLE 0x1000 +#define FLAG_LARCH_FLOAT_ABI_SOFT 0x1100 +#define FLAG_LARCH_FLOAT_ABI_DOUBLE 0x1200 /* Name of auxiliary cache. */ #define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache" diff --git a/sysdeps/unix/sysv/linux/loongarch/dl-cache.h b/sysdeps/unix/sysv/linux/loongarch/dl-cache.h new file mode 100644 index 0000000000..cb06feaa83 --- /dev/null +++ b/sysdeps/unix/sysv/linux/loongarch/dl-cache.h @@ -0,0 +1,82 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2003-2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + . */ + +#include +#include + +#if defined __loongarch_double_float +# define _DL_CACHE_DEFAULT_ID (FLAG_LARCH_FLOAT_ABI_DOUBLE | FLAG_ELF_LIBC6) +#else +# define _DL_CACHE_DEFAULT_ID (FLAG_LARCH_FLOAT_ABI_SOFT | FLAG_ELF_LIBC6) +#endif + +#define _dl_cache_check_flags(flags) \ + ((flags) == _DL_CACHE_DEFAULT_ID) + +/* If given a path to one of our library directories, adds every library + directory via add_dir (), otherwise just adds the giver directory. On + LoongArch, libraries can be found in paths ending in: + - /lib64 + - /lib64/sf + so this will add all of those paths. */ + +#define add_system_dir(dir) \ + do \ + { \ + static const char* lib_dirs[] = { \ + "/lib64", \ + "/lib64/sf", \ + NULL, \ + }; \ + const size_t lib_len = sizeof ("/lib") - 1; \ + size_t len = strlen (dir); \ + char path[len + 6]; \ + const char **ptr; \ + \ + memcpy (path, dir, len + 1); \ + \ + for (ptr = lib_dirs; *ptr != NULL; ptr++) \ + { \ + const char *lib_dir = *ptr; \ + size_t dir_len = strlen (lib_dir); \ + \ + if (len >= dir_len \ + && !memcmp (path + len - dir_len, lib_dir, dir_len)) \ + { \ + len -= dir_len - lib_len; \ + path[len] = '\0'; \ + break; \ + } \ + } \ + add_dir (path); \ + if (len >= lib_len \ + && !memcmp (path + len - lib_len, "/lib", lib_len)) \ + for (ptr = lib_dirs; *ptr != NULL; ptr++) \ + { \ + const char *lib_dir = *ptr; \ + size_t dir_len = strlen (lib_dir); \ + \ + assert (dir_len >= lib_len); \ + memcpy (path + len, lib_dir + lib_len, \ + dir_len - lib_len + 1); \ + add_dir (path); \ + } \ + } while (0) + + +#include_next diff --git a/sysdeps/unix/sysv/linux/loongarch/readelflib.c b/sysdeps/unix/sysv/linux/loongarch/readelflib.c new file mode 100644 index 0000000000..87dd4cfce2 --- /dev/null +++ b/sysdeps/unix/sysv/linux/loongarch/readelflib.c @@ -0,0 +1,70 @@ +/* Support for reading ELF files. + Copyright (C) 1999-2023 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + + +int process_elf64_file (const char *file_name, const char *lib, + int *flag, unsigned int *isa_level, char **soname, + void *file_contents, size_t file_length); + +#define SUPPORTED_ELF_FLAGS \ + (EF_LARCH_ABI_DOUBLE_FLOAT | EF_LARCH_ABI_SOFT_FLOAT) + +/* Returns 0 if everything is ok, != 0 in case of error. */ +int +process_elf_file (const char *file_name, const char *lib, int *flag, + unsigned int *isa_level, char **soname, void *file_contents, + size_t file_length) +{ + ElfW(Ehdr) *elf_header = (ElfW(Ehdr) *) file_contents; + Elf64_Ehdr *elf64_header = (Elf64_Ehdr *) elf_header; + int ret; + long flags; + + /* LoongArch libraries are always libc.so.6+. */ + *flag = FLAG_ELF_LIBC6; + + ret = process_elf64_file (file_name, lib, flag, isa_level, soname, + file_contents, file_length); + flags = elf64_header->e_flags; + + /* LoongArch linkers encode the floating point ABI as part of the ELF headers. */ + switch (flags & SUPPORTED_ELF_FLAGS) + { + case EF_LARCH_ABI_SOFT_FLOAT: + *flag |= FLAG_LARCH_FLOAT_ABI_SOFT; + break; + case EF_LARCH_ABI_DOUBLE_FLOAT: + *flag |= FLAG_LARCH_FLOAT_ABI_DOUBLE; + break; + default: + return 1; + } + + /* If there are any other ELF flags set then glibc doesn't support this + library. */ + if (flags & ~SUPPORTED_ELF_FLAGS) + return 1; + + return ret; +} + +#undef __ELF_NATIVE_CLASS +#undef process_elf_file +#define process_elf_file process_elf64_file +#define __ELF_NATIVE_CLASS 64 +#include "elf/readelflib.c"