From a697425ccc48d8a5ca3106b014feee4b3b397c21 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 12 Dec 2023 15:30:00 -0800
Subject: [PATCH] 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
<link.h> 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 06922c718b2..fe7e39a6b78 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 9f3b015fef7..bd9ab9e7ec5 100644
--- a/stand/common/load_elf.c
+++ b/stand/common/load_elf.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <machine/elf.h>
 #include <stand.h>
-#define FREEBSD_ELF
 #include <sys/link_elf.h>
 
 #include "bootstrap.h"
diff --git a/stand/common/load_elf_obj.c b/stand/common/load_elf_obj.c
index 86e0fb2b5d2..6906e08f5f3 100644
--- a/stand/common/load_elf_obj.c
+++ b/stand/common/load_elf_obj.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <machine/elf.h>
 #include <stand.h>
-#define FREEBSD_ELF
 #include <sys/link_elf.h>
 
 #include "bootstrap.h"
diff --git a/stand/common/reloc_elf.c b/stand/common/reloc_elf.c
index a7243bc634f..e4b3e961a4f 100644
--- a/stand/common/reloc_elf.c
+++ b/stand/common/reloc_elf.c
@@ -33,7 +33,6 @@
 
 #include <stand.h>
 
-#define FREEBSD_ELF
 #include <sys/link_elf.h>
 
 #include "bootstrap.h"
diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c
index 5d052cc90a6..72e023e3078 100644
--- a/usr.sbin/kldxref/ef.c
+++ b/usr.sbin/kldxref/ef.c
@@ -43,7 +43,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <machine/elf.h>
-#define FREEBSD_ELF
 
 #include "ef.h"
 
diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c
index 953e54dc0d2..027408876a5 100644
--- a/usr.sbin/kldxref/ef_obj.c
+++ b/usr.sbin/kldxref/ef_obj.c
@@ -45,7 +45,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <machine/elf.h>
-#define FREEBSD_ELF
 
 #include "ef.h"
 
diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index 59b4f346c7e..ae0d2218168 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -42,7 +42,6 @@
 #include <sys/linker.h>
 #include <sys/stat.h>
 #include <sys/module.h>
-#define FREEBSD_ELF
 
 #include <ctype.h>
 #include <err.h>