This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Committed: Fix compile time warning building PE based ARM ports


Hi Guys,

  Daniel's recent patch to update the mapping symbol handling of the
  ARM port accidentally introduced a compile time warning when
  building the PE based targets, so I am going to check in the patch
  below to fix this.

Cheers
  Nick

gas/ChangeLog
2009-08-06  Nick Clifton  <nickc@redhat.com>

	* config/tc-arm.c (md_assemble): Call mapping_state from inside a
	block in case it is a null macro.

Index: gas/config/tc-arm.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-arm.c,v
retrieving revision 1.399
diff -c -3 -p -r1.399 tc-arm.c
*** gas/config/tc-arm.c	4 Aug 2009 14:56:10 -0000	1.399
--- gas/config/tc-arm.c	6 Aug 2009 09:59:20 -0000
*************** md_assemble (char *str)
*** 15520,15526 ****
  				arm_ext_v6t2);
  
        if (!inst.error)
! 	mapping_state (MAP_THUMB);
      }
    else if (ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_v1))
      {
--- 15520,15528 ----
  				arm_ext_v6t2);
  
        if (!inst.error)
! 	{
! 	  mapping_state (MAP_THUMB);
! 	}
      }
    else if (ARM_CPU_HAS_FEATURE (cpu_variant, arm_ext_v1))
      {
*************** md_assemble (char *str)
*** 15563,15569 ****
  	ARM_MERGE_FEATURE_SETS (arm_arch_used, arm_arch_used,
  				*opcode->avariant);
        if (!inst.error)
! 	mapping_state (MAP_ARM);
      }
    else
      {
--- 15565,15573 ----
  	ARM_MERGE_FEATURE_SETS (arm_arch_used, arm_arch_used,
  				*opcode->avariant);
        if (!inst.error)
! 	{
! 	  mapping_state (MAP_ARM);
! 	}
      }
    else
      {


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]