From nobody Tue Dec 12 23:30:48 2023 X-Original-To: dev-commits-src-main@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 4SqZc90rVcz53TP2; Tue, 12 Dec 2023 23:30:49 +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 4SqZc90KcFz4GXS; Tue, 12 Dec 2023 23:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702423849; 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=jo5XJkOJYPzAqYRTuI0JehUEGKAkFovYLdlKdO9HJCo=; b=S0FgDZEQWWZtodR89851Xo4BNfWqHSTIKdvYiFuRcb5JKN6v+ocQT52tr51VsEFn1WYbIt QrJZ9yQfkcuWTjXLRkqKMeVQwG+jfK9nYiY6okfy9jz+3LOnUBie9s20xk65XSJx58nnuS pdOW31UBFG704JehQWSNvHQkts2hUe31FBJgkb4tIbsh2TkTmAhmiSISo4NZOj7OhLQsll hUWrkvgj+kvv7w90it5JGDJjsIzW00SbTjqQBBtP7cW0csosqqlLWoAwOaYaHWAzyloB/b CnbEJ1ypDJYM4n1Mz0feMv+4mwjkKUOtWtvViql54QSlRcXvWG3UC2YtfRdOcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702423849; a=rsa-sha256; cv=none; b=irahtnWl45DccnptEtlJQHbJGY3+RaVTSXyF3QZ0DHOeRpTpl8twlIQxnTyLpp0FtzzbNk ewNco7nmuOeC6VxHjgOGyXwyIUNQFgo00EDbmirSXYmMQw6C3S/1lYRTI2v/Hjlp7qy5M6 NEJT89C961Y2gv4sr/I9dUiFhwKlilzyiWmVDRmX3MxEyqaT0y6tWENHEYRvnq4jpAIkkU +M7I8/pg60cDeVXdyteBSeXOsbzC1Xty1e59iKuJ5O1QZZvi4aOmfCZXN16t9mnQ0OFdCx HQxOtKw+4BJXm8HZoWE+S7SpLOWMizdSbJwvZL+G7T8TwRUaP3tJuiBTwNluzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702423849; 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=jo5XJkOJYPzAqYRTuI0JehUEGKAkFovYLdlKdO9HJCo=; b=HOa/+evxXN4f8yM6q05xlnCo6Wa/htdLxyzkGesH9ofzfm3hdNCBM/YJwNCiYgEYmQeAYv IxfLFU3PcFt34xs0QzaA5AIWrTX5zUHYohTtWu55Rpncy7IdOI875ELSurpaeX1JunV+94 p06SoMHPpWgiBLnOPYhJZfKtbr4umCbKWopKytkVGMyxAztICGU7jUn2x//jeY06CB8UBd f4gYZeOhrqAnhYQEnjmEs2uAyYQea5IyLgENGZFQskKFhmHmlChvY2rVrHf5qyjf9lKnZa UD7ztugi5/I//O/6LlfPSbEgPLwlQD/S9ViZbdYnECv4RvroGe+m0WWnhZgQ+Q== 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 4SqZc86XCkzbL1; Tue, 12 Dec 2023 23:30:48 +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 3BCNUmTg020104; Tue, 12 Dec 2023 23:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BCNUmgI020101; Tue, 12 Dec 2023 23:30:48 GMT (envelope-from git) Date: Tue, 12 Dec 2023 23:30:48 GMT Message-Id: <202312122330.3BCNUmgI020101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4a3cf5f329d6 - main - Stop #defining FREEBSD_ELF List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4a3cf5f329d69076aa9d093d596eb0ee82d917f5 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4a3cf5f329d69076aa9d093d596eb0ee82d917f5 commit 4a3cf5f329d69076aa9d093d596eb0ee82d917f5 Author: John Baldwin AuthorDate: 2023-12-12 23:30:00 +0000 Commit: John Baldwin CommitDate: 2023-12-12 23:30:00 +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 --- 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 d53c0f8b5b84..8877e5f8b7e0 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -34,7 +34,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 263553df5e90..9ff1d238b8c8 100644 --- a/stand/common/load_elf_obj.c +++ b/stand/common/load_elf_obj.c @@ -34,7 +34,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 cf5010a06ccd..e68e59a303a1 100644 --- a/stand/common/reloc_elf.c +++ b/stand/common/reloc_elf.c @@ -32,7 +32,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