2003-09-28 Philip Blundell <philb@gnu.org>

	* config/arm/arm.c (legitimize_pic_address): Check
	SYMBOL_REF_LOCAL_P, not ENCODED_SHORT_CALL_ATTR_P.
	(arm_assemble_integer): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71881 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 064679b..5ca1fa6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-28  Philip Blundell  <philb@gnu.org>
+
+       * config/arm/arm.c (legitimize_pic_address): Check
+       SYMBOL_REF_LOCAL_P, not ENCODED_SHORT_CALL_ATTR_P.
+       (arm_assemble_integer): Likewise.
+
 2003-09-28  Steven Bosscher  <steven@gcc.gnu.org>
 
        * config/pdp11/pdp11-protos.h, config/pdp11/pdp11.c,

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 0ae19fc..a810791 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -2497,7 +2497,7 @@ legitimize_pic_address (rtx orig, enum machine_mode mode, rtx reg)
 
       if ((GET_CODE (orig) == LABEL_REF
           || (GET_CODE (orig) == SYMBOL_REF && 
-              ENCODED_SHORT_CALL_ATTR_P (XSTR (orig, 0))))
+              SYMBOL_REF_LOCAL_P (orig)))
          && NEED_GOT_RELOC)
        pic_ref = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, address);
       else
@@ -9677,7 +9677,7 @@ arm_assemble_integer (rtx x, unsigned int size, int aligned_p)
        {
          if (GET_CODE (x) == SYMBOL_REF
              && (CONSTANT_POOL_ADDRESS_P (x)
-                 || ENCODED_SHORT_CALL_ATTR_P (XSTR (x, 0))))
+                 || SYMBOL_REF_LOCAL_P (x)))
            fputs ("(GOTOFF)", asm_out_file);
          else if (GET_CODE (x) == LABEL_REF)
            fputs ("(GOTOFF)", asm_out_file);