Skip to content

Switch Android onto the sectionELF style of module registry, but leave out the unused register_dso and friends #2172

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
joakim-noah merged 1 commit into from
Jun 25, 2017
Merged

Switch Android onto the sectionELF style of module registry, but leave out the unused register_dso and friends #2172

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
8 changes: 5 additions & 3 deletions gen/modules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,7 @@ RegistryStyle getModuleRegistryStyle() {
return RegistryStyle::sectionDarwin;
}

if ((t->isOSLinux() && t->getEnvironment() != llvm::Triple::Android) ||
t->isOSFreeBSD() ||
if (t->isOSLinux() || t->isOSFreeBSD() ||
#if LDC_LLVM_VER > 305
t->isOSNetBSD() || t->isOSOpenBSD() || t->isOSDragonFly()
#else
Expand Down Expand Up @@ -376,7 +375,10 @@ void emitModuleRefToSection(RegistryStyle style, std::string moduleMangle,
: "__minfo");
gIR->usedArray.push_back(thismref);

if (!isFirst) {
// Android doesn't need register_dso and friends- see rt.sections_android-
// so bail out here.
if (!isFirst ||
global.params.targetTriple->getEnvironment() == llvm::Triple::Android) {
// Nothing left to do.
return;
}
Expand Down