Skip to content

xtensa-build-xephyr: fix xt-objcopy failure when default-params missing#7277

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
lgirdwood merged 1 commit into from
Mar 15, 2023
Merged

xtensa-build-xephyr: fix xt-objcopy failure when default-params missing #7277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions scripts/xtensa-build-zephyr.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -674,7 +674,7 @@ def build_platforms():
if platform not in RI_INFO_UNSUPPORTED:
reproducible_checksum(platform, west_top / platform_build_dir_name / "zephyr" / "zephyr.ri")

install_platform(platform, sof_platform_output_dir)
install_platform(platform, sof_platform_output_dir, platf_build_environ)

src_dest_list = []

Expand DownExpand Up@@ -706,7 +706,7 @@ def build_platforms():
symlinks=True, ignore_dangling_symlinks=True, dirs_exist_ok=True)


def install_platform(platform, sof_platform_output_dir):
def install_platform(platform, sof_platform_output_dir, platf_build_environ):

# Keep in sync with caller
platform_build_dir_name = f"build-{platform}"
Expand DownExpand Up@@ -797,7 +797,12 @@ class InstFile:
# Remove it like some gcc test scripts do:
# https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=c7046906c3ae
if "strip" in str(dstname):
execute_command([str(x) for x in [objcopy, "--remove-section", ".comment", src, dst]])
execute_command(
[str(x) for x in [objcopy, "--remove-section", ".comment", src, dst]],
# Some xtensa installs don't have a
# XtensaTools/config/default-params symbolic link

@andyrossandyrossMar 14, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Not sure the comment is really needed, the vendor toolchain passes junk in the environment. No reason to expect the binutils equivalents to work any differently from the compiler.

@marc-hbmarc-hbMar 14, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Thanks for the review!

The toolchain install process in xtensa is really fragile. It's almost enough to just tar up and copy the directory around, but some things break.

While investigating #7114 I had the... "opportunity" to compare installation across different machines. All the binaries are (fortunately!) identical and the only differences are absolute paths in a number of text config files (set by the installer script). It's much simpler than what I feared initially.

Not sure the comment is really needed, the vendor toolchain passes junk in the environment. No reason to expect the binutils equivalents to work any differently from the compiler.

I've successfully invoked xt-objdump many times without any XTENSA_ variable thanks to this default-params symlink - without realizing it until today! I think that symlink is worth knowing. Here for a lack of a better place.

env=platf_build_environ,
)
elif f.txt:
dos2unix(src, dst)
else:
Expand Down