PowerPC64, fix calls to _mcount

The macros used in assembly were broken on powerpc64 ELFv1.

	* sysdeps/powerpc/powerpc64/sysdep.h: (call_mcount_parm_offset): Delete.
	(SAVE_ARG, REST_ARG, CFI_SAVE_ARG): Correct.

diff --git a/ChangeLog b/ChangeLog
index 1715e9104a1affc840cc526048684038e9e74132..ddfa5999671505924a6e8c047c8653f0d0ab2be2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-14  Alan Modra  <amodra@gmail.com>
+
+       * sysdeps/powerpc/powerpc64/sysdep.h: (call_mcount_parm_offset): Delete.
+       (SAVE_ARG, REST_ARG, CFI_SAVE_ARG): Correct.
+
 2017-06-13  Gordana Cmiljanovic  <gordana.cmiljanovic@imgtec.com>
 
        [BZ #21548]

diff --git a/sysdeps/powerpc/powerpc64/sysdep.h b/sysdeps/powerpc/powerpc64/sysdep.h
index db7c1d78b523c634be71fcf6b42f35d80defa0d7..409734aa57a305e7d84ec1e14ce7e0a0292a5234 100644 (file)
--- a/sysdeps/powerpc/powerpc64/sysdep.h
+++ b/sysdeps/powerpc/powerpc64/sysdep.h
@@ -58,29 +58,24 @@
 #endif
 
 /* Support macros for CALL_MCOUNT.  */
-#if _CALL_ELF == 2
-#define call_mcount_parm_offset (-64)
-#else
-#define call_mcount_parm_offset FRAME_PARM_SAVE
-#endif
        .macro SAVE_ARG NARG
        .if \NARG
        SAVE_ARG \NARG-1
-       std     2+\NARG,call_mcount_parm_offset-8+8*(\NARG)(1)
+       std     2+\NARG,-FRAME_MIN_SIZE_PARM+FRAME_PARM_SAVE-8+8*(\NARG)(1)
        .endif
        .endm
 
        .macro REST_ARG NARG
        .if \NARG
        REST_ARG \NARG-1
-       ld      2+\NARG,FRAME_MIN_SIZE_PARM+call_mcount_parm_offset-8+8*(\NARG)(1)
+       ld      2+\NARG,FRAME_PARM_SAVE-8+8*(\NARG)(1)
        .endif
        .endm
 
        .macro CFI_SAVE_ARG NARG
        .if \NARG
        CFI_SAVE_ARG \NARG-1
-       cfi_offset(2+\NARG,call_mcount_parm_offset-8+8*(\NARG))
+       cfi_offset(2+\NARG,-FRAME_MIN_SIZE_PARM+FRAME_PARM_SAVE-8+8*(\NARG))
        .endif
        .endm