This is an archive of the discontinued LLVM Phabricator instance.

Add option LLVM_NM to allow specifying the location of the llvm-nm tool.
ClosedPublic

Authored by arlosi on Jul 1 2020, 9:12 PM.

Download Raw Diff

Details

Reviewers

beanz
smeenai
compnerd

Commits

rG1d8cb099231a: Add option LLVM_NM to allow specifying the location of the llvm-nm tool

Summary

The new option works like the existing LLVM_TABLEGEN, and LLVM_CONFIG_PATH options.
Instead of building llvm-nm, the build uses the executable defined by LLVM_NM.

This is useful for cross-compilation scenarios where the host cannot run the cross-compiled
tool, and recursing into another cmake build is not an option (due to required DEFINE's, for example).

Diff Detail

Repository: rG LLVM Github Monorepo

Unit TestsFailed

	Time	Test
	9,040 ms	linux > libomp.env::Unknown Unit Message ("")
	1,500 ms	linux > libomp.worksharing/for::Unknown Unit Message ("")

Event Timeline

arlosi created this revision.Jul 1 2020, 9:12 PM

Herald added a project: Restricted Project. · View Herald TranscriptJul 1 2020, 9:12 PM

Herald added a subscriber: mgorny. · View Herald Transcript

Harbormaster failed remote builds in B62624: Diff 275000!Jul 1 2020, 10:43 PM

LGTM

llvm/tools/llvm-shlib/CMakeLists.txt
167	I guess this works and is a no-op, but setting this variable to empty (or not setting it at all) should also work, I believe, and perhaps expresses the intent clearer (that there's no target for llvm-nm and you're just supplying a prebuilt one).

This revision is now accepted and ready to land.Jul 2 2020, 6:35 PM

Set llvm_nm_target to empty string as requested by smeenai.

I do not have commit access. Could someone land this for me?

Harbormaster completed remote builds in B63044: Diff 275754.Jul 6 2020, 10:46 AM

Sure, I'll land it for you.

Closed by commit rG1d8cb099231a: Add option LLVM_NM to allow specifying the location of the llvm-nm tool (authored by arlosi, committed by smeenai). · Explain WhyJul 6 2020, 1:29 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

llvm/

tools/

llvm-shlib/

CMakeLists.txt

16 lines

Diff 275000

llvm/tools/llvm-shlib/CMakeLists.txt

Show First 20 Lines • Show All 148 Lines • ▼ Show 20 Lines	else()
# Write out the full lib names into file to be read by the python script.		# Write out the full lib names into file to be read by the python script.
file(WRITE ${LIBSFILE} "${FILE_CONTENT}")		file(WRITE ${LIBSFILE} "${FILE_CONTENT}")
endif()		endif()

# Generate the exports file dynamically.		# Generate the exports file dynamically.
set(GEN_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/gen-msvc-exports.py)		set(GEN_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/gen-msvc-exports.py)

set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllvm-c.exports)		set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllvm-c.exports)
		if(NOT LLVM_NM)
if(CMAKE_CROSSCOMPILING)		if(CMAKE_CROSSCOMPILING)
build_native_tool(llvm-nm llvm_nm)		build_native_tool(llvm-nm llvm_nm)
set(llvm_nm_target "${llvm_nm}")		set(llvm_nm_target "${llvm_nm}")
else()		else()
set(llvm_nm $<TARGET_FILE:llvm-nm>)		set(llvm_nm $<TARGET_FILE:llvm-nm>)
set(llvm_nm_target llvm-nm)		set(llvm_nm_target llvm-nm)
endif()		endif()
		else()
		set(llvm_nm ${LLVM_NM})
		set(llvm_nm_target ${LLVM_NM})
		smeenaiUnsubmitted Done Reply Inline Actions I guess this works and is a no-op, but setting this variable to empty (or not setting it at all) should also work, I believe, and perhaps expresses the intent clearer (that there's no target for llvm-nm and you're just supplying a prebuilt one). smeenai: I guess this works and is a no-op, but setting this variable to empty (or not setting it at…
		endif()

add_custom_command(OUTPUT ${LLVM_EXPORTED_SYMBOL_FILE}		add_custom_command(OUTPUT ${LLVM_EXPORTED_SYMBOL_FILE}
COMMAND "${Python3_EXECUTABLE}" ${GEN_SCRIPT} --libsfile ${LIBSFILE} ${GEN_UNDERSCORE} --nm "${llvm_nm}" -o ${LLVM_EXPORTED_SYMBOL_FILE}		COMMAND "${Python3_EXECUTABLE}" ${GEN_SCRIPT} --libsfile ${LIBSFILE} ${GEN_UNDERSCORE} --nm "${llvm_nm}" -o ${LLVM_EXPORTED_SYMBOL_FILE}
DEPENDS ${LIB_NAMES} ${llvm_nm_target}		DEPENDS ${LIB_NAMES} ${llvm_nm_target}
COMMENT "Generating export list for LLVM-C"		COMMENT "Generating export list for LLVM-C"
VERBATIM )		VERBATIM )

# Finally link the target.		# Finally link the target.
add_llvm_library(LLVM-C SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS intrinsics_gen)		add_llvm_library(LLVM-C SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS intrinsics_gen)

endif()		endif()