From nobody Sun Jan 23 10:25:41 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 7C489197AE4A; Sun, 23 Jan 2022 10:25:42 +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 4JhTln62msz4Z1x; Sun, 23 Jan 2022 10:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642933542; 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=VOo/EvtBKaKyHjem3ngarUhVoyiQhusv8pd8ICvZp/s=; b=pmDRmmbCDNFGS08L33nlpd23lnqjh/dcYgtTzRN1zEyP5DOwqION48WJBllVh7sTmK+BWH kuu9FWBxNFNj8CEf0UPwgDOqgZgt/hXYrPorNboUGxfqC3tPtwcVpfM9kxVbiXCIcMBlCb HwUxfxJYSUkySajDKxyZ6CzCgUXOWvYs0iiV8CMFuLtLpobTXYnWp1ZsP3rW/+3dYwnlaH US2fuKS0CuFz/H13jR27ZvQOgMIXBdHz79qQHDnlMOiArA030oFB4Cbc9dYhn3FmCHRSR9 wg0hUFXME2AFqnZZuhVC2g/v+eYY0ATA0lQ9wDXUishrhA22peQI18iKbKM8GQ== 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 7EF2E20D2B; Sun, 23 Jan 2022 10:25:41 +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 20NAPfR1088332; Sun, 23 Jan 2022 10:25:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20NAPfRO088331; Sun, 23 Jan 2022 10:25:41 GMT (envelope-from git) Date: Sun, 23 Jan 2022 10:25:41 GMT Message-Id: <202201231025.20NAPfRO088331@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: afd4a4940790 - stable/13 - Disable PIE for MIPS ubldr 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: afd4a4940790c89c27cc4fac31814a4402f31444 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642933542; 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=VOo/EvtBKaKyHjem3ngarUhVoyiQhusv8pd8ICvZp/s=; b=tnzA0CJ/JMFA4XlxTnMjk2RkceipQvYasEQ9PRUWJWXYD++sHtuNHi1bHbS9+7cQ+NRMDL 4L3nVbtvnZBl3PTIyR2j8Yc89nywYF5kuG6ClBc7JNzj7YgBM8jUuLue8uONziZ82H12NS xJJhLijVQGE7FNgSziWXlVXxpWic65iCLbEELeUgKfirt1RA4CC/utdctR8auqjjT7fXRc 1n0QuboKneNt/2iH7Nr6/V3F7BN1xZtieFHhrhCA8bo2SUV9aOXvXrtxcsyWgLB3gROen+ 9GYfsIC22G7dgQ0L48s0419i/m9Cvy0EnE1KK7TFxnh9Na+cZtndsX2qRgxQZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642933542; a=rsa-sha256; cv=none; b=GT3CVm0e/ldD+cjafwhW3gj8LDbJY4RpQTG+qiFFlzi10jbGqYgJU4wim8Lq7eMC3ORt9I aSpFseWZBqWArno7w7DrOkEnw/SUKfZmbvIuNG1JbhmEFLFnz16+kpygTxIUAH1pAjPyNl 7sH+Wece4LTkm5tlEHNM2HZz4uy7pxjeSdfZsfboZuiAA4bJkp+jkEMoxdNa1mQdkH9ofk lSaBbjVd1I7TbbEfWmWgydNgmveA6mW6fxhW6fQVA1TBH38R93bQSfx/umQTwX3ITrsdjM apWyeWthq8WOTxU7clgCm4yyC+8S1EtrJoyyv1eZ45N2GcV1LkN1uDYPc5XSuQ== 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=afd4a4940790c89c27cc4fac31814a4402f31444 commit afd4a4940790c89c27cc4fac31814a4402f31444 Author: Marcin Wojtas AuthorDate: 2021-02-12 15:41:49 +0000 Commit: Marcin Wojtas CommitDate: 2022-01-23 10:09:53 +0000 Disable PIE for MIPS ubldr When performing buildworld for MIPS with PIE enabled, the build fails with "position-independent code requires '-mabicalls'" message. -mno-abicalls and -fno-pic flags are explicitly set in MIPS ubldr makefile, so to work around this problem, set MK_PIE=no for MIPS ubldr. Submitted by: Dawid Gorecki Reviewed by: emaste Obtained from: Semihalf Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D28370 (cherry picked from commit cd992885bcdfb3c2c6b761f5c3bf1c86949acdc3) --- stand/mips/uboot/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stand/mips/uboot/Makefile b/stand/mips/uboot/Makefile index 1162b7fed3b0..984582027de5 100644 --- a/stand/mips/uboot/Makefile +++ b/stand/mips/uboot/Makefile @@ -44,6 +44,10 @@ LDADD= ${LDR_INTERP} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA} OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +# ubldr on MIPS is built with '-mno-abicalls' flag, +# which is incompatible with PIE +MK_PIE= no + ldscript.abs: echo "UBLDR_LOADADDR = ${UBLDR_LOADADDR};" >${.TARGET}