X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fincpath.c;h=efcd2c75e573e305b8bf088b8ec39cad6bcf919c;hp=6693bf524503857fe84b316a4c79ef7902de390e;hb=f005d7ac6a90bd78f249c1383896f92c57403692;hpb=c5698d9fdbf23c990473f383da45580515114ca1

diff --git a/gcc/incpath.c b/gcc/incpath.c
index 6693bf52450..efcd2c75e57 100644
--- 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);
 	}