Author: manojgupta
Date: Thu Sep 12 17:28:37 2019
New Revision: 371799
URL: http://llvm.org/viewvc/llvm-project?rev=371799&view=rev
Log:
Revert r371785.
r371785 is causing fails on clang-hexagon-elf buildbots.
Removed:
cfe/trunk/test/Frontend/Inputs/sysroot_x86_64_cross_linux_tree/
cfe/trunk/test/Frontend/warning-poison-system-directories.c
Modified:
cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td
cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td?rev=371799&r1=371798&r2=371799&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticCommonKinds.td Thu Sep 12 17:28:37
2019
@@ -315,9 +315,4 @@ def err_unknown_analyzer_checker_or_pack
"no analyzer checkers or packages are associated with '%0'">;
def note_suggest_disabling_all_checkers : Note<
"use -analyzer-disable-all-checks to disable all static analyzer
checkers">;
-
-// Poison system directories.
-def warn_poison_system_directories : Warning <
- "include location '%0' is unsafe for cross-compilation">,
- InGroup<DiagGroup<"poison-system-directories">>, DefaultIgnore;
}
Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=371799&r1=371798&r2=371799&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Thu Sep 12 17:28:37 2019
@@ -137,13 +137,6 @@ bool InitHeaderSearch::AddUnmappedPath(c
SmallString<256> MappedPathStorage;
StringRef MappedPathStr = Path.toStringRef(MappedPathStorage);
- // If use system headers while cross-compiling, emit the warning.
- if (HasSysroot && (MappedPathStr.startswith("/usr/include") ||
- MappedPathStr.startswith("/usr/local/include"))) {
- Headers.getDiags().Report(diag::warn_poison_system_directories)
- << MappedPathStr;
- }
-
// Compute the DirectoryLookup type.
SrcMgr::CharacteristicKind Type;
if (Group == Quoted || Group == Angled || Group == IndexHeaderMap) {
Removed: cfe/trunk/test/Frontend/warning-poison-system-directories.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/warning-poison-system-directories.c?rev=371798&view=auto
==============================================================================
--- cfe/trunk/test/Frontend/warning-poison-system-directories.c (original)
+++ cfe/trunk/test/Frontend/warning-poison-system-directories.c (removed)
@@ -1,27 +0,0 @@
-// System directory and sysroot option causes warning.
-// RUN: %clang -Wpoison-system-directories -target x86_64 -I/usr/include
--sysroot %S/Inputs/sysroot_x86_64_cross_linux_tree -c -o - %s 2> %t.1.stderr
-// RUN: FileCheck -check-prefix=WARN < %t.1.stderr %s
-// RUN: %clang -Wpoison-system-directories -target x86_64
-cxx-isystem/usr/include --sysroot %S/Inputs/sysroot_x86_64_cross_linux_tree -c
-o - %s 2> %t.1.stderr
-// RUN: FileCheck -check-prefix=WARN < %t.1.stderr %s
-// RUN: %clang -Wpoison-system-directories -target x86_64
-iquote/usr/local/include --sysroot %S/Inputs/sysroot_x86_64_cross_linux_tree
-c -o - %s 2> %t.1.stderr
-// RUN: FileCheck -check-prefix=WARN < %t.1.stderr %s
-// RUN: %clang -Wpoison-system-directories -target x86_64
-isystem/usr/local/include --sysroot %S/Inputs/sysroot_x86_64_cross_linux_tree
-c -o - %s 2> %t.1.stderr
-// RUN: FileCheck -check-prefix=WARN < %t.1.stderr %s
-
-// Missing target but included sysroot still causes the warning.
-// RUN: %clang -Wpoison-system-directories -I/usr/include --sysroot
%S/Inputs/sysroot_x86_64_cross_linux_tree -c -o - %s 2> %t.2.stderr
-// RUN: FileCheck -check-prefix=WARN < %t.2.stderr %s
-
-// With -Werror the warning causes the failure.
-// RUN: not %clang -Werror=poison-system-directories -target x86_64
-I/usr/include --sysroot %S/Inputs/sysroot_x86_64_cross_linux_tree -c -o - %s
2> %t.3.stderr
-// RUN: FileCheck -check-prefix=ERROR < %t.3.stderr %s
-
-// Cros target without sysroot causes no warning.
-// RUN: %clang -Wpoison-system-directories -Werror -target x86_64
-I/usr/include -c -o - %s
-
-// By default the warning is off.
-// RUN: %clang -Werror -target x86_64 -I/usr/include --sysroot
%S/Inputs/sysroot_x86_64_cross_linux_tree -c -o - %s
-
-// WARN: warning: include location {{[^ ]+}} is unsafe for cross-compilation
[-Wpoison-system-directories]
-
-// ERROR: error: include location {{[^ ]+}} is unsafe for cross-compilation
[-Werror,-Wpoison-system-directories]
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
