Index: arm.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/arm.h,v
retrieving revision 1.168
diff -p -r1.168 arm.h
*** arm.h	15 Nov 2002 11:21:36 -0000	1.168
--- arm.h	17 Feb 2004 13:12:12 -0000
***************
*** 1,6 ****
  /* Definitions of target machine for GNU compiler, for ARM.
     Copyright (C) 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
!    2001, 2002 Free Software Foundation, Inc.
     Contributed by Pieter `Tiggr' Schoenmakers (rcpieter@win.tue.nl)
     and Martin Simmons (@harleqn.co.uk).
     More major hacks by Richard Earnshaw (rearnsha@arm.com)
--- 1,6 ----
  /* Definitions of target machine for GNU compiler, for ARM.
     Copyright (C) 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
!    2001, 2002, 2004 Free Software Foundation, Inc.
     Contributed by Pieter `Tiggr' Schoenmakers (rcpieter@win.tue.nl)
     and Martin Simmons (@harleqn.co.uk).
     More major hacks by Richard Earnshaw (rearnsha@arm.com)
*************** typedef struct
*** 2180,2185 ****
--- 2180,2186 ----
  	goto WIN;							\
      }									\
    else if (GET_MODE_CLASS (MODE) != MODE_FLOAT				\
+ 	   && GET_MODE_SIZE (mode) == 4					\
  	   && GET_CODE (X) == SYMBOL_REF				\
  	   && CONSTANT_POOL_ADDRESS_P (X)				\
  	   && ! (flag_pic						\
Index: arm.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/arm.md,v
retrieving revision 1.113.2.3
diff -p -r1.113.2.3 arm.md
*** arm.md	15 Jun 2003 21:11:32 -0000	1.113.2.3
--- arm.md	17 Feb 2004 13:12:13 -0000
***************
*** 1,6 ****
  ;;- Machine description for ARM for GNU compiler
  ;;  Copyright 1991, 1993, 1994, 1995, 1996, 1996, 1997, 1998, 1999, 2000,
! ;;  2001, 2002  Free Software Foundation, Inc.
  ;;  Contributed by Pieter `Tiggr' Schoenmakers (rcpieter@win.tue.nl)
  ;;  and Martin Simmons (@harleqn.co.uk).
  ;;  More major hacks by Richard Earnshaw (rearnsha@arm.com).
--- 1,6 ----
  ;;- Machine description for ARM for GNU compiler
  ;;  Copyright 1991, 1993, 1994, 1995, 1996, 1996, 1997, 1998, 1999, 2000,
! ;;  2001, 2002, 2004  Free Software Foundation, Inc.
  ;;  Contributed by Pieter `Tiggr' Schoenmakers (rcpieter@win.tue.nl)
  ;;  and Martin Simmons (@harleqn.co.uk).
  ;;  More major hacks by Richard Earnshaw (rearnsha@arm.com).
***************
*** 4585,4592 ****
  )
  
  (define_insn "*thumb_movhi_insn"
!   [(set (match_operand:HI 0 "nonimmediate_operand" "=l,l, m,*r,*h,l")
! 	(match_operand:HI 1 "general_operand"       "l,mn,l,*h,*r,I"))]
    "TARGET_THUMB
     && (   register_operand (operands[0], HImode)
         || register_operand (operands[1], HImode))"
--- 4585,4592 ----
  )
  
  (define_insn "*thumb_movhi_insn"
!   [(set (match_operand:HI 0 "nonimmediate_operand" "=l,l,m,*r,*h,l")
! 	(match_operand:HI 1 "general_operand"       "l,m,l,*h,*r,I"))]
    "TARGET_THUMB
     && (   register_operand (operands[0], HImode)
         || register_operand (operands[1], HImode))"
***************
*** 4618,4625 ****
        return \"ldrh	%0, %1\";
      }"
    [(set_attr "length" "2,4,2,2,2,2")
!    (set_attr "type" "*,load,store1,*,*,*")
!    (set_attr "pool_range" "*,64,*,*,*,*")]
  )
  
  
--- 4618,4624 ----
        return \"ldrh	%0, %1\";
      }"
    [(set_attr "length" "2,4,2,2,2,2")
!    (set_attr "type" "*,load,store1,*,*,*")]
  )