From e8140139328cfe50cfe7aa027a7b51c224ec7e7c Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Mon, 14 Dec 2020 09:56:22 -0800 Subject: [PATCH] [Wasm][LTO][NPM] Use NPM for LTO with ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D92867 --- lld/wasm/Driver.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp index 0d84914c1295..c1e888466628 100644 --- a/lld/wasm/Driver.cpp +++ b/lld/wasm/Driver.cpp @@ -21,6 +21,7 @@ #include "lld/Common/Strings.h" #include "lld/Common/Version.h" #include "llvm/ADT/Twine.h" +#include "llvm/Config/llvm-config.h" #include "llvm/Object/Wasm.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" @@ -379,8 +380,9 @@ static void readConfigs(opt::InputArgList &args) { config->importTable = args.hasArg(OPT_import_table); config->ltoo = args::getInteger(args, OPT_lto_O, 2); config->ltoPartitions = args::getInteger(args, OPT_lto_partitions, 1); - config->ltoNewPassManager = args.hasFlag(OPT_lto_new_pass_manager, - OPT_no_lto_new_pass_manager, false); + config->ltoNewPassManager = + args.hasFlag(OPT_lto_new_pass_manager, OPT_no_lto_new_pass_manager, + LLVM_ENABLE_NEW_PASS_MANAGER); config->ltoDebugPassManager = args.hasArg(OPT_lto_debug_pass_manager); config->mapFile = args.getLastArgValue(OPT_Map); config->optimize = args::getInteger(args, OPT_O, 0);