Revert "Rebase: [Facebook] Add clang driver options to test debug info and BOLT"

This reverts commit f921985a29fc9787b3ed98dbc897146cc3fd91f7.

2 files changed, 1 insertions, 17 deletions

diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py
index 0855af461699..7bda584dc317 100644
--- a/cross-project-tests/lit.cfg.py
+++ b/cross-project-tests/lit.cfg.py
@@ -74,13 +74,7 @@ if is_msvc:
 # use_clang() and use_lld() respectively, so set them to "", if needed.
 if not hasattr(config, 'clang_src_dir'):
     config.clang_src_dir = ""
-# Facebook T92898286
-should_test_bolt = get_required_attr(config, "llvm_test_bolt")
-if should_test_bolt:
-    llvm_config.use_clang(required=('clang' in config.llvm_enabled_projects), additional_flags=['--post-link-optimize'])
-else:
-    llvm_config.use_clang(required=('clang' in config.llvm_enabled_projects))
-# End Facebook T92898286
+llvm_config.use_clang(required=('clang' in config.llvm_enabled_projects))
 
 if not hasattr(config, 'lld_src_dir'):
     config.lld_src_dir = ""
@@ -262,9 +256,3 @@ llvm_config.feature_config(
 # Allow 'REQUIRES: XXX-registered-target' in tests.
 for arch in config.targets_to_build:
     config.available_features.add(arch.lower() + '-registered-target')
-
-# Facebook T92898286
-# Ensure the user's PYTHONPATH is included.
-if 'PYTHONPATH' in os.environ:
-    config.environment['PYTHONPATH'] = os.environ['PYTHONPATH']
-# End Facebook T92898286
diff --git a/cross-project-tests/lit.site.cfg.py.in b/cross-project-tests/lit.site.cfg.py.in
index 2d53cd377f03..39458dfc79af 100644
--- a/cross-project-tests/lit.site.cfg.py.in
+++ b/cross-project-tests/lit.site.cfg.py.in
@@ -21,10 +21,6 @@ config.mlir_src_root = "@MLIR_SOURCE_DIR@"
 
 config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
 
-# Facebook T92898286
-config.llvm_test_bolt = lit.util.pythonize_bool("@LLVM_TEST_BOLT@")
-# End Facebook T92898286
-
 import lit.llvm
 lit.llvm.initialize(lit_config, config)