Merge pull request #630 from stilor/upgrades

Final batch of updates before 1.23

12 files changed, 723 insertions, 247 deletions

diff --git a/patches/binutils/2.28/120-sh-conf.patch b/patches/binutils/2.28/120-sh-conf.patch
new file mode 100644
index 0000000..c12a023
--- /dev/null
+++ b/patches/binutils/2.28/120-sh-conf.patch
@@ -0,0 +1,33 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we 
+fix that up too.. now we're able to actually build a real toolchain for 
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
+inept targets than that one, really. Go look, I promise).
+
+diff --git a/configure b/configure
+index 87677bc..2d916f1 100755
+--- a/configure
++++ b/configure
+@@ -3812,7 +3812,7 @@ case "${target}" in
+   or1k*-*-*)
+     noconfigdirs="$noconfigdirs gdb"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+diff --git a/configure.ac b/configure.ac
+index 8fe0eca..b10a99f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1140,7 +1140,7 @@ case "${target}" in
+   or1k*-*-*)
+     noconfigdirs="$noconfigdirs gdb"
+     ;;
+-  sh-*-* | sh64-*-*)
++  sh*-*-* | sh64-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
diff --git a/patches/binutils/2.28/300-001_ld_makefile_patch.patch b/patches/binutils/2.28/300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000..2a1320c
--- /dev/null
+++ b/patches/binutils/2.28/300-001_ld_makefile_patch.patch
@@ -0,0 +1,26 @@
+diff --git a/ld/Makefile.am b/ld/Makefile.am
+index 9575f1f..84df0bf 100644
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -54,7 +54,7 @@ endif
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff --git a/ld/Makefile.in b/ld/Makefile.in
+index 9f56ca1..272860f 100644
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/patches/binutils/2.28/300-012_check_ldrunpath_length.patch b/patches/binutils/2.28/300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000..f1f31af
--- /dev/null
+++ b/patches/binutils/2.28/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,22 @@
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index 137446f..bb8391a 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1195,6 +1195,8 @@ fragment <<EOF
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++	      	lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (*rpath == '\0'))
++  	rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/patches/binutils/2.28/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/patches/binutils/2.28/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
new file mode 100644
index 0000000..2956385
--- /dev/null
+++ b/patches/binutils/2.28/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -0,0 +1,11 @@
+--- binutils-2.27/gold/gold-threads.cc.orig	2016-12-26 16:44:23.691075600 +1100
++++ binutils-2.27/gold/gold-threads.cc	2016-12-26 16:46:21.071855200 +1100
+@@ -101,7 +101,7 @@
+   int err = pthread_mutexattr_init(&attr);
+   if (err != 0)
+     gold_fatal(_("pthead_mutexattr_init failed: %s"), strerror(err));
+-#ifdef PTHREAD_MUTEX_ADAPTIVE_NP
++#if defined(PTHREAD_MUTEX_ADAPTIVE_NP) && !defined(_WIN32)
+   err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
+   if (err != 0)
+     gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
diff --git a/patches/binutils/2.28/330-Dont-link-to-libfl-as-its-unnecessary.patch b/patches/binutils/2.28/330-Dont-link-to-libfl-as-its-unnecessary.patch
new file mode 100644
index 0000000..c52af05
--- /dev/null
+++ b/patches/binutils/2.28/330-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -0,0 +1,108 @@
+diff --git a/binutils/configure b/binutils/configure
+index 6e1f21e..78bf4ae 100755
+--- a/binutils/configure
++++ b/binutils/configure
+@@ -12106,6 +12106,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -12267,6 +12268,8 @@
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
+ # If we haven't got the data from the intl directory,
+diff --git a/binutils/configure.ac b/binutils/configure.ac
+index defe781..8fd236a 100644
+--- a/binutils/configure.ac
++++ b/binutils/configure.ac
+@@ -87,7 +87,10 @@
+ fi
+ 
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
+ ZW_GNU_GETTEXT_SISTER_DIR
+diff --git a/gas/configure b/gas/configure
+index f959e95..9bb4043 100755
+--- a/gas/configure
++++ b/gas/configure
+@@ -12819,6 +12819,7 @@ fi
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -12980,6 +12981,8 @@ esac
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
+ # If we haven't got the data from the intl directory,
+diff --git a/gas/configure.ac b/gas/configure.ac
+index 07f825d..c552b7e 100644
+--- a/gas/configure.ac
++++ b/gas/configure.ac
+@@ -734,7 +734,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${target_vendor}", [Target vendor.])
+ AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
+ 
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN"
+ ZW_GNU_GETTEXT_SISTER_DIR
+diff --git a/ld/configure b/ld/configure
+index a446283..1a6bf81 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -16087,6 +16087,7 @@ fi
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -16248,6 +16249,8 @@ esac
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+diff --git a/ld/configure.ac b/ld/configure.ac
+index 188172d..45eec53 100644
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -186,7 +186,10 @@ AM_PO_SUBDIRS
+ AC_EXEEXT
+ 
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ AM_MAINTAINER_MODE
+ AM_CONDITIONAL(GENINSRC_NEVER, false)
diff --git a/patches/binutils/2.28/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/patches/binutils/2.28/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
new file mode 100644
index 0000000..e4f235b
--- /dev/null
+++ b/patches/binutils/2.28/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
@@ -0,0 +1,13 @@
+diff --git a/gold/binary.cc b/gold/binary.cc
+index 52df81a..03a8f20 100644
+--- a/gold/binary.cc
++++ b/gold/binary.cc
+@@ -23,7 +23,7 @@
+ #include "gold.h"
+ 
+ #include <cerrno>
+-#include <cstring>
++#include <string>
+ 
+ #include "elfcpp.h"
+ #include "stringpool.h"
diff --git a/patches/binutils/2.28/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/patches/binutils/2.28/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
new file mode 100644
index 0000000..6168b31
--- /dev/null
+++ b/patches/binutils/2.28/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
@@ -0,0 +1,77 @@
+From c39479f4ab4d372b518957871e1f205a03e7c3d6 Mon Sep 17 00:00:00 2001
+From: Andrew Hsieh <andrewhsieh@google.com>
+Date: Wed, 18 Mar 2015 10:57:24 +0800
+Subject: [PATCH] Fix darwin build
+
+1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4
+   doesn't support ended initializer list
+2. wcsncasecmp doesn't exist in MacSDK10.6.x
+
+Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
+---
+ binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
+ binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
+ 2 files changed, 34 insertions(+), 3 deletions(-)
+
+diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
+index 13e39e4..7a98306 100644
+--- binutils-2.25.orig/bfd/peXXigen.c
++++ binutils-2.25/bfd/peXXigen.c
+@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
+ }
+ #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
+ 
++#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L
++/* wcsncasecmp isn't always defined in Mac SDK */
++static int
++wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
++{
++  wchar_t c1, c2;
++
++  if (n == 0)
++    return (0);
++  for (; *s1; s1++, s2++)
++  {
++    c1 = towlower(*s1);
++    c2 = towlower(*s2);
++    if (c1 != c2)
++      return ((int)c1 - c2);
++    if (--n == 0)
++      return (0);
++  }
++  return (-*s2);
++}
++#endif
++
+ /* Perform a comparison of two entries.  */
+ static signed int
+ rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
+diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
+index ff5a8ac..45140e0 100644
+--- binutils-2.25.orig/gold/gold-threads.cc
++++ binutils-2.25/gold/gold-threads.cc
+@@ -284,9 +284,18 @@ Condvar::~Condvar()
+ class Once_initialize
+ {
+  public:
+-  Once_initialize()
+-    : once_(PTHREAD_ONCE_INIT)
+-  { }
++   Once_initialize()
++#if !defined(__APPLE__)
++     : once_(PTHREAD_ONCE_INIT)
++   { }
++#else
++// In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 doesn't support
++// extended initializer list as above */
++   {
++     pthread_once_t once_2 = PTHREAD_ONCE_INIT;
++     once_ = once_2; 
++   }
++#endif
+ 
+   // Return a pointer to the pthread_once_t variable.
+   pthread_once_t*
+-- 
+2.1.3
+
diff --git a/patches/binutils/2.28/500-sysroot.patch b/patches/binutils/2.28/500-sysroot.patch
new file mode 100644
index 0000000..4cb9bc7
--- /dev/null
+++ b/patches/binutils/2.28/500-sysroot.patch
@@ -0,0 +1,37 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -336,18 +336,25 @@
+      directory first.  */
+   if (!entry->flags.maybe_archive)
+     {
+-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++      /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location.  */
++      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++	  && ld_sysroot)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->flags.sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	return TRUE;
+ 
+       if (IS_ABSOLUTE_PATH (entry->filename))
diff --git a/patches/binutils/2.28/600-poison-system-directories.patch b/patches/binutils/2.28/600-poison-system-directories.patch
new file mode 100644
index 0000000..ff235e3
--- /dev/null
+++ b/patches/binutils/2.28/600-poison-system-directories.patch
@@ -0,0 +1,285 @@
+Patch adapted to binutils 2.23.2 and extended to use
+BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
+
+[Gustavo: adapt to binutils 2.25]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+Upstream-Status: Inappropriate [distribution: codesourcery]
+
+Patch originally created by Mark Hatle, forward-ported to
+binutils 2.21 by Scott Garman.
+
+purpose:  warn for uses of system directories when cross linking
+
+Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
+
+2008-07-02  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * ld.h (args_type): Add error_poison_system_directories.
+    * ld.texinfo (--error-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.error_poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.error_poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --error-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-06-13  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * config.in: Regenerate.
+    * ld.h (args_type): Add poison_system_directories.
+    * ld.texinfo (--no-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --no-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-04-20  Joseph Myers  <joseph@codesourcery.com>
+
+    Merge from Sourcery G++ binutils 2.17:
+
+    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
+    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
+    ld/
+    * configure.ac (--enable-poison-system-directories): New option.
+    * configure, config.in: Regenerate.
+    * ldfile.c (ldfile_add_library_path): If
+    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
+    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
+diff --git a/ld/config.in b/ld/config.in
+index 276fb77..35c58eb 100644
+--- a/ld/config.in
++++ b/ld/config.in
+@@ -17,6 +17,9 @@
+    language is requested. */
+ #undef ENABLE_NLS
+ 
++/* Define to warn for use of native system library directories */
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++
+ /* Additional extension a shared object might have. */
+ #undef EXTRA_SHLIB_EXTENSION
+ 
+diff --git a/ld/configure b/ld/configure
+index a446283..d1f9504 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -788,6 +788,7 @@ with_lib_path
+ enable_targets
+ enable_64_bit_bfd
+ with_sysroot
++enable_poison_system_directories
+ enable_gold
+ enable_got
+ enable_compressed_debug_sections
+@@ -1445,6 +1446,8 @@ Optional Features:
+   --disable-largefile     omit support for large files
+   --enable-targets        alternative target configurations
+   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
++  --enable-poison-system-directories
++                          warn for use of native system library directories
+   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
+   --enable-got=<type>     GOT handling scheme (target, single, negative,
+                           multigot)
+@@ -15498,7 +15501,18 @@ else
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" = "xyes"; then
+ 
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++
++fi
+ 
+ # Check whether --enable-got was given.
+ if test "${enable_got+set}" = set; then :
+diff --git a/ld/configure.ac b/ld/configure.ac
+index 188172d..2cd8443 100644
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+ AC_SUBST(TARGET_SYSTEM_ROOT)
+ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
+ 
++AC_ARG_ENABLE([poison-system-directories],
++         AS_HELP_STRING([--enable-poison-system-directories],
++                [warn for use of native system library directories]),,
++         [enable_poison_system_directories=no])
++if test "x${enable_poison_system_directories}" = "xyes"; then
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++       [1],
++       [Define to warn for use of native system library directories])
++fi
++
+ dnl Use --enable-gold to decide if this linker should be the default.
+ dnl "install_as_default" is set to false if gold is the default linker.
+ dnl "installed_linker" is the installed BFD linker name.
+diff --git a/ld/ld.h b/ld/ld.h
+index d84ec4e..3476b26 100644
+--- a/ld/ld.h
++++ b/ld/ld.h
+@@ -169,6 +169,14 @@ typedef struct {
+   /* If set, display the target memory usage (per memory region).  */
+   bfd_boolean print_memory_usage;
+ 
++  /* If TRUE (the default) warn for uses of system directories when
++     cross linking.  */
++  bfd_boolean poison_system_directories;
++
++  /* If TRUE (default FALSE) give an error for uses of system
++     directories when cross linking instead of a warning.  */
++  bfd_boolean error_poison_system_directories;
++
+   /* Big or little endian as set on command line.  */
+   enum endian_enum endian;
+ 
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index 1dd7492..fb1438e 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -2357,6 +2357,18 @@ string identifying the original linked file does not change.
+ 
+ Passing @code{none} for @var{style} disables the setting from any
+ @code{--build-id} options earlier on the command line.
++
++@kindex --no-poison-system-directories
++@item --no-poison-system-directories
++Do not warn for @option{-L} options using system directories such as
++@file{/usr/lib} when cross linking.  This option is intended for use
++in chroot environments when such directories contain the correct
++libraries for the target system rather than the host.
++
++@kindex --error-poison-system-directories
++@item --error-poison-system-directories
++Give an error instead of a warning for @option{-L} options using
++system directories when cross linking.
+ @end table
+ 
+ @c man end
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index 96f9ecc..af231c0 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
+   else
+     new_dirs->name = xstrdup (name);
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (command_line.poison_system_directories
++  && ((!strncmp (name, "/lib", 4))
++      || (!strncmp (name, "/usr/lib", 8))
++      || (!strncmp (name, "/usr/local/lib", 14))
++      || (!strncmp (name, "/usr/X11R6/lib", 14))))
++   {
++     if (command_line.error_poison_system_directories)
++       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++     else
++       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++   }
++#endif
++
+ }
+ 
+ /* Try to open a BFD for a lang_input_statement.  */
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index 6f11e7b..0ca3110 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -144,6 +144,8 @@ enum option_values
+   OPTION_PRINT_MEMORY_USAGE,
+   OPTION_REQUIRE_DEFINED_SYMBOL,
+   OPTION_ORPHAN_HANDLING,
++  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
++  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
+ };
+ 
+ /* The initial parser states.  */
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index bb0b9cc..a23c56c 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -257,6 +257,8 @@ main (int argc, char **argv)
+   command_line.warn_mismatch = TRUE;
+   command_line.warn_search_mismatch = TRUE;
+   command_line.check_section_addresses = -1;
++  command_line.poison_system_directories = TRUE;
++  command_line.error_poison_system_directories = FALSE;
+ 
+   /* We initialize DEMANGLING based on the environment variable
+      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index 4cad209..be7d584 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
+@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
+   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
+     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
+     TWO_DASHES },
++  { {"no-poison-system-directories", no_argument, NULL,
++    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Do not warn for -L options using system directories"),
++    TWO_DASHES },
++  { {"error-poison-system-directories", no_argument, NULL,
++    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Give an error for -L options using system directories"),
++    TWO_DASHES },
+ };
+ 
+ #define OPTION_COUNT ARRAY_SIZE (ld_options)
+@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
+   int ingroup = 0;
+   char *default_dirlist = NULL;
+   char *shortopts;
++  char *BR_paranoid_env;
+   struct option *longopts;
+   struct option *really_longopts;
+   int last_optind;
+@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
+           }
+           break;
+ 
++	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
++	  command_line.poison_system_directories = FALSE;
++	  break;
++
++	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
++	  command_line.error_poison_system_directories = TRUE;
++	  break;
++
+ 	case OPTION_PUSH_STATE:
+ 	  input_flags.pushed = xmemdup (&input_flags,
+ 					sizeof (input_flags),
+@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
+       command_line.soname = NULL;
+     }
+ 
++  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
++  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
++    command_line.error_poison_system_directories = TRUE;
++
+   while (ingroup)
+     {
+       lang_leave_group ();
diff --git a/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/100-filter-includes.patch b/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/100-filter-includes.patch
deleted file mode 100644
index 204aac0..0000000
--- a/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/100-filter-includes.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 6ae8f1cc9abd2c25b3376a18f33fee00d9e771cf Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Mon, 27 Feb 2017 01:20:10 -0800
-Subject: [PATCH 1/2] When looking for binutils/BFD headers, create a local
- include dir
-
-... and filter only those headers that elf2flt binaries are going
-to use, to minimize the chance of clashes with system headers.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- Makefile.in         | 13 ++++++--
- configure           |  4 +--
- configure.ac        |  4 +--
- mk-local-include.sh | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 103 insertions(+), 7 deletions(-)
- create mode 100755 mk-local-include.sh
-
-diff --git a/Makefile.in b/Makefile.in
-index a6feea6..1e34bda 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -14,7 +14,9 @@ CPU = @target_cpu@
- TARGET = @target_alias@
- SYMBOL_PREFIX = @SYMBOL_PREFIX@
- CFLAGS = @CFLAGS@
--INCLUDES = -I$(srcdir) @bfd_include_dir@ @binutils_include_dir@ @zlib_include_dir@
-+INCLUDES = -I$(srcdir) -Ilocal-include @zlib_include_dir@
-+BFD_INCLUDE_DIR = @bfd_include_dir@
-+BINUTILS_INCLUDE_DIR = @binutils_include_dir@
- CPPFLAGS = @CPPFLAGS@ $(DEFS) $(INCLUDES)
- LDFLAGS = @LDFLAGS@
- LDLIBS = @LIBS@
-@@ -101,7 +103,7 @@ check-flthdr:
- check: check-flthdr
- 
- clean:
--	-rm -f $(PROGS) *.$(OBJEXT) .deps
-+	-rm -f $(PROGS) *.$(OBJEXT) .deps local-include
- 
- distclean: clean
- 	-rm -f Makefile config.log config.status config.cache ld-elf2flt
-@@ -121,5 +123,10 @@ install:
- 	$(INSTALL) -m 644 $(SRC_LDFILE) $(DESTDIR)$(target_libdir)/$(LDFILE)
- 
- sinclude .deps
--.deps:
-+.deps: local-include/.stamp
- 	$(CC) -MM $(CPPFLAGS) $(srcdir)/*.c > .deps
-+
-+local-include/.stamp: $(srcdir)/mk-local-include.sh
-+	bash $(srcdir)/mk-local-include.sh local-include '$(CC)' \
-+		'$(BFD_INCLUDE_DIR)' '$(BINUTILS_INCLUDE_DIR)' $(DEFS)
-+	touch $@
-diff --git a/configure b/configure
-index 3a4e8d6..af64990 100755
---- a/configure
-+++ b/configure
-@@ -3931,12 +3931,12 @@ fi
- 
- bfd_include_dir=
- if test "$ac_bfd_include_dir" != "NONE"; then
--  bfd_include_dir="-I$ac_bfd_include_dir"
-+  bfd_include_dir="$ac_bfd_include_dir"
- fi
- 
- binutils_include_dir=
- if test "$ac_binutils_include_dir" != "NONE"; then
--  binutils_include_dir="-I$ac_binutils_include_dir"
-+  binutils_include_dir="$ac_binutils_include_dir"
- fi
- 
- zlib_include_dir=
-diff --git a/configure.ac b/configure.ac
-index 6002894..b7fb790 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -135,12 +135,12 @@ fi
- 
- bfd_include_dir=
- if test "$ac_bfd_include_dir" != "NONE"; then
--  bfd_include_dir="-I$ac_bfd_include_dir"
-+  bfd_include_dir="$ac_bfd_include_dir"
- fi
- 
- binutils_include_dir=
- if test "$ac_binutils_include_dir" != "NONE"; then
--  binutils_include_dir="-I$ac_binutils_include_dir"
-+  binutils_include_dir="$ac_binutils_include_dir"
- fi
- 
- zlib_include_dir=
-diff --git a/mk-local-include.sh b/mk-local-include.sh
-new file mode 100755
-index 0000000..a6e8a63
---- /dev/null
-+++ b/mk-local-include.sh
-@@ -0,0 +1,89 @@
-+#!/bin/bash
-+
-+# Binutils provide certain headers that are clashing with system-wide
-+# headers on Cygwin and MacOS. They do so in different manners, though,
-+# so it is not possible to just tweak the inclusion/library order.
-+# Hence, we prepare a filtered inclusion directory where we only place
-+# the headers that we need for BFD/binutils. To determine them, we'll
-+# need to preprocess a sample file including the headers that will be used,
-+# and have the compiler output the actual list of included headers for us.
-+
-+# Usage:
-+#   mk-local-include.sh DIR CC BFD-INCLUDES BINUTILS-INCLUDES [DEFINES...]
-+
-+local_inc=$1
-+cc=$2
-+bfd_inc=$3
-+binutils_inc=$4
-+shift 4
-+# What remains are defines to pass to GCC
-+
-+case "${local_inc}" in
-+	*/*)	echo "Local include dir may only have one component" >&2; exit 1;;
-+	.|..)	echo "Local include dir may not be . or .." >&2; exit 1;;
-+esac
-+
-+# Re-create it from a clean slate
-+rm -rf "${local_inc}"
-+mkdir -p "${local_inc}"
-+
-+# Create a dummy source file that we'll preprocess
-+{
-+	echo "#include <libiberty.h>"
-+	echo "#include <filenames.h>"
-+	echo "#include <bfd.h>"
-+} > "${local_inc}/_dummy.c"
-+
-+$cc ${bfd_inc:+-I${bfd_inc}} ${binutils_inc:+-I${binutils_inc}} "$@" \
-+		-E -o /dev/null -H "${local_inc}/_dummy.c" 2>&1 | \
-+	sed -rn -e 's/^\.+ //p' > "${local_inc}/_hdr.list"
-+if [ $? != 0 ]; then
-+	echo "Failed to locate libiberty.h/bfd.h headers" >&2
-+	exit 1
-+fi
-+
-+# Now go over the list twice. First determine how the compiler printed
-+# the location of <bfd.h> and <libiberty.h>. They themselves may be in
-+# a system include directory. We'll create a mess of symlinks in that case,
-+# but they'll still point to the system headers.
-+while read f; do
-+	case "$f" in
-+	*/bfd.h)	bfd_loc=${f%/bfd.h};;
-+	*/libiberty.h)	binutils_loc=${f%/libiberty.h};;
-+	esac
-+done < $local_inc/_hdr.list
-+
-+# Now symlink the headers that reside in the same directory as the headers
-+# we're looking for, or in any subdirectory thereof.
-+create_link() {
-+	local f=$1
-+	local bd=$2
-+	local relpath lnkname bname src
-+
-+	relpath=${f#${bd}/}
-+	lnkname=${local_inc}/${relpath}
-+	bname=${relpath##*/}
-+	if [ "${bname}" != "${relpath}" ]; then
-+		mkdir -p "${relpath%/*}"
-+	fi
-+	case "${f}" in
-+	/*)	src=${f};;
-+	*)	src=../${f};; # account for one extra path component (DIR)
-+	esac
-+	if [ ! -L "${lnkname}" ]; then
-+		ln -s "${src}" "${lnkname}"
-+	fi
-+}
-+
-+while read f; do
-+	case "$f" in
-+	${bfd_loc}/*)		create_link "$f" "${bfd_loc}";;
-+	${binutils_loc}/*)	create_link "$f" "${binutils_loc}";;
-+	esac
-+done < $local_inc/_hdr.list
-+
-+# Final bit of secret knowledge. We need ELF headers, and the exact headers
-+# depend on the selected target. Fortunately, they are all in the 'elf/'
-+# subdirectory of binutils include directory, which we get by searching for
-+# <libiberty.h>.
-+create_link "${binutils_loc}/elf" "${binutils_loc}"
--- 
-2.9.3
-
diff --git a/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/110-macos-use-local-elf.h.patch b/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/110-macos-use-local-elf.h.patch
deleted file mode 100644
index b189b69..0000000
--- a/patches/elf2flt/4820f0dbb77cd6564d5fa0817218fe2a1fb99f32/110-macos-use-local-elf.h.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 1c19bf8cc294e95c8de314cc457bcea6854c3a2d Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Tue, 28 Feb 2017 09:29:21 -0800
-Subject: [PATCH 2/2] Macos does not have <elf.h> and needs a local copy
-
-Also, move <elf/xtensa.h> up - generic <elf.h> does not have
-definitions for xtensa relocations.
-
-Local file, cygwin-elf.h, needs to include <stdint.h> for standard
-integer types which is POSIX - rather than glibc-originated <features.h>.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- cygwin-elf.h | 2 +-
- elf2flt.c    | 7 +++++--
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/cygwin-elf.h b/cygwin-elf.h
-index bd72b37..8e3dbff 100644
---- a/cygwin-elf.h
-+++ b/cygwin-elf.h
-@@ -26,7 +26,7 @@ typedef uint16_t u_int16_t;
- typedef uint32_t u_int32_t;
- typedef uint64_t u_int64_t;
- #else
--#include <features.h>
-+#include <stdint.h>
- #endif
- /* Standard ELF types.  */
- 
-diff --git a/elf2flt.c b/elf2flt.c
-index 08296cf..19a4d4d 100644
---- a/elf2flt.c
-+++ b/elf2flt.c
-@@ -58,14 +58,17 @@ const char *elf2flt_progname;
- #include <elf/h8.h>      /* TARGET_* ELF support for the BFD library            */
- #elif defined(TARGET_arm)
- #include <elf/arm.h>
--#elif defined(__CYGWIN__) || defined(__MINGW32__) || defined(TARGET_nios) || defined(TARGET_nios2)
--#include "cygwin-elf.h"	/* Cygwin uses a local copy */
- #elif defined(TARGET_xtensa)
- #include <elf/xtensa.h>	/* TARGET_* ELF support for the BFD library */
-+#elif defined(TARGET_nios) || defined(TARGET_nios2)
-+#include "cygwin-elf.h" // <elf/nios2.h> does not have R_NIOS_* declarations
- #elif defined(TARGET_microblaze)
- #include <elf/microblaze.h>	/* TARGET_* ELF support for the BFD library */
- #elif defined(TARGET_v850)
- #include <elf/v850.h>
-+#elif (__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
-+// FIXME: does Cygwin need this? It has <elf.h> in /usr/include
-+#include "cygwin-elf.h" // Some systems don't have <elf.h>
- #else
- #include <elf.h>      /* TARGET_* ELF support for the BFD library            */
- #endif
--- 
-2.9.3
-
diff --git a/patches/elf2flt/a8bc69b882a55b1f1e437b50e33d3db8414eb68e/100-fix-cygwin-build.patch b/patches/elf2flt/a8bc69b882a55b1f1e437b50e33d3db8414eb68e/100-fix-cygwin-build.patch
new file mode 100644
index 0000000..53311bf
--- /dev/null
+++ b/patches/elf2flt/a8bc69b882a55b1f1e437b50e33d3db8414eb68e/100-fix-cygwin-build.patch
@@ -0,0 +1,111 @@
+From 4e5250f8319e72b739932b87193fa29f4a5b96b1 Mon Sep 17 00:00:00 2001
+From: Alexey Neyman <stilor@att.net>
+Date: Mon, 27 Feb 2017 01:20:10 -0800
+Subject: [PATCH] Symlink required binutils/BFD headers to local dir
+
+... to minimize the chance of clashes with system headers.
+
+Also, remove the -lcygwin from Makefile.in: this breaks canadian
+build on cygwin, as it tries to pass -lcygwin into non-Cygwin host
+CC. This chunk pre-dates the addition of -lc into configure.ac and
+passing -lc should be sufficient (it works for me).
+
+Signed-off-by: Alexey Neyman <stilor@att.net>
+---
+ Makefile.in  | 21 +++++++++++++--------
+ configure    |  4 ++--
+ configure.ac |  4 ++--
+ 3 files changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a6feea6..46d904b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14,7 +14,9 @@ CPU = @target_cpu@
+ TARGET = @target_alias@
+ SYMBOL_PREFIX = @SYMBOL_PREFIX@
+ CFLAGS = @CFLAGS@
+-INCLUDES = -I$(srcdir) @bfd_include_dir@ @binutils_include_dir@ @zlib_include_dir@
++INCLUDES = -I$(srcdir) -I. @zlib_include_dir@
++BFD_INCLUDE_DIR = @bfd_include_dir@
++BINUTILS_INCLUDE_DIR = @binutils_include_dir@
+ CPPFLAGS = @CPPFLAGS@ $(DEFS) $(INCLUDES)
+ LDFLAGS = @LDFLAGS@
+ LDLIBS = @LIBS@
+@@ -38,11 +40,6 @@ ifneq (,$(findstring mingw32,$(HOST)))
+    LDLIBS += -lws2_32
+ endif
+ 
+-# force link order under cygwin to avoid getopts / libiberty clash
+-ifneq ($(strip $(shell gcc -v 2>&1 | grep "cygwin")),)
+-   LDLIBS := -lcygwin $(LDLIBS)
+-endif
+-
+ LDFILE= elf2flt.ld
+ ifeq ($(strip $(CPU)),e1)
+ SRC_LDFILE= $(srcdir)/$(CPU)-elf2flt.ld
+@@ -101,7 +98,7 @@ check-flthdr:
+ check: check-flthdr
+ 
+ clean:
+-	-rm -f $(PROGS) *.$(OBJEXT) .deps
++	-rm -f $(PROGS) *.$(OBJEXT) *.h elf .deps .stamp-local-include
+ 
+ distclean: clean
+ 	-rm -f Makefile config.log config.status config.cache ld-elf2flt
+@@ -121,5 +118,13 @@ install:
+ 	$(INSTALL) -m 644 $(SRC_LDFILE) $(DESTDIR)$(target_libdir)/$(LDFILE)
+ 
+ sinclude .deps
+-.deps:
++.deps: .stamp-local-include
+ 	$(CC) -MM $(CPPFLAGS) $(srcdir)/*.c > .deps
++
++.stamp-local-include:
++	ln -sf $(BFD_INCLUDE_DIR)/bfd.h bfd.h
++	for f in ansidecl filenames hashtab libiberty symcat; do \
++		ln -sf $(BINUTILS_INCLUDE_DIR)/$$f.h $$f.h; \
++	done
++	ln -sf $(BINUTILS_INCLUDE_DIR)/elf elf
++	touch $@
+diff --git a/configure b/configure
+index 3a4e8d6..af64990 100755
+--- a/configure
++++ b/configure
+@@ -3931,12 +3931,12 @@ fi
+ 
+ bfd_include_dir=
+ if test "$ac_bfd_include_dir" != "NONE"; then
+-  bfd_include_dir="-I$ac_bfd_include_dir"
++  bfd_include_dir="$ac_bfd_include_dir"
+ fi
+ 
+ binutils_include_dir=
+ if test "$ac_binutils_include_dir" != "NONE"; then
+-  binutils_include_dir="-I$ac_binutils_include_dir"
++  binutils_include_dir="$ac_binutils_include_dir"
+ fi
+ 
+ zlib_include_dir=
+diff --git a/configure.ac b/configure.ac
+index 6002894..b7fb790 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -135,12 +135,12 @@ fi
+ 
+ bfd_include_dir=
+ if test "$ac_bfd_include_dir" != "NONE"; then
+-  bfd_include_dir="-I$ac_bfd_include_dir"
++  bfd_include_dir="$ac_bfd_include_dir"
+ fi
+ 
+ binutils_include_dir=
+ if test "$ac_binutils_include_dir" != "NONE"; then
+-  binutils_include_dir="-I$ac_binutils_include_dir"
++  binutils_include_dir="$ac_binutils_include_dir"
+ fi
+ 
+ zlib_include_dir=
+-- 
+2.9.3
+