"This patch adds paths for Fedora 9 in clang.cpp and support for two preprocessor...

Patch by Zhongxing Xu!

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

diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index cf3f9793d91077789e5fe51aeeffed56d79e3d8c..cb4c5e4bba36a29363635815d6ba8fad302dc8f0 100644 (file)
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -977,6 +977,13 @@ static void InitializeIncludePaths(const char *Argv0, HeaderSearch &Headers,
       AddPath("/usr/include/c++/4.1.2/backward", System, true, false, false, 
               Headers);
 
+      // Fedora 9
+      AddPath("/usr/include/c++/4.3.0", System, true, false, false, Headers);
+      AddPath("/usr/include/c++/4.3.0/i386-redhat-linux", System, true, false,
+              false, Headers);
+      AddPath("/usr/include/c++/4.3.0/backward", System, true, false, false, 
+              Headers);
+
       // Arch Linux 2008-06-24
       AddPath("/usr/include/c++/4.3.1", System, true, false, false, Headers);
       AddPath("/usr/include/c++/4.3.1/i686-pc-linux-gnu", System, true, false,
@@ -1020,6 +1027,10 @@ static void InitializeIncludePaths(const char *Argv0, HeaderSearch &Headers,
     AddPath("/usr/lib/gcc/i386-redhat-linux/4.1.2/include", System,
             false, false, false, Headers);
 
+    // Fedora 9
+    AddPath("/usr/lib/gcc/i386-redhat-linux/4.3.0/include", System,
+            false, false, false, Headers);
+
     //Debian testing/lenny x86
     AddPath("/usr/lib/gcc/i486-linux-gnu/4.2.3/include", System,
             false, false, false, Headers);

diff --git a/utils/ccc b/utils/ccc
index d29443c832f322e09d326ccc58a1ac5ce1535769..e172080088c4bc0db71468e48e709963b1c6dc4b 100755 (executable)
--- a/utils/ccc
+++ b/utils/ccc
@@ -102,6 +102,10 @@ def main(args):
         if arg in ['--param', '-u']:
             i += 1
 
+        # Preprocessor options with one argument that should be ignored
+        if arg in ['-MT', '-MF']:
+            i += 1
+
         # Prefix matches for the compile mode
         if arg[:2] in ['-D', '-I', '-U', '-F']:
             if not arg[2:]: