<div dir="ltr">Do we also handle ':'? The corresponding behavior in the linker is in: <a href="http://llvm.org/klaus/lld/blob/master/ELF/DriverUtils.cpp#L-232">http://llvm.org/klaus/lld/blob/master/ELF/DriverUtils.cpp#L-232</a><div><br></div><div>-- Sean Silva</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, May 6, 2016 at 12:13 PM, Saleem Abdulrasool via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Fri May 6 14:13:55 2016<br>
New Revision: 268777<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=268777&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=268777&view=rev</a><br>
Log:<br>
Frontend: support -I=path for sysroot expansion<br>
<br>
>From the GCC manpage:<br>
<br>
-I dir<br>
... If dir begins with =, then the = will be replaced by the sysroot prefix;<br>
see --sysroot and -isysroot.<br>
<br>
Add support to expand the `=` as a prefix of the include path with the sysroot<br>
if specified. `-isysroot` takes precedence over `--sysroot` as the normal<br>
argument behaviour occurs. The ordering of the `-isysroot` is relevant to the<br>
path substituted. If no `--sysroot=` or `-isysroot` option is present, the = is<br>
not expanded.<br>
<br>
Resolves PR26965!<br>
<br>
Added:<br>
cfe/trunk/test/Preprocessor/sysroot-prefix.c<br>
Modified:<br>
cfe/trunk/lib/Frontend/CompilerInvocation.cpp<br>
<br>
Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=268777&r1=268776&r2=268777&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=268777&r1=268776&r2=268777&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Fri May 6 14:13:55 2016<br>
@@ -1278,6 +1278,8 @@ static void ParseHeaderSearchArgs(Header<br>
<br>
// Add -I..., -F..., and -index-header-map options in order.<br>
bool IsIndexHeaderMap = false;<br>
+ bool IsSysrootSpecified =<br>
+ Args.hasArg(OPT__sysroot_EQ) || Args.hasArg(OPT_isysroot);<br>
for (const Arg *A : Args.filtered(OPT_I, OPT_F, OPT_index_header_map)) {<br>
if (A->getOption().matches(OPT_index_header_map)) {<br>
// -index-header-map applies to the next -I or -F.<br>
@@ -1288,8 +1290,18 @@ static void ParseHeaderSearchArgs(Header<br>
frontend::IncludeDirGroup Group =<br>
IsIndexHeaderMap ? frontend::IndexHeaderMap : frontend::Angled;<br>
<br>
- Opts.AddPath(A->getValue(), Group,<br>
- /*IsFramework=*/A->getOption().matches(OPT_F), true);<br>
+ bool IsFramework = A->getOption().matches(OPT_F);<br>
+ std::string Path = A->getValue();<br>
+<br>
+ if (IsSysrootSpecified && !IsFramework && A->getValue()[0] == '=') {<br>
+ SmallString<32> Buffer;<br>
+ llvm::sys::path::append(Buffer, Opts.Sysroot,<br>
+ llvm::StringRef(A->getValue()).substr(1));<br>
+ Path = Buffer.str();<br>
+ }<br>
+<br>
+ Opts.AddPath(Path.c_str(), Group, IsFramework,<br>
+ /*IgnoreSysroot*/ true);<br>
IsIndexHeaderMap = false;<br>
}<br>
<br>
<br>
Added: cfe/trunk/test/Preprocessor/sysroot-prefix.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/sysroot-prefix.c?rev=268777&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/sysroot-prefix.c?rev=268777&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Preprocessor/sysroot-prefix.c (added)<br>
+++ cfe/trunk/test/Preprocessor/sysroot-prefix.c Fri May 6 14:13:55 2016<br>
@@ -0,0 +1,28 @@<br>
+// RUN: %clang_cc1 -v -isysroot /var/empty -I /dev/null -E %s -o /dev/null 2>&1 | FileCheck -check-prefix CHECK-ISYSROOT_NO_SYSROOT %s<br>
+// RUN: %clang_cc1 -v -isysroot /var/empty -I =/dev/null -E %s -o /dev/null 2>&1 | FileCheck -check-prefix CHECK-ISYSROOT_SYSROOT_DEV_NULL %s<br>
+// RUN: %clang_cc1 -v -I =/dev/null -E %s -o /dev/null 2>&1 | FileCheck -check-prefix CHECK-NO_ISYSROOT_SYSROOT_DEV_NULL %s<br>
+// RUN: %clang_cc1 -v -isysroot /var/empty -I =null -E %s -o /dev/null 2>&1 | FileCheck -check-prefix CHECK-ISYSROOT_SYSROOT_NULL %s<br>
+// RUN: %clang_cc1 -v -isysroot /var/empty -isysroot /var/empty/root -I =null -E %s -o /dev/null 2>&1 | FileCheck -check-prefix CHECK-ISYSROOT_ISYSROOT_SYSROOT_NULL %s<br>
+// RUN: %clang_cc1 -v -isysroot /var/empty/root -isysroot /var/empty -I =null -E %s -o /dev/null 2>&1 | FileCheck -check-prefix CHECK-ISYSROOT_ISYSROOT_SWAPPED_SYSROOT_NULL %s<br>
+<br>
+// CHECK-ISYSROOT_NO_SYSROOT: ignoring nonexistent directory "/dev/null"<br>
+// CHECK-ISYSROOT_NO_SYSROOT-NOT: ignoring nonexistent directory "/var/empty/dev/null"<br>
+<br>
+// CHECK-NO_ISYSROOT_SYSROOT_DEV_NULL: ignoring nonexistent directory "=/dev/null"<br>
+// CHECK-NO_ISYSROOT_SYSROOT_DEV_NULL-NOT: ignoring nonexistent directory "/dev/null"<br>
+<br>
+// CHECK-ISYSROOT_SYSROOT_DEV_NULL: ignoring nonexistent directory "/var/empty/dev/null"<br>
+// CHECK-ISYSROOT_SYSROOT_DEV_NULL-NOT: ignoring nonexistent directory "/dev/null"<br>
+<br>
+// CHECK-NO_ISYSROOT_SYSROOT: ignoring nonexistent directory "=/dev/null"<br>
+// CHECK-NO_ISYSROOT_SYSROOT-NOT: ignoring nonexistent directory "/var/empty/dev/null"<br>
+<br>
+// CHECK-ISYSROOT_SYSROOT_NULL: ignoring nonexistent directory "/var/empty/null"<br>
+// CHECK-ISYSROOT_SYSROOT_NULL-NOT: ignoring nonexistent directory "=null"<br>
+<br>
+// CHECK-ISYSROOT_ISYSROOT_SYSROOT_NULL: ignoring nonexistent directory "/var/empty/root/null"<br>
+// CHECK-ISYSROOT_ISYSROOT_SYSROOT_NULL-NOT: ignoring nonexistent directory "=null"<br>
+<br>
+// CHECK-ISYSROOT_ISYSROOT_SWAPPED_SYSROOT_NULL: ignoring nonexistent directory "/var/empty/null"<br>
+// CHECK-ISYSROOT_ISYSROOT_SWAPPED_SYSROOT_NULL-NOT: ignoring nonexistent directory "=null"<br>
+<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>