From nobody Thu Jul 28 05:23:19 2022 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 4LtfF35kPrz4Y0W4; Thu, 28 Jul 2022 05:23:19 +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 4LtfF35CBpz3GYT; Thu, 28 Jul 2022 05:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658985799; 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=xbIaA5I3h/1bfXjvPjaChFFBQriYblCrY1FOf2/1zhc=; b=TQwSnQotStiQORLZHr5Wr4oe+escAPCglepdWKwztWqiDtpsBm77rCg2Y+8OudEap7qbFk gHN+Q9mtVt/D4+zZJ4xKp7iQLYp3kqBE3ZmdKv49UB6WNpkUB3HC24v18CcaQPOLoYceRC 3s4/27EEgWa1x2wh3JKJsM8EUfi3Oz3rARO13N1/HDnXD9cjrBXJqLprWW/AhRM+7hEkRC 4Wmzglmuhn6uNIGRujoznOB+GDOVF3lHh9WAPRwdntOPE9Q+DbRx40m9GoWFZ1OQKVOB9a J3cFP1L9OohO3ygOawHoJrzhPhqt+B6hsfwEskj0RpVKkNiya1sqR1pjgP1phw== 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 4LtfF34Fx4zkM2; Thu, 28 Jul 2022 05:23:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26S5NJUv085179; Thu, 28 Jul 2022 05:23:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26S5NJYx085178; Thu, 28 Jul 2022 05:23:19 GMT (envelope-from git) Date: Thu, 28 Jul 2022 05:23:19 GMT Message-Id: <202207280523.26S5NJYx085178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 309a263fe648 - main - kboot: Remove RELOC defines, it's unused 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 309a263fe6484658827ca28a922fad70a2b42499 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658985799; 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=xbIaA5I3h/1bfXjvPjaChFFBQriYblCrY1FOf2/1zhc=; b=JD48IajRBnhToaYoNscOF6dqJLDFrlOcndSqMKgmPh2Ozlqkmsq/q1dZtBQyHpW33MtlDS kxmXFlFKYRv0PZcSKGUjgvpBKtTZlURNYtBJN2f5cFrw+mwuE089w0Re76FoxrZKsys4s2 Gh+3ybyZQXDT4Zit7vEDLUn6bMBoTMju83I8WPSdgUiAesrMdSsQ5N+/yJ50dFxCibwSs/ M/EV9gGibF2SPz2xYYzfYYF5zu12WIikM6gb9Ay/zr3cDkknvePWI4VQn9OCUkBQd9HIc8 j0cHE7dB1zyD6wOYenmxdKVpNQq1Q5iOaBOcSLJ0P+iz5pgglvUmfbB36Xnufg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658985799; a=rsa-sha256; cv=none; b=sKlEL6/ftFu0kw70rwF9lD6CPf29WcJ3QteNhKVy8L3AIFSCwG84S7dBUO8he+NAp6/wfV rNpNDCMElMvISCy3S3Pyzvz5qwBiqdsfP/3TLz9BfuOjxYqOEGt0k7WODPSyPPyt89hueR 1pkuuIe+Q870lqgSRAYw7tm4Kxsk+bGJzdspFU/Z4ZRWfXc+f50rkejaZrGRGiUjz/A0kZ X5ttXPjuocoit7Xcs1T5jVGIQ3+WSO3wCgo6fS9GAlto2/OUUFJrlBNzAI5lSBl4ROLAcM CilGOpJdWH57D4J+EpL63XzxQoEeUKHoJgBMbveBJlnwiuuQXKwdgYe1xkdrig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=309a263fe6484658827ca28a922fad70a2b42499 commit 309a263fe6484658827ca28a922fad70a2b42499 Author: Warner Losh AuthorDate: 2022-07-28 05:11:12 +0000 Commit: Warner Losh 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