diff options
Diffstat (limited to 'gcc/config/arm/arm.h')
| -rw-r--r-- | gcc/config/arm/arm.h | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index eefa198150d..6060275d6bb 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -1579,7 +1579,7 @@ typedef struct fputc ('\n', STREAM); \ ASM_GENERATE_INTERNAL_LABEL (temp, "LP", LABELNO); \ sym = gen_rtx (SYMBOL_REF, Pmode, temp); \ - ASM_OUTPUT_INT (STREAM, sym); \ + assemble_aligned_integer (UNITS_PER_WORD, sym); \ } #endif @@ -1716,14 +1716,14 @@ typedef struct .word static chain value .word function's address ??? FIXME: When the trampoline returns, r8 will be clobbered. */ -#define ARM_TRAMPOLINE_TEMPLATE(FILE) \ -{ \ - asm_fprintf (FILE, "\tldr\t%r, [%r, #0]\n", \ - STATIC_CHAIN_REGNUM, PC_REGNUM); \ - asm_fprintf (FILE, "\tldr\t%r, [%r, #0]\n", \ - PC_REGNUM, PC_REGNUM); \ - ASM_OUTPUT_INT (FILE, const0_rtx); \ - ASM_OUTPUT_INT (FILE, const0_rtx); \ +#define ARM_TRAMPOLINE_TEMPLATE(FILE) \ +{ \ + asm_fprintf (FILE, "\tldr\t%r, [%r, #0]\n", \ + STATIC_CHAIN_REGNUM, PC_REGNUM); \ + asm_fprintf (FILE, "\tldr\t%r, [%r, #0]\n", \ + PC_REGNUM, PC_REGNUM); \ + assemble_aligned_integer (UNITS_PER_WORD, const0_rtx); \ + assemble_aligned_integer (UNITS_PER_WORD, const0_rtx); \ } /* On the Thumb we always switch into ARM mode to execute the trampoline. @@ -2781,24 +2781,6 @@ extern int making_const_table; else \ THUMB_PRINT_OPERAND_ADDRESS (STREAM, X) -#define OUTPUT_INT_ADDR_CONST(STREAM, X) \ - { \ - output_addr_const (STREAM, X); \ - \ - /* Mark symbols as position independent. We only do this in the \ - .text segment, not in the .data segment. */ \ - if (NEED_GOT_RELOC && flag_pic && making_const_table && \ - (GET_CODE (X) == SYMBOL_REF || GET_CODE (X) == LABEL_REF)) \ - { \ - if (GET_CODE (X) == SYMBOL_REF && CONSTANT_POOL_ADDRESS_P (X)) \ - fprintf (STREAM, "(GOTOFF)"); \ - else if (GET_CODE (X) == LABEL_REF) \ - fprintf (STREAM, "(GOTOFF)"); \ - else \ - fprintf (STREAM, "(GOT)"); \ - } \ - } - /* Output code to add DELTA to the first argument, and then jump to FUNCTION. Used for C++ multiple inheritance. */ #define ASM_OUTPUT_MI_THUNK(FILE, THUNK_FNDECL, DELTA, FUNCTION) \ |