diff mbox

[COMMITTED,2.19] PowerPC: Fix gprof entry point for LE

Message ID 1440521938-16791-1-git-send-email-tuliom@linux.vnet.ibm.com
State New
Headers show

Commit Message

Tulio Magno Quites Machado Filho Aug. 25, 2015, 4:58 p.m. UTC 
This is a backport from commit a53fbd8e to glibc 2.19.

8<----

This patch fixes the ELFv2 gprof entry point since the ABI
does not define function descriptors.  It fixes BZ#17213.

Conflicts:
	NEWS
---
 ChangeLog                         | 6 ++++++
 NEWS                              | 2 +-
 sysdeps/powerpc/powerpc64/entry.h | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index cecd6ec..0e15efb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@ 
+2013-07-29  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+	[BZ #17213]
+	* sysdeps/powerpc/powerpc64/entry.h: Fix TEXT_START definition for
+	powerpc64le.
+
 2014-11-11  Renlin Li  <Renlin.Li@arm.com>
 
 	[BZ #17555]
diff --git a/NEWS b/NEWS
index d74f4a6..24343f1 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@  Version 2.19.1
 * The following bugs are resolved with this release:
 
   15946, 16545, 16574, 16623, 16695, 16878, 16882, 16885, 16916, 16932,
-  16943, 16958, 17048, 17069, 17137, 17263, 17325, 17555.
+  16943, 16958, 17048, 17069, 17137, 17213, 17263, 17325, 17555.
 
 * Reverted change of ABI data structures for s390 and s390x:
   On s390 and s390x the size of struct ucontext and jmp_buf was increased in
diff --git a/sysdeps/powerpc/powerpc64/entry.h b/sysdeps/powerpc/powerpc64/entry.h
index 76ead1d..30553c1 100644
--- a/sysdeps/powerpc/powerpc64/entry.h
+++ b/sysdeps/powerpc/powerpc64/entry.h
@@ -23,6 +23,7 @@  extern void _start (void);
 
 #define ENTRY_POINT _start
 
+#if _CALL_ELF != 2
 /* We have to provide a special declaration.  */
 #define ENTRY_POINT_DECL(class) class void _start (void);
 
@@ -33,3 +34,4 @@  extern void _start (void);
 #define TEXT_START \
   ({ extern unsigned long int _start_as_data[] asm ("_start");  \
      _start_as_data[0]; })
+#endif