Update to 2.26

Changelog:
Changes in 2.26:

* Add option to objcopy to insert new symbols into a file:
  --add-symbol <name>=[<section>:]<value>[,<flags>]

* Add support for the ARC EM/HS, and ARC600/700 architectures.

* Extend objcopy --compress-debug-sections option to support
  --compress-debug-sections=[none|zlib|zlib-gnu|zlib-gabi] for ELF
  targets.

* Add --update-section option to objcopy.

* Add --output-separator option to strings.

12 files changed, 96 insertions, 102 deletions

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index f33e7d61f26..1b9b1d3628d 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2015/09/25 17:05:33 tnn Exp $
+# $NetBSD: Makefile,v 1.71 2016/01/30 22:15:11 ryoon Exp $
 
-DISTNAME=	binutils-2.25.1
+DISTNAME=	binutils-2.26
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=binutils/}
 
diff --git a/devel/binutils/PLIST.common b/devel/binutils/PLIST.common
index 6d1daecee63..5b19d26ced1 100644
--- a/devel/binutils/PLIST.common
+++ b/devel/binutils/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.25 2015/06/17 14:02:40 sborrill Exp $
+@comment $NetBSD: PLIST.common,v 1.26 2016/01/30 22:15:11 ryoon Exp $
 ${MACHINE_GNU_PLATFORM}/bin/ar
 ${MACHINE_GNU_PLATFORM}/bin/as
 ${MACHINE_GNU_PLATFORM}/bin/ld
@@ -8,6 +8,7 @@ ${MACHINE_GNU_PLATFORM}/bin/nm
 ${MACHINE_GNU_PLATFORM}/bin/objcopy
 ${MACHINE_GNU_PLATFORM}/bin/objdump
 ${MACHINE_GNU_PLATFORM}/bin/ranlib
+${MACHINE_GNU_PLATFORM}/bin/readelf
 ${MACHINE_GNU_PLATFORM}/bin/strip
 ${PLIST.gold}bin/gdwp
 bin/gaddr2line
@@ -100,6 +101,7 @@ man/man1/gwindres.1
 share/locale/bg/LC_MESSAGES/binutils.mo
 ${PLIST.gprof}share/locale/bg/LC_MESSAGES/gprof.mo
 share/locale/bg/LC_MESSAGES/ld.mo
+share/locale/ca/LC_MESSAGES/binutils.mo
 share/locale/da/LC_MESSAGES/bfd.mo
 share/locale/da/LC_MESSAGES/binutils.mo
 ${PLIST.gprof}share/locale/da/LC_MESSAGES/gprof.mo
@@ -125,6 +127,7 @@ share/locale/fi/LC_MESSAGES/opcodes.mo
 share/locale/fr/LC_MESSAGES/bfd.mo
 share/locale/fr/LC_MESSAGES/binutils.mo
 share/locale/fr/LC_MESSAGES/gas.mo
+share/locale/fr/LC_MESSAGES/gold.mo
 ${PLIST.gprof}share/locale/fr/LC_MESSAGES/gprof.mo
 share/locale/fr/LC_MESSAGES/ld.mo
 share/locale/fr/LC_MESSAGES/opcodes.mo
@@ -194,6 +197,8 @@ share/locale/vi/LC_MESSAGES/ld.mo
 share/locale/vi/LC_MESSAGES/opcodes.mo
 share/locale/zh_CN/LC_MESSAGES/bfd.mo
 share/locale/zh_CN/LC_MESSAGES/binutils.mo
+share/locale/zh_CN/LC_MESSAGES/gas.mo
+share/locale/zh_CN/LC_MESSAGES/gold.mo
 share/locale/zh_CN/LC_MESSAGES/ld.mo
 share/locale/zh_CN/LC_MESSAGES/opcodes.mo
 ${PLIST.gprof}share/locale/vi/LC_MESSAGES/gprof.mo
diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index d4c2b934c8a..c9c79cbb254 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,21 +1,23 @@
-$NetBSD: distinfo,v 1.27 2015/11/03 03:27:16 agc Exp $
+$NetBSD: distinfo,v 1.28 2016/01/30 22:15:11 ryoon Exp $
 
-SHA1 (binutils-2.25.1.tar.bz2) = 1d597ae063e3947a5f61e23ceda8aebf78405fcd
-RMD160 (binutils-2.25.1.tar.bz2) = 5756c6163a11964347e32d1b2805e97e74ff5e3f
-SHA512 (binutils-2.25.1.tar.bz2) = 0b36dda0e6d32cd25613c0e64b56b28312515c54d6a159efd3db9a86717f114ab0a0a1f69d08975084d55713ebaeab64e4085c9b3d1c3fa86712869f80eb954d
-Size (binutils-2.25.1.tar.bz2) = 24163561 bytes
-SHA1 (patch-aa) = 1a127f82c807cbd1ac6fee073c618f3fb48667f6
-SHA1 (patch-bfd_cache.c) = db48182cee9f0bf16fbefca260b542171f0ef596
-SHA1 (patch-bfd_config.bfd) = 4383d7dc10996e0f14f4ad0e80ac9c56f01df5ea
+SHA1 (binutils-2.26.tar.bz2) = a637508cffeb2323b14bc8dd65378819768ad4ff
+RMD160 (binutils-2.26.tar.bz2) = ce0400ffcc1200280854fefb29f97b63507bad14
+SHA512 (binutils-2.26.tar.bz2) = e77e1b8dbbcbaf9ac2fae95c4403615808af3be03b2e1d32448cd3a7d32c43273f8bcace3f2de84ec120a982879295673029da306e2885dbf5f990584932cfc7
+Size (binutils-2.26.tar.bz2) = 25543552 bytes
+SHA1 (patch-aa) = e748bbffa21146cf5c0c50c912f1d84c411fd55c
+SHA1 (patch-bfd_cache.c) = 20988e84ff2a1d7ff83b5adb04e4f117953205b8
+SHA1 (patch-bfd_config.bfd) = 2ca06a7755dffd88344df72206917befff12ae91
 SHA1 (patch-bfd_configure) = 3beac7243447be24c28ec5f6451e43c05d460787
 SHA1 (patch-bfd_configure.ac) = cfff26cead0f2727503eac7d3338150837e88a0b
-SHA1 (patch-configure.ac) = 7bd7b90e57d850705286f2cc6464ecc45e0657c0
-SHA1 (patch-gas_configure) = 3a60263fa7343dc856eacfbd7a477a000971e321
+SHA1 (patch-bfd_elf32-arm.c) = 8d90dd77cb4925db71def94d2d32cbe3e1cfb69e
+SHA1 (patch-configure.ac) = 1524f06882f41012ef2bbf960739a4f1f03659c4
+SHA1 (patch-gas_configure) = 26931a79b0fd70790577343784b9c87bf6f7d539
 SHA1 (patch-gas_configure.tgt) = 15089d02437af6d3130d33367d93414b0d96a7ff
 SHA1 (patch-gold_Makefile.in) = ca87f7589025752713127110cbf9738f1080b62a
 SHA1 (patch-gold_options.h) = 3a1f9f59a1ce105f8f8d5a09fe60e0fe673b61a9
-SHA1 (patch-gold_resolve.cc) = 7e6c45cafddc73a4195c4bdacc43102a0fde3c13
+SHA1 (patch-gold_resolve.cc) = d93ce96cf97289f8947707f4ff3f5a837d8cb4de
 SHA1 (patch-gold_system.h) = 68655247b884cd520daf6a98cbc3f365396049bd
 SHA1 (patch-include_safe-ctype.h) = 480c46b1528f623435e9b52b7ba8247745e4e254
-SHA1 (patch-ld_configure.tgt) = 7b6c20bf268edee913ed4e421e62ac33409ec403
+SHA1 (patch-ld_configure) = 2c6fdb4dc7af4ee58100910029be70fd9e5c90e0
+SHA1 (patch-ld_configure.tgt) = 06ac3cbb3c397123a6a4a3fdb19828f074282c60
 SHA1 (patch-libiberty_Makefile.in) = fd07f4fafe6c25e9ab65c65ec3807c89bfd9f0b5
diff --git a/devel/binutils/patches/patch-aa b/devel/binutils/patches/patch-aa
index abece8c31a7..89a96c18878 100644
--- a/devel/binutils/patches/patch-aa
+++ b/devel/binutils/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.5 2012/07/23 12:24:34 jperkin Exp $
+$NetBSD: patch-aa,v 1.6 2016/01/30 22:15:11 ryoon Exp $
 
 Remove etc
 
---- configure.orig	2011-08-14 21:28:15.000000000 +0900
-+++ configure	2012-02-13 10:34:04.000000000 +0900
-@@ -2667,7 +2667,7 @@
+--- configure.orig	2015-11-13 08:27:41.000000000 +0000
++++ configure
+@@ -2733,7 +2733,7 @@ host_libs="intl libiberty opcodes bfd re
  # binutils, gas and ld appear in that order because it makes sense to run
  # "make check" in that particular order.
  # If --enable-gold is used, "gold" may replace "ld".
--host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
-+host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof expect dejagnu m4 utils guile fastjar gnattools"
+-host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
++host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
  
  # libgcj represents the runtime libraries only used by gcj.
  libgcj="target-libffi \
diff --git a/devel/binutils/patches/patch-bfd_cache.c b/devel/binutils/patches/patch-bfd_cache.c
index 9638027ef1f..6beeb147d6d 100644
--- a/devel/binutils/patches/patch-bfd_cache.c
+++ b/devel/binutils/patches/patch-bfd_cache.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-bfd_cache.c,v 1.3 2015/06/09 20:24:39 ryoon Exp $
+$NetBSD: patch-bfd_cache.c,v 1.4 2016/01/30 22:15:11 ryoon Exp $
 
 Fix sign-compare on SunOS.
 Handle 256 file descriptor limit in 32-bit SunOS environment.
 
---- bfd/cache.c.orig	2014-10-14 07:32:02.000000000 +0000
+--- bfd/cache.c.orig	2016-01-25 08:51:06.000000000 +0000
 +++ bfd/cache.c
 @@ -50,6 +50,10 @@ SUBSECTION
  #include <sys/mman.h>
@@ -16,13 +16,3 @@ Handle 256 file descriptor limit in 32-bit SunOS environment.
  /* In some cases we can optimize cache operation when reopening files.
     For instance, a flush is entirely unnecessary if the file is already
     closed, so a flush would use CACHE_NO_OPEN.  Similarly, a seek using
-@@ -90,6 +94,9 @@ bfd_cache_max_open (void)
- #else
- 	max = 10;
- #endif /* _SC_OPEN_MAX */
-+#if defined(__sun) && !defined(_LP64)
-+      max = max > (OPEN_MAX / 8) ? (OPEN_MAX / 8) : max;
-+#endif
-       max_open_files = max < 10 ? 10 : max;
-     }
- 
diff --git a/devel/binutils/patches/patch-bfd_config.bfd b/devel/binutils/patches/patch-bfd_config.bfd
index 9b24276e0c9..ae7b6635f32 100644
--- a/devel/binutils/patches/patch-bfd_config.bfd
+++ b/devel/binutils/patches/patch-bfd_config.bfd
@@ -1,25 +1,25 @@
-$NetBSD: patch-bfd_config.bfd,v 1.1 2015/09/03 20:55:55 sevan Exp $
+$NetBSD: patch-bfd_config.bfd,v 1.2 2016/01/30 22:15:11 ryoon Exp $
 
 Add Bitrig/amd64 support
 https://sourceware.org/bugzilla/show_bug.cgi?id=18920
 
---- bfd/config.bfd.orig	Thu Sep  3 16:46:04 2015
+--- bfd/config.bfd.orig	2015-11-13 08:27:40.000000000 +0000
 +++ bfd/config.bfd
-@@ -615,7 +620,7 @@ case "${targ}" in
-     targ_selvecs="i386_elf32_vec i386_aout_bsd_vec"
+@@ -635,7 +635,7 @@ case "${targ}" in
+     targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_aout_bsd_vec"
      targ_underscore=yes
      ;;
 -  i[3-7]86-*-openbsd*)
 +  i[3-7]86-*-openbsd* | i[3-7]86-*-bitrig*)
      targ_defvec=i386_elf32_vec
-     targ_selvecs=i386_aout_nbsd_vec
+     targ_selvecs="iamcu_elf32_vec i386_aout_nbsd_vec"
      ;;
-@@ -666,7 +671,7 @@ case "${targ}" in
-     targ_selvecs="i386_elf32_fbsd_vec i386_coff_vec i386_pei_vec x86_64_pei_vec i386_elf32_vec x86_64_elf64_vec l1om_elf64_vec l1om_elf64_fbsd_vec k1om_elf64_vec k1om_elf64_fbsd_vec"
+@@ -690,7 +690,7 @@ case "${targ}" in
+     targ_selvecs="i386_elf32_fbsd_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pei_vec i386_elf32_vec x86_64_elf64_vec l1om_elf64_vec l1om_elf64_fbsd_vec k1om_elf64_vec k1om_elf64_fbsd_vec"
      want64=true
      ;;
 -  x86_64-*-netbsd* | x86_64-*-openbsd*)
 +  x86_64-*-netbsd* | x86_64-*-openbsd* | x86_64-*-bitrig*)
      targ_defvec=x86_64_elf64_vec
-     targ_selvecs="i386_elf32_vec i386_aout_nbsd_vec i386_coff_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
+     targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_aout_nbsd_vec i386_coff_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
      want64=true
diff --git a/devel/binutils/patches/patch-bfd_elf32-arm.c b/devel/binutils/patches/patch-bfd_elf32-arm.c
new file mode 100644
index 00000000000..05a6f73bc5b
--- /dev/null
+++ b/devel/binutils/patches/patch-bfd_elf32-arm.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-bfd_elf32-arm.c,v 1.1 2016/01/30 22:15:11 ryoon Exp $
+
+Resolve popcount(3) conflict on NetBSD
+
+--- bfd/elf32-arm.c.orig	2016-01-25 08:51:06.000000000 +0000
++++ bfd/elf32-arm.c
+@@ -3133,6 +3133,7 @@ ctz (unsigned int mask)
+ #endif
+ }
+ 
++#if !defined(__NetBSD__)
+ static inline int
+ popcount (unsigned int mask)
+ {
+@@ -3150,6 +3151,7 @@ popcount (unsigned int mask)
+   return sum;
+ #endif
+ }
++#endif
+ 
+ /* Create an entry in an ARM ELF linker hash table.  */
+ 
diff --git a/devel/binutils/patches/patch-configure.ac b/devel/binutils/patches/patch-configure.ac
index a2725dc076b..1b3bb040457 100644
--- a/devel/binutils/patches/patch-configure.ac
+++ b/devel/binutils/patches/patch-configure.ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure.ac,v 1.1 2012/07/23 12:24:34 jperkin Exp $
+$NetBSD: patch-configure.ac,v 1.2 2016/01/30 22:15:11 ryoon Exp $
 
 Remove etc
 
---- configure.ac.orig	2011-11-21 20:58:27.000000000 +0900
-+++ configure.ac	2012-02-13 10:34:17.000000000 +0900
-@@ -140,7 +140,7 @@
+--- configure.ac.orig	2016-01-25 08:57:16.000000000 +0000
++++ configure.ac
+@@ -140,7 +140,7 @@ host_libs="intl libiberty opcodes bfd re
  # binutils, gas and ld appear in that order because it makes sense to run
  # "make check" in that particular order.
  # If --enable-gold is used, "gold" may replace "ld".
--host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools"
-+host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof expect dejagnu m4 utils guile fastjar gnattools"
+-host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
++host_tools="flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
  
  # libgcj represents the runtime libraries only used by gcj.
  libgcj="target-libffi \
diff --git a/devel/binutils/patches/patch-gas_configure b/devel/binutils/patches/patch-gas_configure
index 037a9492b41..cc9af2b9c7e 100644
--- a/devel/binutils/patches/patch-gas_configure
+++ b/devel/binutils/patches/patch-gas_configure
@@ -1,51 +1,13 @@
-$NetBSD: patch-gas_configure,v 1.2 2015/09/28 16:37:55 ryoon Exp $
+$NetBSD: patch-gas_configure,v 1.3 2016/01/30 22:15:11 ryoon Exp $
 
-https://sourceware.org/bugzilla/show_bug.cgi?id=18994
-
---- gas/configure.orig	2014-12-23 14:22:05.000000000 +0000
+--- gas/configure.orig	2016-01-25 08:54:08.000000000 +0000
 +++ gas/configure
-@@ -12331,7 +12331,7 @@ $as_echo "$with_arch" >&6; }
-         # Decide features one by one.
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-dx-regs" >&5
- $as_echo_n "checking for default configuration of --enable-dx-regs... " >&6; }
--	if test "x${enable_dx_regs}" == xyes; then
-+	if test "x${enable_dx_regs}" = xyes; then
- 
- $as_echo "#define NDS32_DEFAULT_DX_REGS 1" >>confdefs.h
- 
-@@ -12345,7 +12345,7 @@ $as_echo "$enable_dx_regs" >&6; }
- 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-perf-ext" >&5
- $as_echo_n "checking for default configuration of --enable-perf-ext... " >&6; }
--	if test "x${enable_perf_ext}" == xno; then
-+	if test "x${enable_perf_ext}" = xno; then
- 
- $as_echo "#define NDS32_DEFAULT_PERF_EXT 0" >>confdefs.h
- 
-@@ -12359,7 +12359,7 @@ $as_echo "$enable_perf_ext" >&6; }
- 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-perf-ext2" >&5
- $as_echo_n "checking for default configuration of --enable-perf-ext2... " >&6; }
--	if test "x${enable_perf_ext2}" == xno; then
-+	if test "x${enable_perf_ext2}" = xno; then
- 
- $as_echo "#define NDS32_DEFAULT_PERF_EXT2 0" >>confdefs.h
- 
-@@ -12373,7 +12373,7 @@ $as_echo "$enable_perf_ext2" >&6; }
- 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-string-ext" >&5
- $as_echo_n "checking for default configuration of --enable-string-ext... " >&6; }
--	if test "x${enable_string_ext}" == xno; then
-+	if test "x${enable_string_ext}" = xno; then
- 
- $as_echo "#define NDS32_DEFAULT_STRING_EXT 0" >>confdefs.h
+@@ -12505,7 +12505,7 @@ _ACEOF
  
-@@ -12387,7 +12387,7 @@ $as_echo "$enable_string_ext" >&6; }
+ done
  
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-audio-ext" >&5
- $as_echo_n "checking for default configuration of --enable-audio-ext... " >&6; }
--	if test "x${enable_audio_ext}" == xno; then
-+	if test "x${enable_audio_ext}" = xno; then
+-if test x$ac_default_compressed_debug_sections == xyes ; then
++if test x$ac_default_compressed_debug_sections = xyes ; then
  
- $as_echo "#define NDS32_DEFAULT_AUDIO_EXT 0" >>confdefs.h
+ $as_echo "#define DEFAULT_FLAG_COMPRESS_DEBUG 1" >>confdefs.h
  
diff --git a/devel/binutils/patches/patch-gold_resolve.cc b/devel/binutils/patches/patch-gold_resolve.cc
index 6b160f8b208..ab1044ece3a 100644
--- a/devel/binutils/patches/patch-gold_resolve.cc
+++ b/devel/binutils/patches/patch-gold_resolve.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-gold_resolve.cc,v 1.1 2014/05/12 19:10:08 marino Exp $
+$NetBSD: patch-gold_resolve.cc,v 1.2 2016/01/30 22:15:11 ryoon Exp $
 
  The gold linker is overly pedantic for dynamic references to symbols
  with hidden visibility.  It will spew error messages about weak symbols
@@ -8,9 +8,9 @@ $NetBSD: patch-gold_resolve.cc,v 1.1 2014/05/12 19:10:08 marino Exp $
 
  https://sourceware.org/bugzilla/show_bug.cgi?id=15574
 
---- gold/resolve.cc.orig	2013-11-04 15:33:39.000000000 +0000
+--- gold/resolve.cc.orig	2015-11-13 08:27:42.000000000 +0000
 +++ gold/resolve.cc
-@@ -276,8 +276,7 @@ Symbol_table::resolve(Sized_symbol<size>
+@@ -284,8 +284,7 @@ Symbol_table::resolve(Sized_symbol<size>
        to->set_in_reg();
      }
    else if (st_shndx == elfcpp::SHN_UNDEF
@@ -18,5 +18,5 @@ $NetBSD: patch-gold_resolve.cc,v 1.1 2014/05/12 19:10:08 marino Exp $
 -               || to->visibility() == elfcpp::STV_INTERNAL))
 +           && (to->visibility() == elfcpp::STV_INTERNAL))
      {
-       // A dynamic object cannot reference a hidden or internal symbol
-       // defined in another object.
+       // The symbol is hidden, so a reference from a shared object
+       // cannot bind to it.  We tried issuing a warning in this case,
diff --git a/devel/binutils/patches/patch-ld_configure b/devel/binutils/patches/patch-ld_configure
new file mode 100644
index 00000000000..04b09000a72
--- /dev/null
+++ b/devel/binutils/patches/patch-ld_configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-ld_configure,v 1.1 2016/01/30 22:15:11 ryoon Exp $
+
+--- ld/configure.orig	2016-01-25 08:54:11.000000000 +0000
++++ ld/configure
+@@ -17134,7 +17134,7 @@ do
+   fi
+ done
+ 
+-if test x$ac_default_compressed_debug_sections == xyes ; then
++if test x$ac_default_compressed_debug_sections = xyes ; then
+ 
+ $as_echo "#define DEFAULT_FLAG_COMPRESS_DEBUG 1" >>confdefs.h
+ 
diff --git a/devel/binutils/patches/patch-ld_configure.tgt b/devel/binutils/patches/patch-ld_configure.tgt
index 2823624e04b..3c11be8ac48 100644
--- a/devel/binutils/patches/patch-ld_configure.tgt
+++ b/devel/binutils/patches/patch-ld_configure.tgt
@@ -1,11 +1,11 @@
-$NetBSD: patch-ld_configure.tgt,v 1.3 2015/09/03 20:55:55 sevan Exp $
+$NetBSD: patch-ld_configure.tgt,v 1.4 2016/01/30 22:15:11 ryoon Exp $
 
 Add Bitrig/amd64 support
 https://sourceware.org/bugzilla/show_bug.cgi?id=18920
 
---- ld/configure.tgt.orig	Thu Sep  3 17:11:33 2015
+--- ld/configure.tgt.orig	2015-11-13 08:27:42.000000000 +0000
 +++ ld/configure.tgt
-@@ -282,6 +283,11 @@ x86_64-*-netbsd*)	targ_emul=elf_x86_64
+@@ -309,6 +309,11 @@ x86_64-*-netbsd*)	targ_emul=elf_x86_64
  			*)		tdir_elf_i386=`echo ${tdir_elf_i386} | \
  				        sed -e 's/netbsd/netbsdelf/'`;;
  			esac ;;
@@ -15,5 +15,5 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=18920
 +			targ_extra_emuls="elf_i386 i386nbsd elf_l1om elf_k1om"
 +			;;
  i[3-7]86-*-netware)	targ_emul=i386nw ;;
- i[3-7]86-*-elf*)	targ_emul=elf_i386 ;;
- x86_64-*-elf*)		targ_emul=elf_x86_64
+ i[3-7]86-*-elfiamcu)	targ_emul=elf_iamcu
+ 			targ_extra_emuls=elf_i386 ;;