Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Jul 2022 05:23:19 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 309a263fe648 - main - kboot: Remove RELOC defines, it's unused
Message-ID:  <202207280523.26S5NJYx085178@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=309a263fe6484658827ca28a922fad70a2b42499

commit 309a263fe6484658827ca28a922fad70a2b42499
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-07-28 05:11:12 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-07-28 05:11:12 +0000

    kboot: Remove RELOC defines, it's unused
    
    This was copied from powerpc/ofw and has never been used. We also don't
    care about -DAIM. It's only relevant for in-kernel structures, which we
    don't use in this userland program.
    
    Sponsored by:           Netflix
---
 stand/kboot/arch/amd64/Makefile.inc     | 3 ---
 stand/kboot/arch/powerpc64/Makefile.inc | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/stand/kboot/arch/amd64/Makefile.inc b/stand/kboot/arch/amd64/Makefile.inc
index fb954e798599..a3920d636c9c 100644
--- a/stand/kboot/arch/amd64/Makefile.inc
+++ b/stand/kboot/arch/amd64/Makefile.inc
@@ -1,8 +1,5 @@
 SRCS+=		conf.c host_syscall.S amd64_tramp.S elf64_freebsd.c
 
 CFLAGS+=	-I${SYSDIR}/contrib/dev/acpica/include
-# load address. set in linker script
-RELOC?=		0x0
-CFLAGS+=	-DRELOC=${RELOC}
 
 LDFLAGS=	-nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.amd64
diff --git a/stand/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/arch/powerpc64/Makefile.inc
index 3c2fb6e18a16..e6730edf8e3d 100644
--- a/stand/kboot/arch/powerpc64/Makefile.inc
+++ b/stand/kboot/arch/powerpc64/Makefile.inc
@@ -3,12 +3,6 @@ CFLAGS+=	-mcpu=powerpc64
 SRCS+=		conf.c ppc64_elf_freebsd.c host_syscall.S kerneltramp.S
 SRCS+=		ucmpdi2.c
 
-# load address. set in linker script
-RELOC?=		0x0
-CFLAGS+=	-DRELOC=${RELOC}
-
 LDFLAGS=	-nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc
 
 MK_PIE=		no
-# Maybe bogus?
-CFLAGS+=	 -DAIM



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207280523.26S5NJYx085178>