Patchwork [PPC,committed] fix ppc build breakage.

login
register
mail settings
Submitter Iain Sandoe
Date Sept. 30, 2013, 9:26 a.m.
Message ID <E645F70A-82E8-448E-9B48-320063AE1A09@codesourcery.com>
Download mbox | patch
Permalink /patch/278985/
State New
Headers show

Comments

Iain Sandoe - Sept. 30, 2013, 9:26 a.m.
Hi,

My commit r203019 contained an oversight which is fixed by the obvious patch below.
tested on cross to powerpc-linux-gnu and a build of cc1 for AIX-6.1.3 (and stage1 for powerpc-darwin9).

applied as r203027

Apologies for the breakage, and that this slipped through my usual testing,
Iain

gcc:

	* config/rs6000/darwin.md (load_macho_picbase_si): Wrap machopic
	calls and defines in TARGET_MACHO conditional.
	(load_macho_picbase_di): Likewise.
	(reload_macho_picbase): Likewise.
	(reload_macho_picbase_si): Likewise.
	(reload_macho_picbase_di): Likewise.
	(nonlocal_goto_receiver): Likewise.

Patch

Index: gcc/config/rs6000/darwin.md
===================================================================
--- gcc/config/rs6000/darwin.md	(revision 203026)
+++ gcc/config/rs6000/darwin.md	(working copy)
@@ -261,7 +261,11 @@ 
 		    (pc)] UNSPEC_LD_MPIC))]
   "(DEFAULT_ABI == ABI_DARWIN) && flag_pic"
 {
+#if TARGET_MACHO
   machopic_should_output_picbase_label (); /* Update for new func.  */
+#else
+  gcc_unreachable ();
+#endif
   return "bcl 20,31,%0\\n%0:";
 }
   [(set_attr "type" "branch")
@@ -273,7 +277,11 @@ 
 		    (pc)] UNSPEC_LD_MPIC))]
   "(DEFAULT_ABI == ABI_DARWIN) && flag_pic && TARGET_64BIT"
 {
+#if TARGET_MACHO
   machopic_should_output_picbase_label (); /* Update for new func.  */
+#else
+  gcc_unreachable ();
+#endif
   return "bcl 20,31,%0\\n%0:";
 }
   [(set_attr "type" "branch")
@@ -397,6 +405,7 @@ 
 		    (pc)] UNSPEC_RELD_MPIC))]
   "(DEFAULT_ABI == ABI_DARWIN) && flag_pic"
 {
+#if TARGET_MACHO
   if (machopic_should_output_picbase_label ())
     {
       static char tmp[64];
@@ -405,6 +414,9 @@ 
       return tmp;
     }
   else
+#else
+  gcc_unreachable ();
+#endif
     return "bcl 20,31,%0\\n%0:";
 }
   [(set_attr "type" "branch")
@@ -416,6 +428,7 @@ 
 		    (pc)] UNSPEC_RELD_MPIC))]
   "(DEFAULT_ABI == ABI_DARWIN) && flag_pic && TARGET_64BIT"
 {
+#if TARGET_MACHO
   if (machopic_should_output_picbase_label ())
     {
       static char tmp[64];
@@ -424,6 +437,9 @@ 
       return tmp;
     }
   else
+#else
+  gcc_unreachable ();
+#endif
     return "bcl 20,31,%0\\n%0:";
 }
   [(set_attr "type" "branch")
@@ -438,6 +454,7 @@ 
   "&& reload_completed"
   [(const_int 0)]
 {
+#if TARGET_MACHO
   if (crtl->uses_pic_offset_table)
     {
       static unsigned n = 0;
@@ -456,6 +473,8 @@ 
   else
     /* Not using PIC reg, no reload needed.  */
     emit_note (NOTE_INSN_DELETED);
-
+#else
+  gcc_unreachable ();
+#endif
   DONE;
 })