svn commit: r278612 - stable/10/contrib/binutils/gas/config

[Ian Lepore]

Author: ian
Date: Thu Feb 12 03:16:57 2015
New Revision: 278612
URL: https://svnweb.freebsd.org/changeset/base/278612

Log:
  MFC r272519:
  
    Add movw and movt relocations to the list of relocations against function
    names that must not be adjusted.

Modified:
  stable/10/contrib/binutils/gas/config/tc-arm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/binutils/gas/config/tc-arm.c
==============================================================================
--- stable/10/contrib/binutils/gas/config/tc-arm.c	Thu Feb 12 02:08:44 2015	(r278611)
+++ stable/10/contrib/binutils/gas/config/tc-arm.c	Thu Feb 12 03:16:57 2015	(r278612)
@@ -19373,6 +19373,12 @@ arm_fix_adjustable (fixS * fixP)
       || fixP->fx_r_type == BFD_RELOC_ARM_LDR_PC_G0)
     return 0;
 
+  if (fixP->fx_r_type == BFD_RELOC_ARM_MOVW
+      || fixP->fx_r_type == BFD_RELOC_ARM_MOVT
+      || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVW
+      || fixP->fx_r_type == BFD_RELOC_ARM_THUMB_MOVT)
+    return 0;
+
   return 1;
 }
 #endif /* defined (OBJ_ELF) || defined (OBJ_COFF) */