This is the mail archive of the binutils@sources.redhat.com 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]

Re: Recent arm patches break --enable-targets=all


On Fri, May 31, 2002 at 11:29:51AM +0930, Alan Modra wrote:
> gcc -W -Wall -Wstrict-prototypes -Wmissing-prototypes -g -O2 -o size size.o bucomm.o version.o filemode.o  ../bfd/.libs/libbfd.a ../libiberty/libiberty.a
> ../bfd/.libs/libbfd.a(elfarm-nabi.o): In function `bfd_elf32_arm_add_glue_sections_to_bfd':
> /src/binutils-current/bfd/elf32-arm.h:563: multiple definition of `bfd_elf32_arm_add_glue_sections_to_bfd'
> ../bfd/.libs/libbfd.a(elfarm-oabi.o):/src/binutils-current/bfd/elf32-arm.h:563: first defined here
> collect2: ld returned 1 exit status
> make[3]: *** [size] Error 1
> make[3]: Leaving directory `/usr/tmp/gas/all/binutils'

Fixed.

	* elfarm-oabi.c (bfd_elf32_arm_add_glue_sections_to_bfd): Define.
	Move other similar defines to start of file.

Index: bfd/elfarm-oabi.c
===================================================================
RCS file: /cvs/src/src/bfd/elfarm-oabi.c,v
retrieving revision 1.8
diff -u -p -r1.8 elfarm-oabi.c
--- bfd/elfarm-oabi.c	25 Aug 2001 09:47:35 -0000	1.8
+++ bfd/elfarm-oabi.c	31 May 2002 02:22:16 -0000
@@ -18,6 +18,14 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define OLD_ARM_ABI
+#define bfd_elf32_arm_allocate_interworking_sections \
+	bfd_elf32_arm_oabi_allocate_interworking_sections
+#define bfd_elf32_arm_get_bfd_for_interworking \
+	bfd_elf32_arm_oabi_get_bfd_for_interworking
+#define bfd_elf32_arm_process_before_allocation \
+	bfd_elf32_arm_oabi_process_before_allocation
+#define bfd_elf32_arm_add_glue_sections_to_bfd \
+	bfd_elf32_arm_oabi_add_glue_sections_to_bfd
 
 #include "elf/arm.h"
 #include "bfd.h"
@@ -416,12 +425,5 @@ elf32_arm_reloc_type_lookup (abfd, code)
 
   return NULL;
 }
-
-#define bfd_elf32_arm_allocate_interworking_sections \
-	bfd_elf32_arm_oabi_allocate_interworking_sections
-#define bfd_elf32_arm_get_bfd_for_interworking \
-	bfd_elf32_arm_oabi_get_bfd_for_interworking
-#define bfd_elf32_arm_process_before_allocation \
-	bfd_elf32_arm_oabi_process_before_allocation
 
 #include "elf32-arm.h"

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre


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