From nobody Sun Jan 23 10:25:42 2022 X-Original-To: dev-commits-src-branches@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 883CB197B0A6; Sun, 23 Jan 2022 10:25:43 +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 4JhTlq14Vlz4Z5s; Sun, 23 Jan 2022 10:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642933543; 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=pmEm0TOvb2/Em4YjZCaIL1rq1OyJ8QHFjKY+pDUchtU=; b=yB13S1MP1cFtvDKDgipAqJSQp9US1pA0VErmlADE1zGeuXE8qcnYPl1RFFFtZdiUrR3pnY r6d/m1YYYv2OwdyOgTlLEkbhQndkc28C+i2YbP9lu6haILE5Yqw8t/Qj00o27ADPxBPjmh umDrAp0ia3ViKkwLQgoSfZVy2uqTjELZcO+YedZfYtny3wUWRlbRtmt2ey6T5CcuByTlBB Sp1qtfCkfHYWZ5iIb6yubtiSRKDs7sMkkkACiYhOzWK6V1ZNigwMunubSgCYBCF9ghwSS6 KLiqtXP4rt3r8uPRByztjxHrdG7UHAgA2ZJT+mZI+LbCsFxF0U84fmFIdsMGUQ== 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 9F9D920CD8; Sun, 23 Jan 2022 10:25:42 +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 20NAPgNv088359; Sun, 23 Jan 2022 10:25:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20NAPgFi088358; Sun, 23 Jan 2022 10:25:42 GMT (envelope-from git) Date: Sun, 23 Jan 2022 10:25:42 GMT Message-Id: <202201231025.20NAPgFi088358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: 5b042fcbdff8 - stable/13 - Disable PIE for powerpc bootloaders. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b042fcbdff8a651daecfbf91759fc8baf43ece0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642933543; 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=pmEm0TOvb2/Em4YjZCaIL1rq1OyJ8QHFjKY+pDUchtU=; b=XdHhfjm7DKsnfcEvzXVzN8dHNkNxMnshdHy95JhH6G2T4daY7HhGnN0q8AXk8HQ+NXwss4 xWtBsLhWH01Wgi6o/KaTZv7Vx+V87X2YnJB382H9tmTqb8NZ4dMF5E73850syjXhu9k4FP h7Nhlu7E8o9y6Z5ptBNSmZESUOBu5pUpPo4ABeMenG5suSHcqqVN4/e3EfuNZgA3g9eyF4 JQjhqwDgaxnZitmISV9lbDrQIHGQfaaUeCYbCt5m7f2Qfgfg7/XhimThib0IR2w7dq/SlY 3FX+d8zt0BpPOw569tNAWH79+VUzDEgz9F2wA2siUexnRWCVMHJMFREAsaoQ5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642933543; a=rsa-sha256; cv=none; b=IzSgq2XJxc+9K95yqOS6aYTcvOlA6RreBAuHfqMDATGJtTg7yWd4VFPYLk2kkc2uq3wxSB 9y+5Vsx9C/gVUtKBpeFrRL/Ay7UQSMt9hrq1RMaf9edZ55L5T7680L/QNiImh7oXZO3M3p LBM9gie0nHJPzJAZj40eTftUaQSEgtTOOJfzYArxo0ppXetaFdfSaApv1MHfIxsGl2okZA vNYdAM+E2XBpa6fvft/rybPzfLiCX1IrT5EpoEH29VQFcb08JNXUJbqi9PlUAPbnw967mM I9ybPuC0e36y9fuPiPy4R35r+D4HLLdIjJfobIuFcj6/ab/yVyz0KsO3JnSchA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=5b042fcbdff8a651daecfbf91759fc8baf43ece0 commit 5b042fcbdff8a651daecfbf91759fc8baf43ece0 Author: Marcin Wojtas AuthorDate: 2021-02-23 12:42:26 +0000 Commit: Marcin Wojtas CommitDate: 2022-01-23 10:09:53 +0000 Disable PIE for powerpc bootloaders. Bootloaders for powerpc are not built as position independent code. Since bsd.prog.mk is used for building, when PIE is enabled, the PIE flags are added and that causes the build to fail. Adding MK_PIE=no stops bsd.prog.mk from adding PIE specific flags. Submitted by: Dawid Gorecki Reviewed by: emaste Obtained from: Semihalf Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D28893 (cherry picked from commit 3aa023643e9db78f4da314ff9bfb1643533c004f) --- stand/powerpc/boot1.chrp/Makefile | 2 ++ stand/powerpc/kboot/Makefile | 2 ++ stand/powerpc/ofw/Makefile | 2 ++ stand/powerpc/uboot/Makefile | 2 ++ 4 files changed, 8 insertions(+) diff --git a/stand/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile index e2f1739a4f4e..928f30e7eabb 100644 --- a/stand/powerpc/boot1.chrp/Makefile +++ b/stand/powerpc/boot1.chrp/Makefile @@ -43,5 +43,7 @@ boot1.hfs: boot1.elf bootinfo.txt CLEANFILES+= boot1.hfs +MK_PIE= no + .include diff --git a/stand/powerpc/kboot/Makefile b/stand/powerpc/kboot/Makefile index 8b632ae3d076..a5e43ab6fdaa 100644 --- a/stand/powerpc/kboot/Makefile +++ b/stand/powerpc/kboot/Makefile @@ -42,4 +42,6 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} +MK_PIE= no + .include diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile index 6d75bb882d2b..03844301f094 100644 --- a/stand/powerpc/ofw/Makefile +++ b/stand/powerpc/ofw/Makefile @@ -63,4 +63,6 @@ CFLAGS+= -I${BOOTSRC}/libofw DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA} +MK_PIE= no + .include diff --git a/stand/powerpc/uboot/Makefile b/stand/powerpc/uboot/Makefile index 9124507397ad..b0635104e454 100644 --- a/stand/powerpc/uboot/Makefile +++ b/stand/powerpc/uboot/Makefile @@ -31,4 +31,6 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc DPADD= ${LDR_INTERP} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA} +MK_PIE= no + .include