From nobody Tue Jan 24 22:11:34 2023 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 4P1h5L6YY9z3bfb0; Tue, 24 Jan 2023 22:11:34 +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 4P1h5L5fhzz4NrF; Tue, 24 Jan 2023 22:11:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598294; 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=m8FUalQACI9RyaweoX08h4EC017VA9yg+UccudNe24U=; b=WQfXvxsstih5VeRztopwIn92idi5/v5ck9c9/5BH7ueECpYwvDThr7wztJnnAZwGKlBygd E77Z3LHtKnshRES+tAEqnqZlj2t0d1ZLivoa3GjcYBZIDhJ64iZQnBgdyKaTX/ZcHNcjcS KKf754ZTJHzigUbkOUCCqABL2paRASFqKpFP57cBpixjfBR5zte1LzgcRxnMGjDy7h8M8x nTi6wZ8oKsq9Pxzm95kFKibswo9JQqd3qnAlZ909Ths/zY5pv381LoK8fI5siO1cxCra26 28nMsAdnd8ipsXM4j+yUxMfedMH3/YUdtFHyT9D2M38A/l8Wo9tkW5iq+fhNfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598294; 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=m8FUalQACI9RyaweoX08h4EC017VA9yg+UccudNe24U=; b=nThODyfaXrWbkHQg4/JqPx0PO+DxHt578ZkZ2QBfsuB5nxRNnn5z/W5JrWvTqiRBXGb6xZ qH17jG69CQIn8SsAmcXhg8IqiDibEBqGGDmjmhJriD6CTh5Scc2fUiSFhj1wa0p3AplT1h ME79anXF6P45pIc960Dr9+Fpsm9pL+/h9hBjv603VYnwnmrXAVFd1EYocEZoDXSFofemlh S0YeTExm2LTUiV1FzbwdlAJH7lP/+BG7juUlGiPOLcoWWYRcRj/ruvRXqe1/+Le/ulpuIc AP5XH0BBgIQ+vfRKsp3YBYxG74bYYRn6tyFSO2IsTSuUpndU3ma+mHtX9tv6UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598294; a=rsa-sha256; cv=none; b=R0fkPIa4Hsapn8HaODLJlQk3plEYBbrnpeUljvPpcvvv6Q0lb1C0jNZRDyEt8v4aW5TuC3 Wc1sA12EgUwT9BNT9mBZopdBkvN2EVGxf0oIFJ++XIdtP5VRcgM9mIJwN2eVTqCGJsf5XW LHI3RDHHztRgEUbjB6DhpWHKDKMxvxyQfI0JtfiJT5SCD+4RtcQq2QmXUjRuziZ6gR1+yB /FQzuJcQq1Icz8FnI8aVuYMnkpthGKaWVSafOfvRdvmaVYrnMIm4tjBXeZX3Jz5FUsn0fM AtqPlFHti9j+yxcYdAhEtsDyjuQ1zbt4EhOePOIN5RJkh2/Y0YeVtZBjQCSZUA== 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 4P1h5L4TsmzQZC; Tue, 24 Jan 2023 22:11:34 +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 30OMBYX8084908; Tue, 24 Jan 2023 22:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBY1J084907; Tue, 24 Jan 2023 22:11:34 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:34 GMT Message-Id: <202301242211.30OMBY1J084907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 94745fbde651 - stable/13 - kboot: Remove RELOC defines, it's unused 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94745fbde6514e5a50b6f6466bbb0d1d9d6cb761 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=94745fbde6514e5a50b6f6466bbb0d1d9d6cb761 commit 94745fbde6514e5a50b6f6466bbb0d1d9d6cb761 Author: Warner Losh AuthorDate: 2022-07-28 05:11:12 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:28 +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 (cherry picked from commit 309a263fe6484658827ca28a922fad70a2b42499) --- 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