nios2.md (load_got_register): Initialize GOT pointer from _gp_got instead of _GLOBAL_...

2014-02-02  Sandra Loosemore  <sandra@codesourcery.com>

	gcc/
	* config/nios2/nios2.md (load_got_register): Initialize GOT
	pointer from _gp_got instead of _GLOBAL_OFFSET_TABLE_.
	* config/nios2/nios2.c (nios2_function_profiler): Likewise.

	libgcc/
	* config/nios2/crti.S (_init): Initialize GOT pointer from
	_gp_got instead of _GLOBAL_OFFSET_TABLE_.

From-SVN: r207409

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09b1208ec94714122d0ab625b88f024eb53b5976..b08ccc98087f85df6de4b575e6d4fc188606939d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-02  Sandra Loosemore  <sandra@codesourcery.com>
+
+       * config/nios2/nios2.md (load_got_register): Initialize GOT
+       pointer from _gp_got instead of _GLOBAL_OFFSET_TABLE_.
+       * config/nios2/nios2.c (nios2_function_profiler): Likewise.
+
 2014-02-02  Jan Hubicka  <hubicka@ucw.cz>
 
        * ipa-prop.c (update_jump_functions_after_inlining): When type is not

diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c
index 7603132018ce939cc330954872d283da0d7dc345..b7e629c71ca5ccbbaee35b8efb6a5a7a8ee1fa8d 100644 (file)
--- a/gcc/config/nios2/nios2.c
+++ b/gcc/config/nios2/nios2.c
@@ -667,8 +667,8 @@ nios2_function_profiler (FILE *file, int labelno ATTRIBUTE_UNUSED)
   if (flag_pic)
     {
       fprintf (file, "\tnextpc\tr2\n");
-      fprintf (file, "\t1: movhi\tr3, %%hiadj(_GLOBAL_OFFSET_TABLE_ - 1b)\n");
-      fprintf (file, "\taddi\tr3, r3, %%lo(_GLOBAL_OFFSET_TABLE_ - 1b)\n");
+      fprintf (file, "\t1: movhi\tr3, %%hiadj(_gp_got - 1b)\n");
+      fprintf (file, "\taddi\tr3, r3, %%lo(_gp_got - 1b)\n");
       fprintf (file, "\tadd\tr2, r2, r3\n");
       fprintf (file, "\tldw\tr2, %%call(_mcount)(r2)\n");
       fprintf (file, "\tcallr\tr2\n");

diff --git a/gcc/config/nios2/nios2.md b/gcc/config/nios2/nios2.md
index 7274687621c899c424b7d535c5795da033f4ef0a..530ce2dcf1ac28eedf8af89fcd9de7d207550ec6 100644 (file)
--- a/gcc/config/nios2/nios2.md
+++ b/gcc/config/nios2/nios2.md
@@ -1015,8 +1015,8 @@
   ""
   "nextpc\\t%0
 \\t1:
-\\tmovhi\\t%1, %%hiadj(_GLOBAL_OFFSET_TABLE_ - 1b)
-\\taddi\\t%1, %1, %%lo(_GLOBAL_OFFSET_TABLE_ - 1b)"
+\\tmovhi\\t%1, %%hiadj(_gp_got - 1b)
+\\taddi\\t%1, %1, %%lo(_gp_got - 1b)"
   [(set_attr "length" "12")])
 
 ;; Read thread pointer register

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 58a8cadee68eee0c03d50f35d47a85382f0159d7..3186d069dec698caf9c0af922e4b0f2c431b6937 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-02  Sandra Loosemore  <sandra@codesourcery.com>
+
+       * config/nios2/crti.S (_init): Initialize GOT pointer from
+       _gp_got instead of _GLOBAL_OFFSET_TABLE_.
+
 2014-02-02  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * configure.ac: Check __mips64 when setting host_address.

diff --git a/libgcc/config/nios2/crti.S b/libgcc/config/nios2/crti.S
index 528c8f353ec9ea0d119e6dcdb434eb2521631f7a..9f5d523092b106a00d40bad8e9f94fd0f7d6a9f8 100644 (file)
--- a/libgcc/config/nios2/crti.S
+++ b/libgcc/config/nios2/crti.S
@@ -56,8 +56,8 @@ _init:
        addi    fp, sp, 8
 #ifdef linux
        nextpc  r22
-1:     movhi   r2, %hiadj(_GLOBAL_OFFSET_TABLE_ - 1b)
-       addi    r2, r2, %lo(_GLOBAL_OFFSET_TABLE_ - 1b)
+1:     movhi   r2, %hiadj(_gp_got - 1b)
+       addi    r2, r2, %lo(_gp_got - 1b)
        add     r22, r22, r2
 #endif
        
@@ -80,8 +80,8 @@ _fini:
        addi    fp, sp, 8
 #ifdef linux
        nextpc  r22
-1:     movhi   r2, %hiadj(_GLOBAL_OFFSET_TABLE_ - 1b)
-       addi    r2, r2, %lo(_GLOBAL_OFFSET_TABLE_ - 1b)
+1:     movhi   r2, %hiadj(_gp_got - 1b)
+       addi    r2, r2, %lo(_gp_got - 1b)
        add     r22, r22, r2
 #endif