re PR target/22099 (builtin_setjmp gives duplicate labels)

2006-01-19  Andrew Pinski  <pinskia@physics.uc.edu>

        PR target/22099
        * config/i386/i386.md (builtin_setjmp_receiver): Don't emit the label.
        * config/i386/i386.c (output_set_got): Output the label if we have one
        for the TARGET_DEEP_BRANCH_PREDICTION case.

From-SVN: r109974

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dfd0290513921994d343039663af1f2c95fed6bc..927251a579b937ecffab8a411d0eff56d19e0df9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-19  Andrew Pinski  <pinskia@physics.uc.edu>
+
+       PR target/22099
+       * config/i386/i386.md (builtin_setjmp_receiver): Don't emit the label.
+       * config/i386/i386.c (output_set_got): Output the label if we have one
+       for the TARGET_DEEP_BRANCH_PREDICTION case.
+
 2006-01-19  Jan Hubicka  <jh@suse.cz>
             H.J. Lu  <hongjiu.lu@intel.com>
            Evandro Menezes <evandro.menezes@amd.com>

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 107545ec185526502d19424784ef0a48dfed49a3..0b5277b36288e8f5febde8b823cd62c179c7da68 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -4752,6 +4752,9 @@ output_set_got (rtx dest, rtx label ATTRIBUTE_UNUSED)
 #if TARGET_MACHO
       if (!label)
        ASM_OUTPUT_LABEL (asm_out_file, machopic_function_base_name ());
+      else
+        targetm.asm_out.internal_label (asm_out_file, "L",
+                                          CODE_LABEL_NUMBER (label));
 #endif
     }
 

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 40fc24496a6be24ad1dea3e384fd514c8ede97fa..0b1d153af38ceb181f137d07ff9e31956d08e2f9 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -18987,7 +18987,6 @@
       rtx picreg = gen_rtx_REG (Pmode, PIC_OFFSET_TABLE_REGNUM);
       rtx label_rtx = gen_label_rtx ();
       emit_insn (gen_set_got_labelled (pic_offset_table_rtx, label_rtx));
-      emit_label (label_rtx);
       xops[0] = xops[1] = picreg;
       xops[2] = gen_rtx_CONST (SImode,
                  gen_rtx_MINUS (SImode,