From owner-svn-src-all@freebsd.org Mon Mar 30 21:32:27 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3158D267C7A; Mon, 30 Mar 2020 21:32:27 +0000 (UTC) (envelope-from emaste@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48rlzW1kJWz4Jn2; Mon, 30 Mar 2020 21:32:23 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FF3424812; Mon, 30 Mar 2020 21:25:01 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02ULP0gi019540; Mon, 30 Mar 2020 21:25:00 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02ULP0wu019539; Mon, 30 Mar 2020 21:25:00 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202003302125.02ULP0wu019539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 30 Mar 2020 21:25:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359462 - head/lib/libc/gen X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/lib/libc/gen X-SVN-Commit-Revision: 359462 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Mar 2020 21:32:27 -0000 Author: emaste Date: Mon Mar 30 21:25:00 2020 New Revision: 359462 URL: https://svnweb.freebsd.org/changeset/base/359462 Log: libc: unconditionalize _NLIST_DO_ELF Suggested by: brooks, imp Modified: head/lib/libc/gen/nlist.c Modified: head/lib/libc/gen/nlist.c ============================================================================== --- head/lib/libc/gen/nlist.c Mon Mar 30 20:20:15 2020 (r359461) +++ head/lib/libc/gen/nlist.c Mon Mar 30 21:25:00 2020 (r359462) @@ -47,12 +47,8 @@ __FBSDID("$FreeBSD$"); #include #include "un-namespace.h" -#define _NLIST_DO_ELF - -#ifdef _NLIST_DO_ELF #include #include -#endif int __fdnlist(int, struct nlist *); int __elf_fdnlist(int, struct nlist *); @@ -74,9 +70,7 @@ nlist(const char *name, struct nlist *list) static struct nlist_handlers { int (*fn)(int fd, struct nlist *list); } nlist_fn[] = { -#ifdef _NLIST_DO_ELF { __elf_fdnlist }, -#endif }; int @@ -95,7 +89,6 @@ __fdnlist(int fd, struct nlist *list) #define ISLAST(p) (p->n_un.n_name == 0 || p->n_un.n_name[0] == 0) -#ifdef _NLIST_DO_ELF static void elf_sym_to_nlist(struct nlist *, Elf_Sym *, Elf_Shdr *, int); /* @@ -299,4 +292,3 @@ elf_sym_to_nlist(struct nlist *nl, Elf_Sym *s, Elf_Shd ELF_ST_BIND(s->st_info) == STB_WEAK) nl->n_type |= N_EXT; } -#endif /* _NLIST_DO_ELF */