From 687f77a15c3efa6ae9719d6a59bb300290f59467 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 24 May 1999 07:58:01 +0000 Subject: [PATCH] Fix blunder made when applying patch to arm.h From-SVN: r27121 --- gcc/ChangeLog | 5 +++++ gcc/config/arm/arm.h | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2e1f1a685f6..5f6903d8818 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Mon May 24 07:56:29 1999 Nick Clifton + + * config/arm/arm.h (OUTPUT_INT_ADDR_CONST): Fix blunder made when + applying Philip's patch. + Mon May 24 01:02:12 1999 Mark Mitchell * stmt.c (expand_end_bindings): Ignore any elements of VARS that diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index ac2dc05bbc0..6b40bc5bb86 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -2024,19 +2024,6 @@ extern struct rtx_def *arm_compare_op0, *arm_compare_op1; GET_MODE_SIZE (output_memory_reference_mode)); \ } \ else 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_PLT_GOT && 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)"); \ - } \ } /* Handles PIC addr specially */ @@ -2050,6 +2037,19 @@ extern struct rtx_def *arm_compare_op0, *arm_compare_op1; fputs (")", STREAM); \ } \ else 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_PLT_GOT && 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. -- 2.30.2