From nobody Fri Jul 7 16:56:23 2023 X-Original-To: dev-commits-src-main@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 4QyKKz59nLz4m4L4; Fri, 7 Jul 2023 16:56:23 +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 4QyKKz41bdz4SpY; Fri, 7 Jul 2023 16:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688748983; 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=G40TimGsZZCLCjQB60gMp4qpThRxM7Rui8XzA/Oh7CY=; b=Qh4rYoXz4xCUdTphouiasoLStd7rFJPS92y9zUMGrO7YlhHCCHUJzXgK96tczsMEx7Wrw3 gaAvntp/XUcHNj+5FQIeXRyWGhfQQ0IWsdaC97lPVWg9b1iUogIsW/reC5zucuygqlCt2Q 6MtRO+qDZvaaPmvhNIgvSDRGMe5TsgKfCnP4dBexDJOVCkEGsO3sactmA9Hl2sN2A4yjaF Sn72xs0H/EdnYk1+GP7VTADTJLSXg8CICGgcka+ak4xzOrp7vg1zBLBeZn/2U3xB5ASZnx CyNfE6tW9+4qLotsYX7aM0AXV9lHyY5kpW27mKE5p3RkZxlhXMMy0ZATwjhvjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688748983; 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=G40TimGsZZCLCjQB60gMp4qpThRxM7Rui8XzA/Oh7CY=; b=HMOvXYVdOUYKZTgNbkbfQUd3WNig7o4yE65cU+QOIWuKi37mrNP3YTjHJ4K3ffxuEUr2b3 pBrlLiqQhp5UkpweZ1UNrWbaEn6+hOUS37hmtdmBup72FnmWz6AXxKTxJwyUjcVl9IAckz jHf80Dl0IfIhdVJkb9vcbdcBdofNUKGg3OE/qP2PS/eUcz2FaA71Nm60BikiTvb2VIJyya chAJsgyAoxL7GACCBXm4TIHS/l1bJF51hFfnEG1dqTIsy7ukdyisJpVNX1x43q50QAxHmu YjlOo61Ze6/I6mtSe+EFnxavHH5YzH6KxA4HyMNQWJnKNkOqhvdU77yPyzHOeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688748983; a=rsa-sha256; cv=none; b=PIp/Gc7Qu1EtezHds1oyiD4vXKqPjrh71S+Rb4ykLN6SNvndfcZ2Z2FRdFbR9aUMdmlBjs H37tie71v6UiESAWo/vfoIKMjHSf+QtGKMoRL2FdYZdlsk6dK3nb+p1uycGNO6tm113FQb HetAY5E/dTON3kWioXEneVs/tDQ8pWyKCvHbnSiEfpR8qHkajsRBBHDMsaLO1utSQNYtM2 +dyjeN2EHnf8da31SeKgkYhY8Q8CT1dZkb/qc6KEBIdhB3B+ZrAi1jASP2MEiW7PwO44oA 4wy7lNTGDEKP2BpKOoLPUFZNhV/1LgK29pdiC+HwBMFcqfIjTudukhl0/bWTuQ== 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 4QyKKz30N2zmLv; Fri, 7 Jul 2023 16:56:23 +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 367GuNXZ013900; Fri, 7 Jul 2023 16:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367GuNr7013899; Fri, 7 Jul 2023 16:56:23 GMT (envelope-from git) Date: Fri, 7 Jul 2023 16:56:23 GMT Message-Id: <202307071656.367GuNr7013899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: bae6bb0698ee - main - csu: Implement _start using as to satisfy unwinders on aarch64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bae6bb0698ee727df601e4418153787b5b4b0c9d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bae6bb0698ee727df601e4418153787b5b4b0c9d commit bae6bb0698ee727df601e4418153787b5b4b0c9d Author: Dmitry Chagin AuthorDate: 2023-07-07 16:56:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-07 16:56:02 +0000 csu: Implement _start using as to satisfy unwinders on aarch64 The right unwinding stop indicator should be CFI-undefined PC. https://dwarfstd.org/doc/Dwarf3.pdf - page 118: If a Return Address register is defined in the virtual unwind table, and its rule is undefined (for example, by DW_CFA_undefined), then there is no return address and no call address, and the virtual unwind of stack activations is complete. Reviewed by: Differential Revision: https://reviews.freebsd.org/D40623 --- lib/csu/aarch64/Makefile | 3 ++- lib/csu/aarch64/crt1_c.c | 15 --------------- lib/csu/aarch64/crt1_s.S | 24 +++++++++++++++++++++++- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/lib/csu/aarch64/Makefile b/lib/csu/aarch64/Makefile index d8d0d3fd8f99..72be8b70ef19 100644 --- a/lib/csu/aarch64/Makefile +++ b/lib/csu/aarch64/Makefile @@ -4,6 +4,7 @@ CFLAGS+= -I${.CURDIR} -CRT1OBJS+= crt1_s.o +CRT1SRC= crt1_s.S +CRT1OBJ= crt1_c.o .include diff --git a/lib/csu/aarch64/crt1_c.c b/lib/csu/aarch64/crt1_c.c index 7f4fea37ba1a..095c798046b4 100644 --- a/lib/csu/aarch64/crt1_c.c +++ b/lib/csu/aarch64/crt1_c.c @@ -32,19 +32,4 @@ #include __FBSDID("$FreeBSD$"); -#include "libc_private.h" #include "csu_common.h" - -void __start(int, char **, char **, void (*)(void)) __dead2; - -/* The entry function. */ -void -__start(int argc, char *argv[], char *env[], void (*cleanup)(void)) -{ -#ifdef GCRT - __libc_start1_gcrt(argc, argv, env, cleanup, main, &eprol, &etext); -__asm__("eprol:"); -#else - __libc_start1(argc, argv, env, cleanup, main); -#endif -} diff --git a/lib/csu/aarch64/crt1_s.S b/lib/csu/aarch64/crt1_s.S index 65803c8246ae..17ed74531675 100644 --- a/lib/csu/aarch64/crt1_s.S +++ b/lib/csu/aarch64/crt1_s.S @@ -32,13 +32,35 @@ #include __FBSDID("$FreeBSD$"); + /* + * The program entry point + * void _start(char **ap, void (*cleanup)(void)) __dead2 + */ ENTRY(_start) + .cfi_undefined x30 mov x3, x2 /* cleanup */ add x1, x0, #8 /* load argv */ ldr x0, [x0] /* load argc */ add x2, x1, x0, lsl #3 /* env is after argv */ add x2, x2, #8 /* argv is null terminated */ - b __start +#ifdef PIC + adrp x4, main + add x4, x4, :lo12:main +#else + ldr x4, =main +#endif +#ifdef GCRT + ldr x5, =eprol + ldr x6, =etext + /* + * __libc_start1_gcrt(argc, argv, env, cleanup, main, &eprol, &etext) + */ + bl __libc_start1_gcrt +eprol: +#else + /* __libc_start1(argc, argv, env, cleanup, main) */ + bl __libc_start1 +#endif END(_start) .section .note.GNU-stack,"",@progbits