Module Name:    src
Committed By:   nakayama
Date:           Sun Mar  6 09:38:08 UTC 2016

Modified Files:
        src/external/gpl3/binutils/dist/bfd: config.bfd
        src/external/gpl3/binutils/lib/libbfd/arch/sparc: bfd.h defs.mk

Log Message:
Reapply following changes to binutils 2.26 to fix PR toolchain/48630.

http://mail-index.netbsd.org/source-changes/2014/03/10/msg052578.html
http://mail-index.netbsd.org/source-changes/2014/03/10/msg052579.html


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/binutils/dist/bfd/config.bfd
cvs rdiff -u -r1.7 -r1.8 \
    src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h
cvs rdiff -u -r1.4 -r1.5 \
    src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/dist/bfd/config.bfd
diff -u src/external/gpl3/binutils/dist/bfd/config.bfd:1.18 src/external/gpl3/binutils/dist/bfd/config.bfd:1.19
--- src/external/gpl3/binutils/dist/bfd/config.bfd:1.18	Wed Feb  3 13:24:12 2016
+++ src/external/gpl3/binutils/dist/bfd/config.bfd	Sun Mar  6 09:38:08 2016
@@ -1559,6 +1559,7 @@ case "${targ}" in
   sparc-*-netbsdelf*)
     targ_defvec=sparc_elf32_vec
     targ_selvecs=sparc_aout_nbsd_vec
+    want64=true
     ;;
   sparc-*-netbsdaout* | sparc-*-netbsd*)
     targ_defvec=sparc_aout_nbsd_vec

Index: src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h:1.7 src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h:1.8
--- src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h:1.7	Fri Jan 29 17:30:24 2016
+++ src/external/gpl3/binutils/lib/libbfd/arch/sparc/bfd.h	Sun Mar  6 09:38:08 2016
@@ -87,7 +87,7 @@ extern "C" {
 /* The word size used by BFD on the host.  This may be 64 with a 32
    bit target if the host is 64 bit, or if other 64 bit targets have
    been selected with --enable-targets, or if --enable-64-bit-bfd.  */
-#define BFD_ARCH_SIZE 32
+#define BFD_ARCH_SIZE 64
 
 /* The word size of the default bfd target.  */
 #define BFD_DEFAULT_TARGET_SIZE 32

Index: src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk
diff -u src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk:1.4 src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk:1.5
--- src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk:1.4	Fri Jan 29 17:30:24 2016
+++ src/external/gpl3/binutils/lib/libbfd/arch/sparc/defs.mk	Sun Mar  6 09:38:08 2016
@@ -2,7 +2,7 @@
 # Generated from: NetBSD: mknative-binutils,v 1.9 2013/10/01 15:41:17 skrll Exp 
 # Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp 
 #
-G_libbfd_la_DEPENDENCIES=elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo dwarf1.lo dwarf2.lo sparcnetbsd.lo aout32.lo elf32-gen.lo plugin.lo cpu-sparc.lo cpu-plugin.lo netbsd-core.lo ofiles
+G_libbfd_la_DEPENDENCIES=elf32-sparc.lo elfxx-sparc.lo elf-vxworks.lo elf32.lo elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-eh-frame.lo dwarf1.lo dwarf2.lo sparcnetbsd.lo aout32.lo elf32-gen.lo plugin.lo cpu-sparc.lo cpu-plugin.lo netbsd-core.lo archive64.lo ofiles
 G_libbfd_la_OBJECTS=archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo  cache.lo coff-bfd.lo compress.lo corefile.lo format.lo hash.lo  init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo  section.lo simple.lo stab-syms.lo stabs.lo syms.lo targets.lo  binary.lo ihex.lo srec.lo tekhex.lo verilog.lo
 G_DEFS=-DHAVE_CONFIG_H
 G_INCLUDES=-DNETBSD_CORE    -I. -I${GNUHOSTDIST}/bfd -I${GNUHOSTDIST}/bfd/../include   -DHAVE_sparc_elf32_vec -DHAVE_sparc_aout_nbsd_vec -DHAVE_elf32_le_vec -DHAVE_elf32_be_vec -DHAVE_plugin_vec -I./../intl

Reply via email to