From nobody Fri Jan 07 05:46:55 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9D74F1935B61; Fri, 7 Jan 2022 05:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVXKX3VsKz3tMD; Fri, 7 Jan 2022 05:46:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C498B2DE8E; Fri, 7 Jan 2022 05:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2075ktNl007410; Fri, 7 Jan 2022 05:46:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2075kt3P007409; Fri, 7 Jan 2022 05:46:55 GMT (envelope-from git) Date: Fri, 7 Jan 2022 05:46:55 GMT Message-Id: <202201070546.2075kt3P007409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0d1f0898c90b - main - rtld-elf: Remove libsoft support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d1f0898c90b3f1a87d4382d3a86df20c6b4fb48 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641534416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+/yMnPV+FTEtJG4KUg02qDo7xzLabJQAJZPK2lzuDU=; b=R4veegV/lGMxdoLquTVfn6EAJUx5/aqsOT0SEkhwzF0QdbMTZvMQIesGJAlWwgtpyNwsIX 6NSWZc3jYUX2PevDeMkIINl8EsD5bJ+9f6WXr7yNma8kAkOFZCCmv0vfxJzGFK473ZeipC SKTRwvCJ+X/qZHKKO10vXBIQkKp3/a6k3/O6wYQhJrtAIM0UHHYH8+PqLfDUrrnyKmgYqa QswVv2XJkHu5R8Q/LnNREabFqLSadEdWWRpmNBQncpOzp/79El2NWfS8EkutxZiyZSppQi UEKta0injSCqx8tgJqQzoVqYidAnxpH4Efu+pSCItMBvLeVZqgl9nJvVQNQbeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641534416; a=rsa-sha256; cv=none; b=ntRh687peHygI3KdDy2qTM4bVbcSH4vqMKGbtzmR6ZNCvQJ1OGKi0lsny48bac6AlSDEup wvIRJofUSB+m7sC1bbXjUDWhPF2biVylresrTt8wkfka7twfY8J+ZHCTsKMlDsURJbJJlF 0oUAmCHvkHf+NgIcM4OFQCdSuKYjmd41iMl/LYTdbFCw74D6mSBJ9kOTmO9Juw+nxJbLZ6 lj2W5Tih1J7s28TuFCBQgAn+LraHPvfGzLC/Zgth9ocLyURYiUePSdkkDXRm/3KzdSWmPg j6Pdp6x5xSoYMt9BDP7yT/WqfCIT4hg9BAyuoWZMTxumE1MMqp8+VvVCwh1+oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0d1f0898c90b3f1a87d4382d3a86df20c6b4fb48 commit 0d1f0898c90b3f1a87d4382d3a86df20c6b4fb48 Author: Warner Losh AuthorDate: 2022-01-07 05:34:21 +0000 Commit: Warner Losh CommitDate: 2022-01-07 05:44:07 +0000 rtld-elf: Remove libsoft support Remove support for loading libsoft libraries. Sponsored by: Netflix --- libexec/rtld-elf/arm/reloc.c | 40 ------------------------------------- libexec/rtld-elf/arm/rtld_machdep.h | 6 ------ libexec/rtld-elf/rtld_paths.h | 6 ------ 3 files changed, 52 deletions(-) diff --git a/libexec/rtld-elf/arm/reloc.c b/libexec/rtld-elf/arm/reloc.c index de5a6ad6cfbe..cfbddaeede75 100644 --- a/libexec/rtld-elf/arm/reloc.c +++ b/libexec/rtld-elf/arm/reloc.c @@ -18,46 +18,6 @@ __FBSDID("$FreeBSD$"); #include "rtld.h" #include "rtld_paths.h" -#ifdef __ARM_FP -/* - * On processors that have hard floating point supported, we also support - * running soft float binaries. If we're being built with hard float support, - * check the ELF headers to make sure that this is a hard float binary. If it is - * a soft float binary, force the dynamic linker to use the alternative soft - * float path. - */ -void -arm_abi_variant_hook(Elf_Auxinfo **aux_info) -{ - Elf_Word ehdr; - - /* - * If we're running an old kernel that doesn't provide any data fail - * safe by doing nothing. - */ - if (aux_info[AT_EHDRFLAGS] == NULL) - return; - ehdr = aux_info[AT_EHDRFLAGS]->a_un.a_val; - - /* - * Hard float ABI binaries are the default, and use the default paths - * and such. - */ - if ((ehdr & EF_ARM_VFP_FLOAT) != 0) - return; - - /* - * This is a soft float ABI binary. We need to use the soft float - * settings. - */ - ld_elf_hints_default = _PATH_SOFT_ELF_HINTS; - ld_path_libmap_conf = _PATH_SOFT_LIBMAP_CONF; - ld_path_rtld = _PATH_SOFT_RTLD; - ld_standard_library_path = SOFT_STANDARD_LIBRARY_PATH; - ld_env_prefix = LD_SOFT_; -} -#endif - void init_pltgot(Obj_Entry *obj) { diff --git a/libexec/rtld-elf/arm/rtld_machdep.h b/libexec/rtld-elf/arm/rtld_machdep.h index c9ec047ec34e..c1acdd719e99 100644 --- a/libexec/rtld-elf/arm/rtld_machdep.h +++ b/libexec/rtld-elf/arm/rtld_machdep.h @@ -76,12 +76,6 @@ extern void *__tls_get_addr(tls_index *ti); #define RTLD_DEFAULT_STACK_PF_EXEC PF_X #define RTLD_DEFAULT_STACK_EXEC PROT_EXEC -extern void arm_abi_variant_hook(Elf_Auxinfo **); - -#ifdef __ARM_FP -#define md_abi_variant_hook(x) arm_abi_variant_hook(x) -#else #define md_abi_variant_hook(x) -#endif #endif diff --git a/libexec/rtld-elf/rtld_paths.h b/libexec/rtld-elf/rtld_paths.h index 6ead517e8feb..ae4d1c473271 100644 --- a/libexec/rtld-elf/rtld_paths.h +++ b/libexec/rtld-elf/rtld_paths.h @@ -75,12 +75,6 @@ #define LD_ "LD_" #endif -#define _PATH_SOFT_ELF_HINTS "/var/run/ld-elf-soft.so.hints" -#define _PATH_SOFT_LIBMAP_CONF "/etc/libmap-soft.conf" -#define _PATH_SOFT_RTLD "/libexec/ld-elf.so.1" -#define SOFT_STANDARD_LIBRARY_PATH "/usr/libsoft" -#define LD_SOFT_ "LD_SOFT_" - #ifdef IN_RTLD extern const char *ld_elf_hints_default; extern const char *ld_path_libmap_conf;