From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13431 invoked by alias); 26 Jul 2013 07:35:30 -0000 Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org Received: (qmail 13420 invoked by uid 89); 26 Jul 2013 07:35:30 -0000 X-Spam-SWARE-Status: No, score=0.3 required=5.0 tests=AWL,BAYES_50,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,RDNS_NONE autolearn=no version=3.3.1 Received: from Unknown (HELO mail-we0-f173.google.com) (74.125.82.173) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 26 Jul 2013 07:35:28 +0000 Received: by mail-we0-f173.google.com with SMTP id x55so1524602wes.18 for ; Fri, 26 Jul 2013 00:35:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=fSTyc1T877G1ZUU8CTfdF87j+PKA5xWQ2/UM3svXFDE=; b=QtLMXeVj6ZOeyigN7TCMEoQBv8dSjAx02nQaVaatGtLJ6NIxUL41t29QwGvbBHRskw lvawo4qOFCy+THlhoE/J/Aa8CLSRPS6SHao4UVTdEyPLQ4SmLuz8ku1cXiZHhCr7hdlQ 3V4iXM2wh4ngLN/1qt7Aft6jc0ZGHsuea6RlH7N4HCwa/NRNsG0hG0+BuLRD9g6QRrrV 86dLUdjko4j4RgefYmUqN9WwJ22W9X/7H2gWUpURlqR0RmaCY8ViVILLPnFV2giDQcaa 60Ib9+KGj6D3voiMgTVmwFBBXZoY0M6qqlKDqWQqoenAfguRVgSZ/35ht4stRG71GWuZ ueRw== X-Received: by 10.194.173.71 with SMTP id bi7mr33544214wjc.2.1374824120264; Fri, 26 Jul 2013 00:35:20 -0700 (PDT) Received: from thor.hackery.org.uk (mshawcroft.plus.com. [212.159.23.237]) by mx.google.com with ESMTPSA id n7sm2725025wib.1.2013.07.26.00.35.18 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Jul 2013 00:35:19 -0700 (PDT) From: Marcus Shawcroft To: libc-ports@sourceware.org Cc: Marcus Shawcroft Subject: [PATCH, COMMITTED] [AArch64] Provide symbol version for _mcount. Date: Fri, 26 Jul 2013 07:35:00 -0000 Message-Id: <1374824076-25828-1-git-send-email-marcus.shawcroft@linaro.org> X-Gm-Message-State: ALoCoQm/UuBhr5J8Q/KuyLQedkcHQO7g18Hk/zrIUg4T4TIMsjuU+TiYa/PgLbUIXi7iiiabgexF X-SW-Source: 2013-07/txt/msg00037.txt.bz2 Hi, Revised following Joseph's comments and committed. Thanks /Marcus --- ports/ChangeLog.aarch64 | 7 +++++ ports/sysdeps/aarch64/Versions | 5 ++++ ports/sysdeps/aarch64/machine-gmon.h | 35 ++++++++++++++++++++++ ports/sysdeps/aarch64/mcount.c | 33 ++++++++++++++++++++ .../unix/sysv/linux/aarch64/nptl/libc.abilist | 1 + 5 files changed, 81 insertions(+) create mode 100644 ports/sysdeps/aarch64/Versions create mode 100644 ports/sysdeps/aarch64/machine-gmon.h create mode 100644 ports/sysdeps/aarch64/mcount.c diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index 3f26cb7..537ae60 100644 --- a/ports/ChangeLog.aarch64 +++ b/ports/ChangeLog.aarch64 @@ -1,3 +1,10 @@ +2013-07-26 Marcus Shawcroft + + * sysdeps/aarch64/Versions: New file. + * sysdeps/aarch64/machine-gmon.h: New file. + * sysdeps/aarch64/mcount.c: New file. + * sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist (_mcount): Add. + 2013-07-12 Marcus Shawcroft * sysdeps/aarch64/Makefile (CFLAGS-backtrace.c): Define. diff --git a/ports/sysdeps/aarch64/Versions b/ports/sysdeps/aarch64/Versions new file mode 100644 index 0000000..e1aa44f --- /dev/null +++ b/ports/sysdeps/aarch64/Versions @@ -0,0 +1,5 @@ +libc { + GLIBC_2.18 { + _mcount; + } +} diff --git a/ports/sysdeps/aarch64/machine-gmon.h b/ports/sysdeps/aarch64/machine-gmon.h new file mode 100644 index 0000000..4425965 --- /dev/null +++ b/ports/sysdeps/aarch64/machine-gmon.h @@ -0,0 +1,35 @@ +/* AArch64 definitions for profiling support. + Copyright (C) 1996-2013 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* GCC version 2 gives us a perfect magical function to get + just the information we need: + void *__builtin_return_address (unsigned int N) + returns the return address of the frame N frames up. */ + +#include + +static void mcount_internal (u_long frompc, u_long selfpc); + +#define _MCOUNT_DECL(frompc, selfpc) \ +static inline void mcount_internal (u_long frompc, u_long selfpc) + +#define MCOUNT \ +void __mcount (void) \ +{ \ + mcount_internal ((u_long) RETURN_ADDRESS (1), (u_long) RETURN_ADDRESS (0)); \ +} diff --git a/ports/sysdeps/aarch64/mcount.c b/ports/sysdeps/aarch64/mcount.c new file mode 100644 index 0000000..10171b7 --- /dev/null +++ b/ports/sysdeps/aarch64/mcount.c @@ -0,0 +1,33 @@ +/* Copyright (C) 2013 Free Software Foundation, Inc. + + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + . */ + +#include + +#include + +/* We forgot to add _mcount in glibc 2.17. We added it in 2.18 + therefore we want it to be added with version GLIBC_2_18. However, + setting the version is not straight forward because a generic + Version file includes an earlier 2.xx version for each this symbol + and the linker uses the first version it sees. */ + +#if SHLIB_COMPAT (libc, GLIBC_2_17, GLIBC_2_18) +versioned_symbol (libc, __mcount, _mcount, GLIBC_2_18); +#else +strong_alias (__mcount, _mcount); +#endif diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist b/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist index b04a761..aeee312 100644 --- a/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist +++ b/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist @@ -2080,3 +2080,4 @@ GLIBC_2.17 GLIBC_2.18 GLIBC_2.18 A __cxa_thread_atexit_impl F + _mcount F -- 1.8.1.2