Upstream-Status: Pending

Add /sw/include and /opt/include based on the original
zecke-no-host-includes.patch patch.  The original patch checked for
/usr/include, /sw/include and /opt/include and then triggered a failure and
aborted.

Instead, we add the two missing items to the current scan.  If the user
wants this to be a failure, they can add "-Werror=poison-system-directories".

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

Index: gcc-4.6.0/gcc/incpath.c
===================================================================
--- gcc-4.6.0.orig/gcc/incpath.c
+++ gcc-4.6.0/gcc/incpath.c
@@ -363,7 +363,9 @@ merge_include_chains (const char *sysroo
          {
           if ((!strncmp (p->name, "/usr/include", 12))
               || (!strncmp (p->name, "/usr/local/include", 18))
-              || (!strncmp (p->name, "/usr/X11R6/include", 18)))
+              || (!strncmp (p->name, "/usr/X11R6/include", 18))
+              || (!strncmp (p->name, "/sw/include", 11))
+              || (!strncmp (p->name, "/opt/include", 12)))
             warning (OPT_Wpoison_system_directories,
                      "include location \"%s\" is unsafe for "
                      "cross-compilation",