linux.h (HAVE_GAS_BALIGN_AND_P2ALIGN): Move to ...

	* config/m68k/linux.h (HAVE_GAS_BALIGN_AND_P2ALIGN): Move to ...
	* config/m68k/m68k.h: ... here.
	* testsuite/gcc.dg/falign-labels.c (dg-options): Don't restrict for
	m68k and fido.

From-SVN: r148127

gcc/ChangeLog

+2009-06-03  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* config/m68k/linux.h (HAVE_GAS_BALIGN_AND_P2ALIGN): Move to ...
+	* config/m68k/m68k.h: ... here.
+	* testsuite/gcc.dg/falign-labels.c (dg-options): Don't restrict for
+	m68k and fido.
+
 2009-06-03  Martin Jambor  <mjambor@suse.cz>
 
 	PR tree-optimization/40323

gcc/config/m68k/linux.h

@@ -126,13 +126,6 @@ along with GCC; see the file COPYING3.  If not see
   if ((LOG) > 0)						\
     fprintf ((FILE), "%s%u\n", ALIGN_ASM_OP, 1 << (LOG));
 
-#ifdef HAVE_GAS_BALIGN_AND_P2ALIGN
-/* Use "move.l %a4,%a4" to advance within code.  */
-#define ASM_OUTPUT_ALIGN_WITH_NOP(FILE,LOG)			\
-  if ((LOG) > 0)						\
-    fprintf ((FILE), "\t.balignw %u,0x284c\n", 1 << (LOG));
-#endif
-
 /* If defined, a C expression whose value is a string containing the
    assembler operation to identify the following data as uninitialized global
    data.  */

gcc/config/m68k/m68k.h

@@ -955,6 +955,13 @@ do { if (cc_prev_status.flags & CC_IN_68881)			\
   if ((LOG) >= 1)			\
     fprintf (FILE, "\t.even\n");
 
+#ifdef HAVE_GAS_BALIGN_AND_P2ALIGN
+/* Use "move.l %a4,%a4" to advance within code.  */
+#define ASM_OUTPUT_ALIGN_WITH_NOP(FILE,LOG)			\
+  if ((LOG) > 0)						\
+    fprintf ((FILE), "\t.balignw %u,0x284c\n", 1 << (LOG));
+#endif
+
 #define ASM_OUTPUT_SKIP(FILE,SIZE)  \
   fprintf (FILE, "\t.skip %u\n", (int)(SIZE))
 

gcc/testsuite/gcc.dg/falign-labels-1.c

 /* { dg-do run } */
-/* { dg-options "-falign-labels=8" { target { ! { m68k*-*-* || fido*-*-* } } } } */
+/* { dg-options "-falign-labels=8" } */
 
 /* On ARMv7-A CPUs, this test resulted in incorrect code generation.
    The code generated for the switch statement expected the jump table