[multiple changes]

2003-02-19  David Edelsohn  <edelsohn@gnu.org>

        * config/rs6000/rs6000.c (rs6000_override_options): Initialize
        align_jumps_max_skip and align_loops_max_skip.

2003-02-19  Thierry Moreau  <thierry.moreau@connotech.com>

        * config/rs6000/rs6000.c (rs6000_encode_section_info): Do not
        test size if named section.

From-SVN: r63116

gcc/ChangeLog

+2003-02-19  David Edelsohn  <edelsohn@gnu.org>
+
+	* config/rs6000/rs6000.c (rs6000_override_options): Initialize
+	align_jumps_max_skip and align_loops_max_skip.
+
+2003-02-19  Thierry Moreau  <thierry.moreau@connotech.com>
+
+	* config/rs6000/rs6000.c (rs6000_encode_section_info): Do not
+	test size if named section.
+
 2003-02-19  Daniel Jacobowitz  <drow@mvista.com>
 
 	* expr.c (expand_expr): Use gen_int_mode for the argument

gcc/config/rs6000/rs6000.c

@@ -753,6 +753,10 @@ rs6000_override_options (default_cpu)
       targetm.asm_out.unaligned_op.di = NULL;
     }
 
+  /* Set maximum branch target alignment at two instructions, eight bytes.  */
+  align_jumps_max_skip = 8;
+  align_loops_max_skip = 8;
+
   /* Arrange to save and restore machine status around nested functions.  */
   init_machine_status = rs6000_init_machine_status;
 }
@@ -12670,20 +12674,20 @@ rs6000_elf_encode_section_info (decl, first)
 	    abort ();
 	}
 
-      if ((size > 0 && size <= g_switch_value)
-	  || (name
-	      && ((len == sizeof (".sdata") - 1
-		   && strcmp (name, ".sdata") == 0)
-		  || (len == sizeof (".sdata2") - 1
-		      && strcmp (name, ".sdata2") == 0)
-		  || (len == sizeof (".sbss") - 1
-		      && strcmp (name, ".sbss") == 0)
-		  || (len == sizeof (".sbss2") - 1
-		      && strcmp (name, ".sbss2") == 0)
-		  || (len == sizeof (".PPC.EMB.sdata0") - 1
-		      && strcmp (name, ".PPC.EMB.sdata0") == 0)
-		  || (len == sizeof (".PPC.EMB.sbss0") - 1
-		      && strcmp (name, ".PPC.EMB.sbss0") == 0))))
+      if (name
+	  ? ((len == sizeof (".sdata") - 1
+	      && strcmp (name, ".sdata") == 0)
+	     || (len == sizeof (".sdata2") - 1
+		 && strcmp (name, ".sdata2") == 0)
+	     || (len == sizeof (".sbss") - 1
+		 && strcmp (name, ".sbss") == 0)
+	     || (len == sizeof (".sbss2") - 1
+		 && strcmp (name, ".sbss2") == 0)
+	     || (len == sizeof (".PPC.EMB.sdata0") - 1
+		 && strcmp (name, ".PPC.EMB.sdata0") == 0)
+	     || (len == sizeof (".PPC.EMB.sbss0") - 1
+		 && strcmp (name, ".PPC.EMB.sbss0") == 0))
+	  : (size > 0 && size <= g_switch_value))
 	{
 	  size_t len = strlen (XSTR (sym_ref, 0));
 	  char *str = alloca (len + 2);