9rWSPP6M342tt+d5BSpr rotsWlf22O0fwtNdJuC3zfg4l9srs92h96BVGYWbjXiixrTX4sFUUa9DlCsfZKApuf2XU1 TQpt2dpuxSua88GY0zUU82Evrg25JzobOQKaUwL+28GL1olQlVAhejqSdR2OLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVSxq3S9wzVhk for ; Mon, 15 Dec 2025 18:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23c58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:19:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 79fc0a5b5036 - stable/13 - mips: Include CCLDFLAGS when linking kernel.tramp.bin List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 79fc0a5b50361042849766c7ef8fb0766c7f4e83 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:19:11 +0000 Message-Id: <6940511f.23c58.266a26c3@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=79fc0a5b50361042849766c7ef8fb0766c7f4e83 commit 79fc0a5b50361042849766c7ef8fb0766c7f4e83 Author: Jessica Clarke AuthorDate: 2025-12-15 18:16:54 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 18:16:54 +0000 mips: Include CCLDFLAGS when linking kernel.tramp.bin This ensures we pick up -fuse-ld/--ld-path for external toolchains rather than trying to use the default system linker, which may not exist (e.g. on macOS). This is a direct commit to stable/13 as mips no longer exists in main. --- sys/conf/Makefile.mips | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/Makefile.mips b/sys/conf/Makefile.mips index 3610d5e5d5d2..d3bb4b17685b 100644 --- a/sys/conf/Makefile.mips +++ b/sys/conf/Makefile.mips @@ -76,7 +76,7 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/$M/$M/elf_trampoline.c \ -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp sed -e s/${KERNLOADADDR}/${TRAMPLOADADDR}/ -e s/" + SIZEOF_HEADERS"// \ ${LDSCRIPT_NAME} > ${LDSCRIPT_NAME}.tramp.noheader - ${CC} -O -nostdlib -I. -I$S ${TRAMP_EXTRA_FLAGS} -Xlinker \ + ${CC} ${CCLDFLAGS} -O -nostdlib -I. -I$S ${TRAMP_EXTRA_FLAGS} -Xlinker \ -T -Xlinker ${LDSCRIPT_NAME}.tramp.noheader \ -DKERNNAME="\"${KERNEL_KO}.tmp\"" -DELFSIZE=${TRAMP_ELFSIZE} \ -fno-asynchronous-unwind-tables \