Skip to content

[lldb] Support Darwin cross compilation for remote Linux test suite runs #151403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 31, 2025
+31 −1
Merged

[lldb] Support Darwin cross compilation for remote Linux test suite runs #151403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
279bb81
[lldb] Support Darwin cross compilation for remote Linux test suite runs
JDevlieghere Jul 30, 2025
a58abf3
Add Android to the list
JDevlieghere Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lldb/packages/Python/lldbsuite/test/builders/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def getCompiler(self):

def getTriple(self, arch):
"""Returns the triple for the given architecture or None."""
return None
return configuration.triple

def getExtraMakeArgs(self):
"""
Expand All @@ -37,6 +37,9 @@ def getExtraMakeArgs(self):

def getArchCFlags(self, architecture):
"""Returns the ARCH_CFLAGS for the make system."""
triple = self.getTriple(architecture)
if triple:
return ["ARCH_CFLAGS=-target {}".format(triple)]
Copy link
Member

@dzhidzhoev dzhidzhoev Jul 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work if ARCH_CFLAGS is overridden in the Makefile?

llvm-project/lldb/packages/Python/lldbsuite/test/make/Makefile.rules

Line 90 in 279bb81

ARCH_CFLAGS :=

Copy link
Member Author

@JDevlieghere JDevlieghere Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In Make, command-line variables have higher precedence than variables set in the Makefile itself, so this does not overwrite the value when it's passed by the builder.

Copy link
Member

@dzhidzhoev dzhidzhoev Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair, thanks.

return []

def getMake(self, test_subdir, test_name):
Expand Down
4 changes: 4 additions & 0 deletions lldb/packages/Python/lldbsuite/test/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
sdkroot = None
make_path = None

# Allow specifying a triple for cross compilation.
triple = None

# The overriden dwarf verison.
# Don't use this to test the current compiler's
# DWARF version, as this won't be set if the
Expand Down Expand Up @@ -141,6 +144,7 @@
# Typical values include Debug, Release, RelWithDebInfo and MinSizeRel
cmake_build_type = None


def shouldSkipBecauseOfCategories(test_categories):
if use_categories:
if (
Expand Down
5 changes: 5 additions & 0 deletions lldb/packages/Python/lldbsuite/test/dotest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,13 @@ def parseOptionsAndInitTestdirs():
logging.error("No SDK found with the name %s; aborting...", args.apple_sdk)
sys.exit(-1)

if args.triple:
configuration.triple = args.triple

if args.arch:
configuration.arch = args.arch
elif args.triple:
configuration.arch = args.triple.split("-")[0]
else:
configuration.arch = platform_machine

Expand Down
8 changes: 8 additions & 0 deletions lldb/packages/Python/lldbsuite/test/dotest_args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ def create_parser():
"""Specify the path to sysroot. This overrides apple_sdk sysroot."""
),
)
group.add_argument(
"--triple",
metavar="triple",
dest="triple",
help=textwrap.dedent(
"""Specify the target triple. Used for cross compilation."""
),
)
if sys.platform == "darwin":
group.add_argument(
"--apple-sdk",
Expand Down
10 changes: 10 additions & 0 deletions lldb/packages/Python/lldbsuite/test/make/Makefile.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,16 @@ else
endif
endif

#----------------------------------------------------------------------
# Use LLD when cross compiling on Darwin.
#----------------------------------------------------------------------
ifeq "$(HOST_OS)" "Darwin"
ifneq (,$(filter $(OS), FreeBSD Linux NetBSD Windows_NT))
Copy link
Collaborator

@jasonmolenda jasonmolenda Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

$(OS) is checked against "Android" in other places, I'd add that too.

LDFLAGS += -fuse-ld=lld
endif
endif


#----------------------------------------------------------------------
# ARCHFLAG is the flag used to tell the compiler which architecture
# to compile for. The default is the flag that clang accepts.
Expand Down
Loading