aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim@codesourcery.com>2009-06-03 12:00:32 +0000
committerMaxim Kuvyrkov <mkuvyrkov@gcc.gnu.org>2009-06-03 12:00:32 +0000
commit889614719946a14fe16cb371337bea925680629b (patch)
tree2753fac1f794f42415f9991bf0b374df50245ab8
parent9961eb45689d012c3c4f129bb15a30d12eed8888 (diff)
downloadgcc-889614719946a14fe16cb371337bea925680629b.zip
gcc-889614719946a14fe16cb371337bea925680629b.tar.gz
gcc-889614719946a14fe16cb371337bea925680629b.tar.bz2
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
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/m68k/linux.h7
-rw-r--r--gcc/config/m68k/m68k.h7
-rw-r--r--gcc/testsuite/gcc.dg/falign-labels-1.c2
4 files changed, 15 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b8392d2..a68abcb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
index 922856c..113f278 100644
--- a/gcc/config/m68k/linux.h
+++ b/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. */
diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index 2d3b592..24598c5 100644
--- a/gcc/config/m68k/m68k.h
+++ b/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))
diff --git a/gcc/testsuite/gcc.dg/falign-labels-1.c b/gcc/testsuite/gcc.dg/falign-labels-1.c
index 1e96617..be277e4 100644
--- a/gcc/testsuite/gcc.dg/falign-labels-1.c
+++ b/gcc/testsuite/gcc.dg/falign-labels-1.c
@@ -1,5 +1,5 @@
/* { 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