Re: Duplicate symbols in recent cvs source

[Nick Clifton <nickc@cygnus.com>]

Hi Dave,

: /bin/ld: Duplicate symbol "bfd_arm_get_bfd_for_interworking", files
: coff-arm.lo and pe-arm.lo

The following patch will fix this.  I will apply it to the sources
shortly.

Cheers
	Nick

1999-06-02  Nick Clifton  <nickc@cygnus.com>

	* pe-arm.c: Rename global arm interworking functions to avoid name
	collision when all targets BFD is built.
	* pei-arm.c: Ditto.

1999-06-02  Nick Clifton  <nickc@cygnus.com>

	* emultempl/pe.em: Rename global arm interworking functions to
	avoid name collision when all targets BFD is built.

Index: bfd/pe-arm.c
===================================================================
RCS file: /cvs/binutils/binutils/bfd/pe-arm.c,v
retrieving revision 1.1.1.1
diff -p -r1.1.1.1 pe-arm.c
*** pe-arm.c	1999/05/03 07:28:58	1.1.1.1
--- pe-arm.c	1999/06/02 21:17:36
*************** Foundation, Inc., 59 Temple Place - Suit
*** 31,34 ****
--- 31,41 ----
  #define PCRELOFFSET          true
  #define COFF_LONG_SECTION_NAMES
  
+ #define bfd_arm_allocate_interworking_sections \
+ 	bfd_arm_pe_allocate_interworking_sections
+ #define bfd_arm_get_bfd_for_interworking \
+ 	bfd_arm_pe_get_bfd_for_interworking
+ #define bfd_arm_process_before_allocation \
+ 	bfd_arm_pe_process_before_allocation
+ 
  #include "coff-arm.c"

Index: bfd/pei-arm.c
===================================================================
RCS file: /cvs/binutils/binutils/bfd/pei-arm.c,v
retrieving revision 1.1.1.1
diff -p -r1.1.1.1 pei-arm.c
*** pei-arm.c	1999/05/03 07:28:58	1.1.1.1
--- pei-arm.c	1999/06/02 21:17:43
*************** Foundation, Inc., 59 Temple Place - Suit
*** 33,36 ****
--- 33,43 ----
  #define PCRELOFFSET        true
  #define COFF_LONG_SECTION_NAMES
  
+ #define bfd_arm_allocate_interworking_sections \
+ 	bfd_arm_pe_allocate_interworking_sections
+ #define bfd_arm_get_bfd_for_interworking \
+ 	bfd_arm_pe_get_bfd_for_interworking
+ #define bfd_arm_process_before_allocation \
+ 	bfd_arm_pe_process_before_allocation
+ 
  #include "coff-arm.c"

Index: ld/emultempl/pe.em
===================================================================
RCS file: /cvs/binutils/binutils/ld/emultempl/pe.em,v
retrieving revision 1.3
diff -p -r1.3 pe.em
*** pe.em	1999/05/11 21:06:49	1.3
--- pe.em	1999/06/02 21:17:48
*************** gld_${EMULATION_NAME}_after_open ()
*** 639,645 ****
      /* Find a BFD that can hold the interworking stubs.  */
      LANG_FOR_EACH_INPUT_STATEMENT (is)
        {
! 	if (bfd_arm_get_bfd_for_interworking (is->the_bfd, & link_info))
  	  break;
        }
    }
--- 639,645 ----
      /* Find a BFD that can hold the interworking stubs.  */
      LANG_FOR_EACH_INPUT_STATEMENT (is)
        {
! 	if (bfd_arm_pe_get_bfd_for_interworking (is->the_bfd, & link_info))
  	  break;
        }
    }
*************** gld_${EMULATION_NAME}_before_allocation(
*** 740,746 ****
    {
      LANG_FOR_EACH_INPUT_STATEMENT (is)
        {
! 	if (! bfd_arm_process_before_allocation
  	    (is->the_bfd, & link_info, support_old_code))
  	  {
  	    /* xgettext:c-format */
--- 740,746 ----
    {
      LANG_FOR_EACH_INPUT_STATEMENT (is)
        {
! 	if (! bfd_arm_pe_process_before_allocation
  	    (is->the_bfd, & link_info, support_old_code))
  	  {
  	    /* xgettext:c-format */
*************** gld_${EMULATION_NAME}_before_allocation(
*** 751,757 ****
    }
  
    /* We have seen it all. Allocate it, and carry on */
!   bfd_arm_allocate_interworking_sections (& link_info);
  #endif /* TARGET_IS_armpe */
  }
  \f
--- 751,757 ----
    }
  
    /* We have seen it all. Allocate it, and carry on */
!   bfd_arm_pe_allocate_interworking_sections (& link_info);
  #endif /* TARGET_IS_armpe */
  }
  \f