[cfe-commits] r130683 - in /cfe/trunk: lib/Frontend/InitHeaderSearch.cpp test/PCH/reloc.c

[NAKAMURA Takumi]

Author: chapuni
Date: Sun May  1 23:50:10 2011
New Revision: 130683

URL: http://llvm.org/viewvc/llvm-project?rev=130683&view=rev
Log:
lib/Frontend/InitHeaderSearch.cpp: Tweak AddPath() to accept "/foo/bar" (not "X:\foo\bar") with -isysroot. test/PCH/reloc.c can pass.

FIXME: We should consider better isysroot scheme on Win32 hosts.

Modified:
    cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
    cfe/trunk/test/PCH/reloc.c

Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=130683&r1=130682&r2=130683&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Sun May  1 23:50:10 2011
@@ -118,7 +118,12 @@
 
   // Handle isysroot.
   if ((Group == System || Group == CXXSystem) && !IgnoreSysRoot &&
+#if defined(_WIN32)
+      !MappedPathStr.empty() &&
+      llvm::sys::path::is_separator(MappedPathStr[0]) &&
+#else
       llvm::sys::path::is_absolute(MappedPathStr) &&
+#endif
       IsNotEmptyOrRoot) {
     MappedPathStorage.clear();
     MappedPathStr =

Modified: cfe/trunk/test/PCH/reloc.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/reloc.c?rev=130683&r1=130682&r2=130683&view=diff
==============================================================================
--- cfe/trunk/test/PCH/reloc.c (original)
+++ cfe/trunk/test/PCH/reloc.c Sun May  1 23:50:10 2011
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -emit-pch -o %t -relocatable-pch -isysroot %S/libroot %S/libroot/usr/include/reloc.h
 // RUN: %clang_cc1 -include-pch %t -isysroot %S/libroot %s -verify
 // RUN: not %clang_cc1 -include-pch %t %s
-// XFAIL: mingw,win32
+
 #include <reloc.h>
 
 int x = 2; // expected-error{{redefinition}}