From nobody Tue Nov 01 00:46:21 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 4N1WY9584qz4gy0n; Tue, 1 Nov 2022 00:46:21 +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 4N1WY94N0tz3Q8y; Tue, 1 Nov 2022 00:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667263581; 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=LuS3eS/YhoDULSqMrEcimU/a2xTUFvJ+izKGsq2+jEw=; b=D0rz9ksb4KYMnvmh/FG1q+hbl0tg19P/oFHsU3CHFRzjmnVF8FHwCFH314eH0ME9C1xQ3F cHQrKYEoGRBk0kTGJL77FRCv/vcb6DPurNdN+WRM26oI5z86PTmk7HhXTe9UEtyJQiNnZR 74akelmX2iM989reDcNYdpjrpze43+ho4/Iquvi5m1mIjclSB6nwmZiemjUFSGStl9Pfms UBYxWuJVBrClGew0cQ3qbvKPaF9quzlzz5lSydxrIKIqsiSBEpPMmLldjyMQdF6nAJSTKC Qdu5zjngGIsqOGt+hjzQsSEEVQAL+7l4/FD8wEm0SxO/DizrVDyeZw2Ec134oA== 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 4N1WY93SHVzwjf; Tue, 1 Nov 2022 00:46:21 +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 2A10kLiJ041776; Tue, 1 Nov 2022 00:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A10kL5T041775; Tue, 1 Nov 2022 00:46:21 GMT (envelope-from git) Date: Tue, 1 Nov 2022 00:46:21 GMT Message-Id: <202211010046.2A10kL5T041775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 68be9f4ea1db - stable/13 - arm, arm64: tweak hard-coded load addresses for PIE binaries 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 68be9f4ea1dbd5ae644de3bfa663c68b7df30196 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667263581; 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=LuS3eS/YhoDULSqMrEcimU/a2xTUFvJ+izKGsq2+jEw=; b=rVpFs2X30gSPXbPGWNp+2WpaLWHECc9qQBY4zCoa/UmBgUnJN2pm+dUG3KmtoOKU4dyUW7 eOfCoTGVhmdhv9MhHONoRWA67tYGuh0Q6+dBZI3bPKCj2xy9EwFnriyvoNXr+zABU2ptuH JjbSgGa6OVFmnqsg2EWbmWpdyoZa3A6LY+hy4LNBWJ86WzDgIAYyDmTe03jTv3S0dAHJy/ KYUg+iFRndLpkx/QWfuRTe5Oq4TLpTWNKWTZUbS6zmF6VF+zn2cDWSMMWlk3jLAJYw2e/y /w+bfRMiaS75Y260SUO+GWqjji0eOYNoERjjYOG5uSOTJmfdxy5TGNQSwOFxnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667263581; a=rsa-sha256; cv=none; b=q8nfYZNg8bkgXoyg4DSNP1SZpr0iAo0xvFBxIR9MTMqPgXeIllvuDr2mJfpdb/ChJGDsKq qQMEevpDR4OZsRuK0VukLClMYe/QJPNwc8zOB+jVpoiWCr+DHcwojGM7wQOL4ChawWUK94 2mJq7jIXsrN7pdrWP5e2bPFsux5jf24Ycz6NbcsHr3vnEkaBQDy2Hwefs4DyCHE4oujuKH I8l3CW143EXBkMbFjFLnYJktuOQ++2Ab1Ey4k5k/CVC7Y2AT0Nlh1S7srvUjNxS7J2yBlN pjoLX27F6ePDpRoAU3kohbgE4uDLyBCXX1yN1m4LgZbSQo0AE/lVmqubxBITKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=68be9f4ea1dbd5ae644de3bfa663c68b7df30196 commit 68be9f4ea1dbd5ae644de3bfa663c68b7df30196 Author: Konstantin Belousov AuthorDate: 2022-10-22 10:58:43 +0000 Commit: Konstantin Belousov CommitDate: 2022-11-01 00:44:40 +0000 arm, arm64: tweak hard-coded load addresses for PIE binaries (cherry picked from commit ca18304ea491263389b8b1239e9b5b21d80da7f5) --- sys/arm/include/elf.h | 2 +- sys/arm64/include/elf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h index affd4b349163..35d0fa55ca1a 100644 --- a/sys/arm/include/elf.h +++ b/sys/arm/include/elf.h @@ -78,7 +78,7 @@ __ElfType(Auxinfo); #define EF_ARM_EABI_VERSION_UNKNOWN 0 #define EF_ARM_EABI_FREEBSD_MIN 4 -#define ET_DYN_LOAD_ADDR 0x500000 +#define ET_DYN_LOAD_ADDR 0x01001000 /* Flags passed in AT_HWCAP. */ #define HWCAP_SWP 0x00000001 /* Unsupported, never set. */ diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h index 3f7c3964d428..22e968c632bf 100644 --- a/sys/arm64/include/elf.h +++ b/sys/arm64/include/elf.h @@ -86,7 +86,7 @@ __ElfType(Auxinfo); #endif #if __ELF_WORD_SIZE == 32 -#define ET_DYN_LOAD_ADDR 0x12000 +#define ET_DYN_LOAD_ADDR 0x01001000 #else #define ET_DYN_LOAD_ADDR 0x100000 #endif