[Mips] Do not add unnecessary Mips toolchain path to the list

of system include directories with extern "C" semantics.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@179979 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 20a889742262996ad1df0752ff00ece5d81a2f70..faad1dc074104031ff93ef886afafebcbd800a45 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -2380,11 +2380,6 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
                                     GCCInstallation.getInstallPath() +
                                     "/include");
 
-    addExternCSystemIncludeIfExists(DriverArgs, CC1Args,
-                                    GCCInstallation.getInstallPath() +
-                                    "/include-fixed" +
-                                    GCCInstallation.getMultiarchSuffix());
-
     addExternCSystemIncludeIfExists(DriverArgs, CC1Args,
                                     GCCInstallation.getInstallPath() +
                                     "/../../../../" +

diff --git a/test/Driver/mips-cs-header-search.cpp b/test/Driver/mips-cs-header-search.cpp
index cb15edd55497eb0907c5692ee8e488e05e50b5b4..b8bc8321990d7efa86880ab8c9a219b97942c749 100644 (file)
--- a/test/Driver/mips-cs-header-search.cpp
+++ b/test/Driver/mips-cs-header-search.cpp
@@ -16,8 +16,6 @@
 // CHECK-BE-HF-32: "-internal-externc-isystem"
 // CHECK-BE-HF-32: "[[TC]]/include"
 // CHECK-BE-HF-32: "-internal-externc-isystem"
-// CHECK-BE-HF-32: "[[TC]]/include-fixed"
-// CHECK-BE-HF-32: "-internal-externc-isystem"
 // CHECK-BE-HF-32: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Big-endian, hard float, mips16
@@ -34,8 +32,6 @@
 // CHECK-BE-HF-16: "-internal-externc-isystem"
 // CHECK-BE-HF-16: "[[TC]]/include"
 // CHECK-BE-HF-16: "-internal-externc-isystem"
-// CHECK-BE-HF-16: "[[TC]]/include-fixed/mips16"
-// CHECK-BE-HF-16: "-internal-externc-isystem"
 // CHECK-BE-HF-16: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Big-endian, hard float, micromips
@@ -52,8 +48,6 @@
 // CHECK-BE-HF-MICRO: "-internal-externc-isystem"
 // CHECK-BE-HF-MICRO: "[[TC]]/include"
 // CHECK-BE-HF-MICRO: "-internal-externc-isystem"
-// CHECK-BE-HF-MICRO: "[[TC]]/include-fixed/micromips"
-// CHECK-BE-HF-MICRO: "-internal-externc-isystem"
 // CHECK-BE-HF-MICRO: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Big-endian, soft float
@@ -70,8 +64,6 @@
 // CHECK-BE-SF-32: "-internal-externc-isystem"
 // CHECK-BE-SF-32: "[[TC]]/include"
 // CHECK-BE-SF-32: "-internal-externc-isystem"
-// CHECK-BE-SF-32: "[[TC]]/include-fixed/soft-float"
-// CHECK-BE-SF-32: "-internal-externc-isystem"
 // CHECK-BE-SF-32: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Big-endian, soft float, mips16
@@ -88,8 +80,6 @@
 // CHECK-BE-SF-16: "-internal-externc-isystem"
 // CHECK-BE-SF-16: "[[TC]]/include"
 // CHECK-BE-SF-16: "-internal-externc-isystem"
-// CHECK-BE-SF-16: "[[TC]]/include-fixed/mips16/soft-float"
-// CHECK-BE-SF-16: "-internal-externc-isystem"
 // CHECK-BE-SF-16: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Big-endian, soft float, micromips
@@ -106,8 +96,6 @@
 // CHECK-BE-SF-MICRO: "-internal-externc-isystem"
 // CHECK-BE-SF-MICRO: "[[TC]]/include"
 // CHECK-BE-SF-MICRO: "-internal-externc-isystem"
-// CHECK-BE-SF-MICRO: "[[TC]]/include-fixed/micromips/soft-float"
-// CHECK-BE-SF-MICRO: "-internal-externc-isystem"
 // CHECK-BE-SF-MICRO: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Big-endian, hard float, 64-bit
@@ -124,8 +112,6 @@
 // CHECK-BE-HF-64: "-internal-externc-isystem"
 // CHECK-BE-HF-64: "[[TC]]/include"
 // CHECK-BE-HF-64: "-internal-externc-isystem"
-// CHECK-BE-HF-64: "[[TC]]/include-fixed/64"
-// CHECK-BE-HF-64: "-internal-externc-isystem"
 // CHECK-BE-HF-64: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Big-endian, soft float, 64-bit
@@ -142,8 +128,6 @@
 // CHECK-BE-SF-64: "-internal-externc-isystem"
 // CHECK-BE-SF-64: "[[TC]]/include"
 // CHECK-BE-SF-64: "-internal-externc-isystem"
-// CHECK-BE-SF-64: "[[TC]]/include-fixed/soft-float/64"
-// CHECK-BE-SF-64: "-internal-externc-isystem"
 // CHECK-BE-SF-64: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Little-endian, hard float
@@ -160,8 +144,6 @@
 // CHECK-EL-HF-32: "-internal-externc-isystem"
 // CHECK-EL-HF-32: "[[TC]]/include"
 // CHECK-EL-HF-32: "-internal-externc-isystem"
-// CHECK-EL-HF-32: "[[TC]]/include-fixed/el"
-// CHECK-EL-HF-32: "-internal-externc-isystem"
 // CHECK-EL-HF-32: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Little-endian, hard float, mips16
@@ -178,8 +160,6 @@
 // CHECK-EL-HF-16: "-internal-externc-isystem"
 // CHECK-EL-HF-16: "[[TC]]/include"
 // CHECK-EL-HF-16: "-internal-externc-isystem"
-// CHECK-EL-HF-16: "[[TC]]/include-fixed/mips16/el"
-// CHECK-EL-HF-16: "-internal-externc-isystem"
 // CHECK-EL-HF-16: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Little-endian, hard float, micromips
@@ -196,8 +176,6 @@
 // CHECK-EL-HF-MICRO: "-internal-externc-isystem"
 // CHECK-EL-HF-MICRO: "[[TC]]/include"
 // CHECK-EL-HF-MICRO: "-internal-externc-isystem"
-// CHECK-EL-HF-MICRO: "[[TC]]/include-fixed/micromips/el"
-// CHECK-EL-HF-MICRO: "-internal-externc-isystem"
 // CHECK-EL-HF-MICRO: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Little-endian, soft float
@@ -214,8 +192,6 @@
 // CHECK-EL-SF-32: "-internal-externc-isystem"
 // CHECK-EL-SF-32: "[[TC]]/include"
 // CHECK-EL-SF-32: "-internal-externc-isystem"
-// CHECK-EL-SF-32: "[[TC]]/include-fixed/soft-float/el"
-// CHECK-EL-SF-32: "-internal-externc-isystem"
 // CHECK-EL-SF-32: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Little-endian, soft float, mips16
@@ -232,8 +208,6 @@
 // CHECK-EL-SF-16: "-internal-externc-isystem"
 // CHECK-EL-SF-16: "[[TC]]/include"
 // CHECK-EL-SF-16: "-internal-externc-isystem"
-// CHECK-EL-SF-16: "[[TC]]/include-fixed/mips16/soft-float/el"
-// CHECK-EL-SF-16: "-internal-externc-isystem"
 // CHECK-EL-SF-16: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Little-endian, soft float, micromips
@@ -250,8 +224,6 @@
 // CHECK-EL-SF-MICRO: "-internal-externc-isystem"
 // CHECK-EL-SF-MICRO: "[[TC]]/include"
 // CHECK-EL-SF-MICRO: "-internal-externc-isystem"
-// CHECK-EL-SF-MICRO: "[[TC]]/include-fixed/micromips/soft-float/el"
-// CHECK-EL-SF-MICRO: "-internal-externc-isystem"
 // CHECK-EL-SF-MICRO: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Little-endian, hard float, 64-bit
@@ -268,8 +240,6 @@
 // CHECK-EL-HF-64: "-internal-externc-isystem"
 // CHECK-EL-HF-64: "[[TC]]/include"
 // CHECK-EL-HF-64: "-internal-externc-isystem"
-// CHECK-EL-HF-64: "[[TC]]/include-fixed/el/64"
-// CHECK-EL-HF-64: "-internal-externc-isystem"
 // CHECK-EL-HF-64: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"
 //
 // = Little-endian, soft float, 64-bit
@@ -286,6 +256,4 @@
 // CHECK-EL-SF-64: "-internal-externc-isystem"
 // CHECK-EL-SF-64: "[[TC]]/include"
 // CHECK-EL-SF-64: "-internal-externc-isystem"
-// CHECK-EL-SF-64: "[[TC]]/include-fixed/soft-float/el/64"
-// CHECK-EL-SF-64: "-internal-externc-isystem"
 // CHECK-EL-SF-64: "[[TC]]/../../../../mips-linux-gnu/libc/usr/include"