Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / incpath.c

diff --git a/gcc/incpath.c b/gcc/incpath.c
index 6693bf5..efcd2c7 100644 (file)
--- a/gcc/incpath.c
+++ b/gcc/incpath.c
@@ -150,8 +150,14 @@ add_standard_paths (const char *sysroot, const char *iprefix,
              if (!filename_ncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
                {
                  char *str = concat (iprefix, p->fname + len, NULL);
-                 if (p->multilib && imultilib)
+                 if (p->multilib == 1 && imultilib)
                    str = concat (str, dir_separator_str, imultilib, NULL);
+                 else if (p->multilib == 2)
+                   {
+                     if (!imultiarch)
+                       continue;
+                     str = concat (str, dir_separator_str, imultiarch, NULL);
+                   }
                  add_path (str, SYSTEM, p->cxx_aware, false);
                }
            }
@@ -203,8 +209,14 @@ add_standard_paths (const char *sysroot, const char *iprefix,
          else
            str = update_path (p->fname, p->component);
 
-         if (p->multilib && imultilib)
+         if (p->multilib == 1 && imultilib)
            str = concat (str, dir_separator_str, imultilib, NULL);
+         else if (p->multilib == 2)
+           {
+             if (!imultiarch)
+               continue;
+             str = concat (str, dir_separator_str, imultiarch, NULL);
+           }
 
          add_path (str, SYSTEM, p->cxx_aware, false);
        }