From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 1 May 2012 14:22:52 +0000 (-0700)
Subject: Restore ARM profil_counter export (bug 14043).
X-Git-Tag: upstream/2.30~10627^2~148
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d353499456b30ef7b8e3b020f310ee0eef40d2e1;p=external%2Fglibc.git

Restore ARM profil_counter export (bug 14043).
---

diff --git a/ChangeLog.arm b/ChangeLog.arm
index facddbb..cdbed7b 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,11 @@
+2012-05-01  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #14043]
+	* sysdeps/unix/sysv/linux/arm/profil-counter.h: New file.  Based
+	on i386 version but without "static".
+	* sysdeps/unix/sysv/linux/arm/nptl/libc.abilist (GLIBC_2.4): Add
+	profil_counter.
+
 2012-04-28  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #13986]
diff --git a/sysdeps/unix/sysv/linux/arm/nptl/libc.abilist b/sysdeps/unix/sysv/linux/arm/nptl/libc.abilist
index 1f25c37..6322dcf 100644
--- a/sysdeps/unix/sysv/linux/arm/nptl/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/nptl/libc.abilist
@@ -1421,6 +1421,7 @@ GLIBC_2.4
  printf_size F
  printf_size_info F
  profil F
+ profil_counter F
  program_invocation_name D 0x4
  program_invocation_short_name D 0x4
  pselect F
diff --git a/sysdeps/unix/sysv/linux/arm/profil-counter.h b/sysdeps/unix/sysv/linux/arm/profil-counter.h
index 8a6a0bc..f305674 100644
--- a/sysdeps/unix/sysv/linux/arm/profil-counter.h
+++ b/sysdeps/unix/sysv/linux/arm/profil-counter.h
@@ -1,2 +1,31 @@
-/* We can use the ix86 version.  */
-#include <sysdeps/unix/sysv/linux/i386/profil-counter.h>
+/* Low-level statistical profiling support function.  Linux/ARM version.
+   Copyright (C) 1996-2012 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
+   <http://www.gnu.org/licenses/>.  */
+
+#include <signal.h>
+#include <sigcontextinfo.h>
+
+void
+profil_counter (int signo, const SIGCONTEXT scp)
+{
+  profil_count ((void *) GET_PC (scp));
+
+  /* This is a hack to prevent the compiler from implementing the
+     above function call as a sibcall.  The sibcall would overwrite
+     the signal context.  */
+  asm volatile ("");
+}