6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-10-01 10:57:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix build with CMake if LLVM_USE_INTEL_JITEVENTS option is enabled

Browse Source 
* Added LLVM libraries required for IntelJITEvents to LLVMBuild.txt.
* Removed 'jit' library from llvm-jitlistener.
* Added support for OptionalLibraries to llvm-build cmake files generator.

Patch by aleksey.a.bader@intel.com

Differential Revision: http://reviews.llvm.org/D5646

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220848 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael Kuperstein 2014-10-29 09:18:49 +00:00
parent e0129b55d2
commit a042c235bb
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt
View File

@ -21,3 +21,4 @@
type = OptionalLibrary type = OptionalLibrary
name = IntelJITEvents name = IntelJITEvents
parent = ExecutionEngine parent = ExecutionEngine
required_libraries = Core DebugInfo Support

1
tools/llvm-jitlistener/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set(LLVM_LINK_COMPONENTS
inteljitevents inteljitevents
interpreter interpreter
irreader irreader
jit
mcjit mcjit
nativecodegen nativecodegen
object object

34
utils/llvm-build/llvmbuild/main.py
View File

@ -41,7 +41,7 @@ def mk_quote_string_for_target(value):
""" """
mk_quote_string_for_target(target_name) -> str mk_quote_string_for_target(target_name) -> str
Return a quoted form of the given target_name suitable for including in a Return a quoted form of the given target_name suitable for including in a
Makefile as a target name. Makefile as a target name.
""" """
@ -340,7 +340,7 @@ subdirectories = %s
# Compute the llvm-config "component name". For historical reasons, # Compute the llvm-config "component name". For historical reasons,
# this is lowercased based on the library name. # this is lowercased based on the library name.
llvmconfig_component_name = c.get_llvmconfig_component_name() llvmconfig_component_name = c.get_llvmconfig_component_name()
# Get the library name, or None for LibraryGroups. # Get the library name, or None for LibraryGroups.
if c.type_name == 'Library' or c.type_name == 'OptionalLibrary': if c.type_name == 'Library' or c.type_name == 'OptionalLibrary':
library_name = c.get_prefixed_library_name() library_name = c.get_prefixed_library_name()
@ -430,14 +430,14 @@ subdirectories = %s
traversed to include their required libraries. traversed to include their required libraries.
""" """
assert ci.type_name in ('Library', 'LibraryGroup', 'TargetGroup') assert ci.type_name in ('Library', 'OptionalLibrary', 'LibraryGroup', 'TargetGroup')
for name in ci.required_libraries: for name in ci.required_libraries:
# Get the dependency info. # Get the dependency info.
dep = self.component_info_map[name] dep = self.component_info_map[name]
# If it is a library, yield it. # If it is a library, yield it.
if dep.type_name == 'Library': if dep.type_name == 'Library' or dep.type_name == 'OptionalLibrary':
yield dep yield dep
continue continue
@ -492,7 +492,7 @@ subdirectories = %s
if (path.startswith(self.source_root) and os.path.exists(path)): if (path.startswith(self.source_root) and os.path.exists(path)):
yield path yield path
def write_cmake_fragment(self, output_path): def write_cmake_fragment(self, output_path, enabled_optional_components):
""" """
write_cmake_fragment(output_path) -> None write_cmake_fragment(output_path) -> None
@ -561,8 +561,13 @@ configure_file(\"%s\"
# names to required libraries, in a way that is easily accessed from CMake. # names to required libraries, in a way that is easily accessed from CMake.
""") """)
for ci in self.ordered_component_infos: for ci in self.ordered_component_infos:
# We only write the information for libraries currently. # Skip optional components which are not enabled.
if ci.type_name != 'Library': if ci.type_name == 'OptionalLibrary' \
and ci.name not in enabled_optional_components:
continue
# We only write the information for certain components currently.
if ci.type_name not in ('Library', 'OptionalLibrary'):
continue continue
f.write("""\ f.write("""\
@ -573,7 +578,7 @@ set_property(GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_%s %s)\n""" % (
f.close() f.close()
def write_cmake_exports_fragment(self, output_path): def write_cmake_exports_fragment(self, output_path, enabled_optional_components):
""" """
write_cmake_exports_fragment(output_path) -> None write_cmake_exports_fragment(output_path) -> None
@ -595,8 +600,13 @@ set_property(GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_%s %s)\n""" % (
# dependencies of libraries imported from LLVM. # dependencies of libraries imported from LLVM.
""") """)
for ci in self.ordered_component_infos: for ci in self.ordered_component_infos:
# Skip optional components which are not enabled.
if ci.type_name == 'OptionalLibrary' \
and ci.name not in enabled_optional_components:
continue
# We only write the information for libraries currently. # We only write the information for libraries currently.
if ci.type_name != 'Library': if ci.type_name not in ('Library', 'OptionalLibrary'):
continue continue
# Skip disabled targets. # Skip disabled targets.
@ -905,9 +915,11 @@ given by --build-root) at the same SUBPATH""",
# Write out the cmake fragment, if requested. # Write out the cmake fragment, if requested.
if opts.write_cmake_fragment: if opts.write_cmake_fragment:
project_info.write_cmake_fragment(opts.write_cmake_fragment) project_info.write_cmake_fragment(opts.write_cmake_fragment,
opts.optional_components)
if opts.write_cmake_exports_fragment: if opts.write_cmake_exports_fragment:
project_info.write_cmake_exports_fragment(opts.write_cmake_exports_fragment) project_info.write_cmake_exports_fragment(opts.write_cmake_exports_fragment,
opts.optional_components)
# Configure target definition files, if requested. # Configure target definition files, if requested.
if opts.configure_target_def_files: if opts.configure_target_def_files: