From nobody Tue Apr 16 20:13:17 2024 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 4VJwG5592qz5H0fZ; Tue, 16 Apr 2024 20:13:17 +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 4VJwG548rxz4v2V; Tue, 16 Apr 2024 20:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298397; 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=7EW0rDed5j5tpDg6LPaNWswLweZWaw3w4L6Tw47xzH8=; b=YcvbbSp7YW8QcSzKqTsGMU0XiElntqq+HpVLqR39lonASWaOcvWhbXouRJJ2m5SUdqM0y2 q2cQN/rDgLPuUvKC12oBN/HgjXFd91EcIvHMtyhwHFrQ4+TArbrlCnPg3FG60slDnT5k/B MOxOoos1m+XI2bcW/MXcj4oOSY+8sjoAP48Y9M9D7PhOyvdsiZS+1shOA7zQHCD7vnvSg6 ZpBe4Eh5Qm5/PHOZ3d7p39o1JtwLyCjFcxi+sLgx07WvcXWDRyM9TlCTtcicfKcFWrmiLb gdtQm46qf1xfOxoNLJF0HWtdBQMP8KSWohgaYAtjoawDy81geaPIhcqWVkcwrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298397; a=rsa-sha256; cv=none; b=DgANMYti+q5No5gI5KGGBdOTmUZXXY/aaLShndeWo0WZOp5DzCk2RUvfJ2YZX4Y5dGTUVF m4J9p1cunSNIkiyddkeEsdPCn1JFATo69x08Ge7nuyIl88qevuo4IvrSXT+ECWLJsUnBxd y1gAvKSUvwRnrLUZZ9U33aP3j2KQXnGmDoJrDTv3UoNu/1iil7Zac9NT6XxCFkabNUdmi/ I2K2xjfIwdi9+7U0c3Qz/A2wpjN9CAH1cpTH/wbDSsehR1Dtp54CpoLiAI0GsPBloKdWfn 5jQAglFw7ACJHqYQTM9ul/Nf7glNd800ucJEmZBggthxkA6K8IjIGnkdyXpeWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298397; 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=7EW0rDed5j5tpDg6LPaNWswLweZWaw3w4L6Tw47xzH8=; b=jWTWIL0R34QJNSgA9+aQsZWoR1KWXU4Wxehye0uiwqcBPvtagIHSYjqZoi0WPmO1O5icRK cabDR1Qh3bZ0pQTTkRUkcXGZc1aI7/eUMEPUfz7e7nHe6bOFmgem5kWH3WWyczGedFMTr0 YQ5HeOdhUbkbzDxpev0GqHroOWlKyr6f1+ugTtTES1e8JcsHCgEcdldnvHqajFhJWiDxPJ dfzuRyNMpOkMaey/UyU5CewBnSPpQo7tWf31DSS3RGH/jpmuUzPaeTLR+pTnixxFftDWga qHyHamQEcp67EN8sd0oO2RlC88mOB6q0hEzr0ufd/DoVo/aHv2qZFpMA1Hzmfg== 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 4VJwG53dBWzxWV; Tue, 16 Apr 2024 20:13:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GKDH5w039197; Tue, 16 Apr 2024 20:13:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKDH6N039194; Tue, 16 Apr 2024 20:13:17 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:13:17 GMT Message-Id: <202404162013.43GKDH6N039194@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: 295ed2786bb1 - stable/14 - loader/uboot: Move to foo.ldconfig 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 295ed2786bb162dafabc80685935d9f0e8bf224c Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=295ed2786bb162dafabc80685935d9f0e8bf224c commit 295ed2786bb162dafabc80685935d9f0e8bf224c Author: Warner Losh AuthorDate: 2024-02-25 00:56:48 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:27 +0000 loader/uboot: Move to foo.ldconfig Move to the foo.ldconfig convention to match the rest of the boot loader. No functional change intended. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44059 (cherry picked from commit 3d6239d2449ee085a9a078c378659469fd69b135) --- stand/uboot/Makefile | 2 +- stand/uboot/arch/arm/Makefile.inc | 14 +++++++------- stand/uboot/arch/arm/{ldscript.arm => arm.ldscript} | 0 .../arch/powerpc/{ldscript.powerpc => powerpc.ldscript} | 0 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index 4405f09408bf..ccd02c44957f 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -40,7 +40,7 @@ HELP_FILENAME= loader.help.uboot # Always add MI sources .include "${BOOTSRC}/loader.mk" -LDSCRIPT= ${.CURDIR}/arch/${MACHINE_CPUARCH}/ldscript.${MACHINE_CPUARCH} +LDSCRIPT= ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}.ldscript LDFLAGS= -nostdlib -static -T ${LDSCRIPT} LDFLAGS+= -Wl,-znotext diff --git a/stand/uboot/arch/arm/Makefile.inc b/stand/uboot/arch/arm/Makefile.inc index 66cb3f1b4dda..115f48672b18 100644 --- a/stand/uboot/arch/arm/Makefile.inc +++ b/stand/uboot/arch/arm/Makefile.inc @@ -4,22 +4,22 @@ UBLDR_LOADADDR?= 0x1000000 SRCS+= start.S conf.c self_reloc.c -ldscript.abs: +abs.ldscript: echo "UBLDR_LOADADDR = ${UBLDR_LOADADDR};" >${.TARGET} -ldscript.pie: +pie.ldscript: echo "UBLDR_LOADADDR = 0;" >${.TARGET} -ubldr: ${OBJS} ldscript.abs ${LDSCRIPT} ${DPADD} - ${CC} ${CFLAGS} -T ldscript.abs ${LDFLAGS} \ +ubldr: ${OBJS} abs.ldscript ${LDSCRIPT} ${DPADD} + ${CC} ${CFLAGS} -T abs.ldscript ${LDFLAGS} \ -o ${.TARGET} ${OBJS} ${LDADD} -ubldr.pie: ${OBJS} ldscript.pie ${LDSCRIPT} ${DPADD} - ${CC} ${CFLAGS} -T ldscript.pie ${LDFLAGS} -pie -Wl,-Bsymbolic \ +ubldr.pie: ${OBJS} pie.ldscript ${LDSCRIPT} ${DPADD} + ${CC} ${CFLAGS} -T pie.ldscript ${LDFLAGS} -pie -Wl,-Bsymbolic \ -o ${.TARGET} ${OBJS} ${LDADD} ubldr.bin: ubldr.pie ${OBJCOPY} -S -O binary ubldr.pie ${.TARGET} -CLEANFILES+= ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin +CLEANFILES+= abs.ldscript pie.ldscript ubldr ubldr.pie ubldr.bin diff --git a/stand/uboot/arch/arm/ldscript.arm b/stand/uboot/arch/arm/arm.ldscript similarity index 100% rename from stand/uboot/arch/arm/ldscript.arm rename to stand/uboot/arch/arm/arm.ldscript diff --git a/stand/uboot/arch/powerpc/ldscript.powerpc b/stand/uboot/arch/powerpc/powerpc.ldscript similarity index 100% rename from stand/uboot/arch/powerpc/ldscript.powerpc rename to stand/uboot/arch/powerpc/powerpc.ldscript