summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2019-04-09 14:02:02 +0000
committerNico Weber <nicolasweber@gmx.de>2019-04-09 14:02:02 +0000
commitaf5834596bf885a1e4f71b79c222ffdb8a640656 (patch)
tree7a08567f59547f00ad6483709d48d100afd3f7ac /llvm
parenta230bb5fc04c8a80cd66568e543c55985dfc3007 (diff)
downloadbcm5719-llvm-af5834596bf885a1e4f71b79c222ffdb8a640656.tar.gz
bcm5719-llvm-af5834596bf885a1e4f71b79c222ffdb8a640656.zip
gn build: Fix Windows builds after r357797
llvm-svn: 358004
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp2
-rw-r--r--llvm/utils/gn/build/BUILD.gn4
2 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
index d648567df6a..3a293c0cda4 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
@@ -853,7 +853,7 @@ RuntimeDyldChecker::RuntimeDyldChecker(
MCDisassembler *Disassembler,
MCInstPrinter *InstPrinter,
raw_ostream &ErrStream)
- : Impl(llvm::make_unique<RuntimeDyldCheckerImpl>(
+ : Impl(::llvm::make_unique<RuntimeDyldCheckerImpl>(
std::move(IsSymbolValid),
std::move(GetSymbolAddress),
std::move(GetSymbolContent),
diff --git a/llvm/utils/gn/build/BUILD.gn b/llvm/utils/gn/build/BUILD.gn
index 380d6992f22..1af1c220a6f 100644
--- a/llvm/utils/gn/build/BUILD.gn
+++ b/llvm/utils/gn/build/BUILD.gn
@@ -139,7 +139,9 @@ config("compiler_defaults") {
}
config("no_exceptions") {
- cflags_cc = [ "-fno-exceptions" ]
+ if (host_os != "win") {
+ cflags_cc = [ "-fno-exceptions" ]
+ }
}
config("no_rtti") {
OpenPOWER on IntegriCloud