From 233db724fac81bccf711c461f74adf9eaaa95a9c Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sat, 20 Nov 2010 22:01:48 +0000 Subject: re PR target/31100 (ASM_OUTPUT_ALIGN_WITH_NOP wrong with GNU as) PR target/31100 * config/sparc/sparc.h (ASM_OUTPUT_ALIGN_WITH_NOP): Move to... * config/sparc/sol2.h (ASM_OUTPUT_ALIGN_WITH_NOP): ...here. * config/sparc/sol2-gas.h (ASM_OUTPUT_ALIGN_WITH_NOP): Undefine. From-SVN: r166986 --- gcc/config/sparc/sol2-gas.h | 3 +++ gcc/config/sparc/sol2.h | 7 +++++++ gcc/config/sparc/sparc.h | 7 ------- 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'gcc/config') diff --git a/gcc/config/sparc/sol2-gas.h b/gcc/config/sparc/sol2-gas.h index d61a9fe..4bc2cb4 100644 --- a/gcc/config/sparc/sol2-gas.h +++ b/gcc/config/sparc/sol2-gas.h @@ -23,6 +23,9 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ +/* Undefine this as the filler pattern doesn't work with GNU as. */ +#undef ASM_OUTPUT_ALIGN_WITH_NOP + /* Undefine this so that BNSYM/ENSYM pairs are emitted by STABS+. */ #undef NO_DBX_BNSYM_ENSYM diff --git a/gcc/config/sparc/sol2.h b/gcc/config/sparc/sol2.h index 26c9ac7..1128662 100644 --- a/gcc/config/sparc/sol2.h +++ b/gcc/config/sparc/sol2.h @@ -177,6 +177,13 @@ along with GCC; see the file COPYING3. If not see } \ while (0) +/* This is how to output an assembler line that says to advance + the location counter to a multiple of 2**LOG bytes using the + NOP instruction as padding. */ +#define ASM_OUTPUT_ALIGN_WITH_NOP(FILE,LOG) \ + if ((LOG) != 0) \ + fprintf (FILE, "\t.align %d,0x1000000\n", (1<<(LOG))) + /* Use Solaris ELF section syntax. */ #undef TARGET_ASM_NAMED_SECTION #define TARGET_ASM_NAMED_SECTION sparc_solaris_elf_asm_named_section diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h index e064899..ccf5f73 100644 --- a/gcc/config/sparc/sparc.h +++ b/gcc/config/sparc/sparc.h @@ -2013,13 +2013,6 @@ do { \ if ((LOG) != 0) \ fprintf (FILE, "\t.align %d\n", (1<<(LOG))) -/* This is how to output an assembler line that says to advance - the location counter to a multiple of 2**LOG bytes using the - "nop" instruction as padding. */ -#define ASM_OUTPUT_ALIGN_WITH_NOP(FILE,LOG) \ - if ((LOG) != 0) \ - fprintf (FILE, "\t.align %d,0x1000000\n", (1<<(LOG))) - #define ASM_OUTPUT_SKIP(FILE,SIZE) \ fprintf (FILE, "\t.skip "HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE)) -- cgit v1.1