abitest.S (LABEL_TEST_FUNC_RETURN): Load testfunc_ptr as 32bit for ILP32 and 64bit...

	* gcc.target/aarch64/aapcs64/abitest.S (LABEL_TEST_FUNC_RETURN): Load
	testfunc_ptr as 32bit for ILP32 and 64bit for LP64.

Co-Authored-By: Naveen H.S <Naveen.Hurugalawadi@caviumnetworks.com>
From-SVN: r219832

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 88be2da4f39d5d86a343f2bf34af058b6e83e324..29ad3f4db8ee248b90531761fe7b816835bc201d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-15  Andrew Pinski  <apinski@cavium.com>
+           Naveen H.S  <Naveen.Hurugalawadi@caviumnetworks.com>
+
+       * gcc.target/aarch64/aapcs64/abitest.S (LABEL_TEST_FUNC_RETURN): Load
+       testfunc_ptr as 32bit for ILP32 and 64bit for LP64.
+
 2015-01-18  Andre Vehreschild  <vehre@gmx.de>
 
        PR fortran/60255

diff --git a/gcc/testsuite/gcc.target/aarch64/aapcs64/abitest.S b/gcc/testsuite/gcc.target/aarch64/aapcs64/abitest.S
index 68845fbcdb5e6984d6154b3a8bcd2b04b7ce1f8f..c2fbd83fcb3e52d5270ec8e05db3b9904b483960 100644 (file)
--- a/gcc/testsuite/gcc.target/aarch64/aapcs64/abitest.S
+++ b/gcc/testsuite/gcc.target/aarch64/aapcs64/abitest.S
@@ -2,6 +2,13 @@
        .global myfunc
        .type dumpregs,%function
        .type myfunc,%function
+
+#ifdef __LP64__
+#define PTR_REG(n)      x##n
+#else
+#define PTR_REG(n)      w##n
+#endif
+
 dumpregs:
 myfunc:
       mov      x16, sp
@@ -48,7 +55,7 @@ myfunc:
 LABEL_TEST_FUNC_RETURN:
       adrp     x9, testfunc_ptr
       add      x9, x9, :lo12:testfunc_ptr
-      ldr      x9, [x9, #0]
+      ldr      PTR_REG(9), [x9, #0]
       blr      x9                              // function return value test
       adrp     x9, saved_return_address
       add      x9, x9, :lo12:saved_return_address