Fix powerpc-{eabi,linux,sysv} problem with -mrelocatable

From-SVN: r14103

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index e2d283dd767c345af6059fc6173a39dc5eeb7cf4..9764661c9db97c623c6e6a609ad8312ceb4a338f 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -81,6 +81,7 @@ int rs6000_compare_fp_p;
 /* Label number of label created for -mrelocatable, to call to so we can
    get the address of the GOT section */
 int rs6000_pic_labelno;
 /* Label number of label created for -mrelocatable, to call to so we can
    get the address of the GOT section */
 int rs6000_pic_labelno;

+int rs6000_pic_func_labelno;

 
 /* Which abi to adhere to */
 char *rs6000_abi_name = RS6000_ABI_NAME;
 
 /* Which abi to adhere to */
 char *rs6000_abi_name = RS6000_ABI_NAME;


@@ -3355,7 +3356,7 @@ rs6000_output_load_toc_table (file)
        fprintf (file, "\tl");
 
       fprintf (file, " %s,(", reg_names[0]);
        fprintf (file, "\tl");
 
       fprintf (file, " %s,(", reg_names[0]);

-      ASM_GENERATE_INTERNAL_LABEL (buf, "LCL", rs6000_pic_labelno);
+      ASM_GENERATE_INTERNAL_LABEL (buf, "LCL", rs6000_pic_func_labelno);

       assemble_name (file, buf);
       fprintf (file, "-");
       ASM_GENERATE_INTERNAL_LABEL (buf, "LCF", rs6000_pic_labelno);
       assemble_name (file, buf);
       fprintf (file, "-");
       ASM_GENERATE_INTERNAL_LABEL (buf, "LCF", rs6000_pic_labelno);


@@ -3664,7 +3665,12 @@ output_prolog (file, size)
   /* If TARGET_MINIMAL_TOC, and the constant pool is needed, then load the
      TOC_TABLE address into register 30.  */
   if (TARGET_TOC && TARGET_MINIMAL_TOC && get_pool_size () != 0)
   /* If TARGET_MINIMAL_TOC, and the constant pool is needed, then load the
      TOC_TABLE address into register 30.  */
   if (TARGET_TOC && TARGET_MINIMAL_TOC && get_pool_size () != 0)

-    rs6000_output_load_toc_table (file);
+    {
+#ifdef USING_SVR4_H
+      rs6000_pic_func_labelno = rs6000_pic_labelno;
+#endif
+      rs6000_output_load_toc_table (file);
+    }

 
   if (DEFAULT_ABI == ABI_NT)
     {
 
   if (DEFAULT_ABI == ABI_NT)
     {