From nobody Fri Jan 05 00:48:37 2024 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 4T5lFK4GyFz55jM7; Fri, 5 Jan 2024 00:48:37 +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 4T5lFK3WMxz4q7g; Fri, 5 Jan 2024 00:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704415717; 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=FON3T7ryM1SqiTuecCRcRs4liJPqQzqA19vzS3VhR/8=; b=xxLvhw5Yqg9WVwm1sGgligx1lzW8BDB44yAkxJ6ncunJm617IMpGyDMpZf0mrbnK6Z80eV R9bWCdyzWJWvUvybVDJXs2P1u1/Y8CBFh5TN6PXV04jCxDtkzdHAbuIVJgNR5dTfNfwovX MoNRw1mgu+850Kch2hgwH+ckcRn08gdBYJZtLhGN2dsYyZgFGjr3VVW4nQo5R2hr7xYGIK Bb/p41xYQcAgcXM1ydDzh4UFdeBclx8ILlcpMQrTEi5TT6nSARWaU9uwOMQOOsSu/GRfrz 555p3L/f4CtEsWiqXGEIk+5VUMEQS8jApxc0FbNV/o8dAjL/Au9lcMrP6sUtrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704415717; 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=FON3T7ryM1SqiTuecCRcRs4liJPqQzqA19vzS3VhR/8=; b=A14yY50abvqWkxHQqPxy6g8ESJ72mTu2b/lhX6IjAIXHTKXEZYuwgmd3qH3B8NLa0jaW77 q3JiK10zceQm9+TR4A4Z6eNMuYRGHCpq3mA+Ec/EywO5IhSxLWX3AaVR7RXsBKk62Ov/0Y pDA+Iy1qOM/fajjHOl8NKuDgg2htgOSS34bLuw3i0aIFgPRDVgHi3/BqFYcwpgAuqnm9TC FNL/wNmDNXt2/OZkNO6zVdaDfI025FIzhquhDuHBDKtLLzqUJozWRHJY7M++UoGI2v/SAb pniZrchE7TmGvphop2CK31F7loBdxTEDNQLDKIrHmUREDIxfGecilpT2UHcKKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704415717; a=rsa-sha256; cv=none; b=nyzcS04oWtd0Ncqqp4Fs9H+hSrJiljbpFMvnKHYJ0as+QsxUReKRw23QPJCleOi8ic9PcH oO54kYlz2UH8cnObhBg0KBgEuvo3c97hPFcDO/wRf2XC3jZ8eqMj07g3XRq5mK+aZvgoi7 +bJiIhvH36glnfi5tDQbMG7uA6tbX/eX6Dljc4NjQXfNLW5y1JQAFano/CfY+m4E0XOdPg hhkD+NeqlfHl9AybYU9k0+8nE1NWT0JTMRU+yvj6dRcqx3szvuoqL3B79aJKFw91LYjxgL fp0hHE1M27bgT/HOFgXwd6znFup0iwR/yeNAFMYiI34pOlziUokae5WH9ii1XA== 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 4T5lFK2cjSzc0N; Fri, 5 Jan 2024 00:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4050mb83060527; Fri, 5 Jan 2024 00:48:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4050mbHj060524; Fri, 5 Jan 2024 00:48:37 GMT (envelope-from git) Date: Fri, 5 Jan 2024 00:48:37 GMT Message-Id: <202401050048.4050mbHj060524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a697425ccc48 - stable/14 - Stop #defining FREEBSD_ELF 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a697425ccc48d8a5ca3106b014feee4b3b397c21 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a697425ccc48d8a5ca3106b014feee4b3b397c21 commit a697425ccc48d8a5ca3106b014feee4b3b397c21 Author: John Baldwin AuthorDate: 2023-12-12 23:30:00 +0000 Commit: John Baldwin CommitDate: 2024-01-05 00:28:48 +0000 Stop #defining FREEBSD_ELF This was originally used (along with FREEBSD_AOUT) to prefer the use of ELF in various tools instead of a.out as part of the a.out to ELF transition in the 3.x days. The last use of it was removed from in commit 66422f5b7a1a6055f0b2358268eb902aab6e2e3e back in 2002, but various files still #define it. Reviewed by: kevans, imp, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42964 (cherry picked from commit 4a3cf5f329d69076aa9d093d596eb0ee82d917f5) --- libexec/rtld-elf/Makefile | 2 +- stand/common/load_elf.c | 1 - stand/common/load_elf_obj.c | 1 - stand/common/reloc_elf.c | 1 - usr.sbin/kldxref/ef.c | 1 - usr.sbin/kldxref/ef_obj.c | 1 - usr.sbin/kldxref/kldxref.c | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 06922c718b2b..fe7e39a6b788 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -38,7 +38,7 @@ SRCS= \ libmap.c MAN?= rtld.1 ACFLAGS+= -DLOCORE -CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -ffreestanding +CFLAGS+= -Wall -DIN_RTLD -ffreestanding CFLAGS+= -I${SRCTOP}/lib/csu/common .if exists(${RTLD_ELF_DIR}/${MACHINE_ARCH:S/powerpc64le/powerpc64/}) RTLD_ARCH= ${MACHINE_ARCH:S/powerpc64le/powerpc64/} diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index 9f3b015fef7e..bd9ab9e7ec5b 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -35,7 +35,6 @@ #include #include #include -#define FREEBSD_ELF #include #include "bootstrap.h" diff --git a/stand/common/load_elf_obj.c b/stand/common/load_elf_obj.c index 86e0fb2b5d22..6906e08f5f36 100644 --- a/stand/common/load_elf_obj.c +++ b/stand/common/load_elf_obj.c @@ -35,7 +35,6 @@ #include #include #include -#define FREEBSD_ELF #include #include "bootstrap.h" diff --git a/stand/common/reloc_elf.c b/stand/common/reloc_elf.c index a7243bc634fd..e4b3e961a4f0 100644 --- a/stand/common/reloc_elf.c +++ b/stand/common/reloc_elf.c @@ -33,7 +33,6 @@ #include -#define FREEBSD_ELF #include #include "bootstrap.h" diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c index 5d052cc90a6c..72e023e30783 100644 --- a/usr.sbin/kldxref/ef.c +++ b/usr.sbin/kldxref/ef.c @@ -43,7 +43,6 @@ #include #include #include -#define FREEBSD_ELF #include "ef.h" diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c index 953e54dc0d28..027408876a5e 100644 --- a/usr.sbin/kldxref/ef_obj.c +++ b/usr.sbin/kldxref/ef_obj.c @@ -45,7 +45,6 @@ #include #include #include -#define FREEBSD_ELF #include "ef.h" diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c index 59b4f346c7ec..ae0d22181688 100644 --- a/usr.sbin/kldxref/kldxref.c +++ b/usr.sbin/kldxref/kldxref.c @@ -42,7 +42,6 @@ #include #include #include -#define FREEBSD_ELF #include #include