From: Richard Henderson <rth@redhat.com>
Date: Tue, 13 Apr 2004 23:31:56 +0000 (-0700)
Subject: varasm.c (unlikely_text_section): Use assemble_align instead of ASM_OUTPUT_ALIGN.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73ad3de533055fc656541fa0bb1c501d6b48cb09;p=gcc.git

varasm.c (unlikely_text_section): Use assemble_align instead of ASM_OUTPUT_ALIGN.

        * varasm.c (unlikely_text_section): Use assemble_align instead of
        ASM_OUTPUT_ALIGN.  Use it in the correct place with an approximately
        correct alignment argument.

From-SVN: r80669
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc01a689367..1d250e78e46 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -7,6 +7,10 @@
 	(UNLIKELY_EXECUTED_TEXT_SECTION_NAME): Likewise.
 	* doc/invoke.texi: Update to match.
 
+	* varasm.c (unlikely_text_section): Use assemble_align instead of
+	ASM_OUTPUT_ALIGN.  Use it in the correct place with an approximately
+	correct alignment argument.
+
 2004-04-13  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* reload1.c (emit_reload_insns): Set reg_has_output_reload to one
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 780bba8a11a..c94d514e299 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -228,7 +228,6 @@ unlikely_text_section (void)
 	{
 	  in_section = in_unlikely_executed_text;
 	  fprintf (asm_out_file, "%s\n", TEXT_SECTION_ASM_OP);
-	  ASM_OUTPUT_ALIGN (asm_out_file, 2);
 	}
       
       if (!unlikely_section_label_printed)
@@ -236,6 +235,10 @@ unlikely_text_section (void)
 	  fprintf (asm_out_file, "__%s_unlikely_section:\n", 
 		   current_function_name ());
 	  unlikely_section_label_printed = true;
+
+	  /* Make sure that we have approprate alignment for instructions
+	     in this section.  */
+	  assemble_align (FUNCTION_BOUNDARY);
 	}
     }
 }