Skip to content

Commit 4913755

Browse files
jhuber6tru
authored andcommitted
Revert "[LinkerWrapper] Extend with usual pass options (#96704)" (#102226)
This reverts commit 90ccf21. Fixes: #100212 (cherry picked from commit 030ee84) Conflicts: clang/test/Driver/linker-wrapper-passes.c
1 parent f88180b commit 4913755

File tree

3 files changed

+0
-87
lines changed

3 files changed

+0
-87
lines changed

clang/test/Driver/linker-wrapper-passes.c

Lines changed: 0 additions & 71 deletions
This file was deleted.

clang/test/lit.cfg.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,6 @@
110110
if config.clang_examples:
111111
config.available_features.add("examples")
112112

113-
if config.llvm_examples:
114-
config.available_features.add("llvm-examples")
115-
116-
if config.llvm_linked_bye_extension:
117-
config.substitutions.append(("%offload-opt-loadbye", ""))
118-
else:
119-
loadbye = f"-load-pass-plugin={config.llvm_shlib_dir}/Bye{config.llvm_shlib_ext}"
120-
config.substitutions.append(("%offload-opt-loadbye", f"--offload-opt={loadbye}"))
121-
122113

123114
def have_host_jit_feature_support(feature_name):
124115
clang_repl_exe = lit.util.which("clang-repl", config.clang_tools_dir)
@@ -223,9 +214,6 @@ def have_host_clang_repl_cuda():
223214
if config.has_plugins and config.llvm_plugin_ext:
224215
config.available_features.add("plugins")
225216

226-
if config.llvm_has_plugins and config.llvm_plugin_ext:
227-
config.available_features.add("llvm-plugins")
228-
229217
if config.clang_default_pie_on_linux:
230218
config.available_features.add("default-pie-on-linux")
231219

clang/test/lit.site.cfg.py.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ config.llvm_obj_root = path(r"@LLVM_BINARY_DIR@")
77
config.llvm_tools_dir = lit_config.substitute(path(r"@LLVM_TOOLS_DIR@"))
88
config.llvm_libs_dir = lit_config.substitute(path(r"@LLVM_LIBS_DIR@"))
99
config.llvm_shlib_dir = lit_config.substitute(path(r"@SHLIBDIR@"))
10-
config.llvm_shlib_ext = "@SHLIBEXT@"
1110
config.llvm_plugin_ext = "@LLVM_PLUGIN_EXT@"
1211
config.lit_tools_dir = path(r"@LLVM_LIT_TOOLS_DIR@")
1312
config.errc_messages = "@LLVM_LIT_ERRC_MESSAGES@"
@@ -40,10 +39,7 @@ config.python_executable = "@Python3_EXECUTABLE@"
4039
config.use_z3_solver = lit_config.params.get('USE_Z3_SOLVER', "@USE_Z3_SOLVER@")
4140
config.has_plugins = @CLANG_PLUGIN_SUPPORT@
4241
config.clang_vendor_uti = "@CLANG_VENDOR_UTI@"
43-
config.llvm_examples = @LLVM_BUILD_EXAMPLES@
44-
config.llvm_linked_bye_extension = @LLVM_BYE_LINK_INTO_TOOLS@
4542
config.llvm_external_lit = path(r"@LLVM_EXTERNAL_LIT@")
46-
config.llvm_has_plugins = @LLVM_ENABLE_PLUGINS@
4743
config.standalone_build = @CLANG_BUILT_STANDALONE@
4844
config.ppc_linux_default_ieeelongdouble = @PPC_LINUX_DEFAULT_IEEELONGDOUBLE@
4945
config.have_llvm_driver = @LLVM_TOOL_LLVM_DRIVER_BUILD@

0 commit comments

Comments
 (0)