From nobody Fri Jan 05 00:48:43 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 4T5lFR6NKmz55jSF; Fri, 5 Jan 2024 00:48:43 +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 4T5lFR4CFFz4q42; Fri, 5 Jan 2024 00:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704415723; 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=gpYm8KMlX31mwM/RBFyfoBDuLOpjGxFZKCFGPsGxS6o=; b=pD+qa5h9E4/qdrlUAYHB2itau9otocl6WPh8udUXxYARS6Ahmme5avFKquGoGQCWp2l38A GNu2lMiBPvBnYxxfPw0bmmifwSpoRxgVmj1vqlSj/djllLmVwQOB4776lSfAzfzFIE+/A/ BvpeTbgzY7BWG5IDIVAEnQfkg7AchLh9nRWNvtmu+FAxrSrJUmuSo8LeWoJQfDn8lanrP8 okx1LzAHEkCPZjo/c3clzf0sJVuE4Rodr98C7F2bcDaielu11YadPEsL9LLSQR1cw//pwd loQiLgOkdFWqLxXffGg5Zl8scHPG62AMayw0o7RxUdMvqk2oQ00hI7aq2mzAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704415723; 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=gpYm8KMlX31mwM/RBFyfoBDuLOpjGxFZKCFGPsGxS6o=; b=LEjLf3FXORGJ/TbLTWR4M3+LEspkx1UdP1s8sCWDrgGNmMLSyU/uYlR68rGN2kP3i+eXte vFC/TbIDWWJN3ekUqN+dsdR7/x0ht+uo9IG1WJJzxZz1WsQFLPbmgol/8WLtM+62kX2qov 4icmd1raTFRjht6x08a8pY5NqnKHEzfRrkOo8XXfJe8Tebdj7Um2eKvroNrrInMuaFIOGe rnTIdEyzCQJNC0AsJ0mwNUK1vgZVFvc2g2acRdxk/OVfroLlHdq3KIj5cgqfdY2FFd8lTi 9hQehUKWxjpscVdjccFiMTQS27FNo178a1vl1dXkFuVgnvPtG6ACA4RbM20bmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704415723; a=rsa-sha256; cv=none; b=M90T2o/ONvPmY/6bJI95V9HHFVuOdUyMqsQJrbAmg3TmlUkL+2UPC/dk9M/MVn9dLOrJ0F TnH4QDJaWKvylBUD/vD+QE2LG3gw19Bt1VZLJjwEuGcJLHqatdM+fkkwLghFtGvHnmSEIR ePB5fHkRJZbc+ODAavWs9E7kNi2Rr12iGgT+XfwC1uINxEcmZg8mk0g5cjuXyXbXuPVS4n R5nPkqq76CMwr+QH0P0Ek4K3U75BHzyPvy05oDNVc2oOVX6BVYc1bm2zVNLbt/F2xWo/+i V2Ci4qfpVLZEEcfzp/EJk1zOg/SgEUbN+E52LIS0WfFQvZYGEk7BU//QeUkfaw== 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 4T5lFR3JtqzbtT; Fri, 5 Jan 2024 00:48:43 +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 4050mhxj060797; Fri, 5 Jan 2024 00:48:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4050mhhM060794; Fri, 5 Jan 2024 00:48:43 GMT (envelope-from git) Date: Fri, 5 Jan 2024 00:48:43 GMT Message-Id: <202401050048.4050mhhM060794@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: 7da77f0266f1 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 7da77f0266f19696ae1221215f9c9998e686f90c Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7da77f0266f19696ae1221215f9c9998e686f90c commit 7da77f0266f19696ae1221215f9c9998e686f90c Author: John Baldwin AuthorDate: 2023-12-12 23:30:00 +0000 Commit: John Baldwin CommitDate: 2024-01-05 00:28:53 +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 ee862f650329..b95adf82fe9b 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -31,7 +31,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 47435dd78f6c..02e030016e17 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 154cf90a597f..f91571a4ef11 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