From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id BC7D9385E02D; Wed, 26 Oct 2022 14:50:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC7D9385E02D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666795819; bh=orGkJ1lq5JYAm3gz3q8qAWP6vcA4qgKj+iBUan9AKvA=; h=From:To:Subject:Date:From; b=uWa83TLV+2dM4sv8rrsIHWsyzVqXkgY2GzvLNTd9+8SOO9V4gyQx+ukd8Ccza3izI fsq5ZQBRyQZKf+FWpZdAkNuRTVh3QAw8T+tTwc04YUMn3idDkA6bO9uL8ClciOkn1w 5I7yCxsLc2KHz4Ug+QUTZPgWfMsk3l2Pgj//MwHc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] Revert "TODO(gprof): aarch64: morello: add gprof profiling support to asm" X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 3295936b272a1018e31fd634b7e327101eacd711 X-Git-Newrev: c5872cb18bcef09e9032dcc186ea668b8b1df49e Message-Id: <20221026145019.BC7D9385E02D@sourceware.org> Date: Wed, 26 Oct 2022 14:50:19 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c5872cb18bcef09e9032dcc186ea668b8b1df49e commit c5872cb18bcef09e9032dcc186ea668b8b1df49e Author: Szabolcs Nagy Date: Fri Oct 21 15:43:44 2022 +0100 Revert "TODO(gprof): aarch64: morello: add gprof profiling support to asm" This reverts commit 960401b6f740232d2b97bfe9ea4118b394112a5e. Diff: --- sysdeps/aarch64/sysdep.h | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h index eb58ee340d..6575503c8b 100644 --- a/sysdeps/aarch64/sysdep.h +++ b/sysdeps/aarch64/sysdep.h @@ -151,44 +151,10 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI) ASM_SIZE_DIRECTIVE(name) /* If compiled for profiling, call `mcount' at the start of each function. */ -#if defined PROF && defined __CHERI_PURE_CAPABILITY__ -/* Note: c9 must be preserved in var arg functions. */ -# define CALL_MCOUNT \ - stp c30, c9, [csp, #-160]!; \ - cfi_adjust_cfa_offset (160); \ - cfi_rel_offset (c30, 0); \ - cfi_rel_offset (c9, 16); \ - stp c0, c1, [csp, #32]; \ - cfi_rel_offset (c0, 32); \ - cfi_rel_offset (c1, 48); \ - stp c2, c3, [csp, #64]; \ - cfi_rel_offset (c2, 64); \ - cfi_rel_offset (c3, 80); \ - stp c4, c5, [csp, #96]; \ - cfi_rel_offset (c4, 96); \ - cfi_rel_offset (c5, 112); \ - stp c6, c7, [csp, #128]; \ - cfi_rel_offset (c6, 128); \ - cfi_rel_offset (c7, 144); \ - mov c0, c30; \ - bl mcount; \ - ldp c0, c1, [csp, #32]; \ - cfi_restore (c0); \ - cfi_restore (c1); \ - ldp c2, c3, [csp, #64]; \ - cfi_restore (c2); \ - cfi_restore (c3); \ - ldp c4, c5, [csp, #96]; \ - cfi_restore (c4); \ - cfi_restore (c5); \ - ldp c6, c7, [csp, #128]; \ - cfi_restore (c6); \ - cfi_restore (c7); \ - ldp c30, c9, [csp, #160]; \ - cfi_adjust_cfa_offset (-160); \ - cfi_restore (c30); \ - cfi_restore (c9); -#elif defined PROF && !defined __CHERI_PURE_CAPAILITY__ +#ifdef PROF +# ifdef __CHERI_PURE_CAPABILITY__ +# error mcount profiling is not supported with purecap ABI +# endif # define CALL_MCOUNT \ str x30, [sp, #-80]!; \ cfi_adjust_cfa_offset (80); \