Skip to content

Remove old files from musl source tree #10492

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.

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
Feb 18, 2020
Merged

Remove old files from musl source tree #10492

merged 2 commits into from
Feb 18, 2020

Conversation

sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Feb 17, 2020

When musl was updated to version 1.1.5 in #4813 it looks like files
that were removed upstream were not removed locally.

Because we recursively build some directories this means we were
build old files. For example the src/locale/is*.c family of functions
were removed from musl in d89fdec51b5849ebdf8000ff1c2fb49878004f39
but remained in our tree after the update.

This fixes some strange failures we've been seeing on the CI builders
where the name of a symbol alternates between __isxdigit_l (the new
name) and isxdigit_l (the old name). This is due to the fact that
this symbol was defined in two different object files and filesystem
ordering was determining which object was included first by the linker.

This change was automatically generated by checking out musl at v1.1.15
and running:

for f in $(find . -type f); do if [[ ! -e ../../../../../musl/$f ]]; then echo $f; fi; done | grep -v emscripten | xargs git rm

When musl was updated to version 1.1.5 in #4813 it looks like files
that were removed upstream were not removed locally.

Because we recursively build some directories this means we were
build old files. For example the src/locale/is*.c family of functions
were removed from musl in d89fdec51b5849ebdf8000ff1c2fb49878004f39
but remained in our tree after the update.

This fixes some strange failures we've been seeing on the CI builders
where the name of a symbol alternates between __isxdigit_l (the new
name) and isxdigit_l (the old name).   This is due to the fact that
this symbol was defined in two different object files and filesystem
ordering was determining which object was included first by the linker.

This change was automatically generated by checking out musl at v1.1.15
and running:

`for f in $(find . -type f); do if [[ ! -e ../../../../../musl/$f ]]; then echo $f; fi; done  | grep -v emscripten | xargs git rm`
@sbc100
Copy link
Collaborator Author

sbc100 commented Feb 17, 2020

I plan on landing this as TBR, assuming the tests pass since it should unblock the roller.

@sbc100 sbc100 force-pushed the cleanup_old_musl_files branch from 946dcf3 to 0ea32cc Compare February 17, 2020 23:47
@sbc100 sbc100 merged commit 430c291 into master Feb 18, 2020
@sbc100 sbc100 deleted the cleanup_old_musl_files branch February 18, 2020 00:16
Copy link
Member

@kripken kripken left a comment

Choose a reason for hiding this comment

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

lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants