aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@cygnus.com>1999-05-24 07:58:01 +0000
committerNick Clifton <nickc@cygnus.com>1999-05-24 07:58:01 +0000
commita6e298d7cad23691cebec8bd7beb312f5a6dcb11 (patch)
treea599e4c09acec0e52eec22d712af6c74e0a0ec31
parent86cba7e9f94bf6771cf65f73b3ae880acd7a9f58 (diff)
Fix blunder made when applying patch to arm.h
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@27121 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/arm/arm.h26
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 <nickc@cygnus.com>
+
+ * 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 <mark@codesourcery.com>
* 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.